Reformat code for ITs
diff --git a/pom.xml b/pom.xml
index 72dfbfe..1454326 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,6 +220,22 @@
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
+ <configuration>
+ <java>
+ <includes>
+ <include>src/**/*.java</include>
+ </includes>
+ </java>
+ <pom>
+ <includes>
+ <include>**/pom.xml</include>
+ </includes>
+ </pom>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/src/it/3rd-party-jar-with-extras/pom.xml b/src/it/3rd-party-jar-with-extras/pom.xml
index 6b79b51..db68469 100644
--- a/src/it/3rd-party-jar-with-extras/pom.xml
+++ b/src/it/3rd-party-jar-with-extras/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,9 +25,7 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests the manual deployment of a simple release JAR without a corresponding POM (cf. MDEPLOY-113).
- </description>
+ <description>Tests the manual deployment of a simple release JAR without a corresponding POM (cf. MDEPLOY-113).</description>
<build>
<plugins>
diff --git a/src/it/3rd-party-jar-without-pom/pom.xml b/src/it/3rd-party-jar-without-pom/pom.xml
index da4e8ab..77ddc38 100644
--- a/src/it/3rd-party-jar-without-pom/pom.xml
+++ b/src/it/3rd-party-jar-without-pom/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,9 +25,7 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests the manual deployment of a simple release JAR without a corresponding POM (cf. MDEPLOY-113).
- </description>
+ <description>Tests the manual deployment of a simple release JAR without a corresponding POM (cf. MDEPLOY-113).</description>
<build>
<plugins>
diff --git a/src/it/3rd-party-pom-with-extras/pom.xml b/src/it/3rd-party-pom-with-extras/pom.xml
index 593d478..b3010ef 100644
--- a/src/it/3rd-party-pom-with-extras/pom.xml
+++ b/src/it/3rd-party-pom-with-extras/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,9 +25,7 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests the manual deployment of a simple POM along with extra files.
- </description>
+ <description>Tests the manual deployment of a simple POM along with extra files.</description>
<build>
<plugins>
diff --git a/src/it/MDEPLOY-169_deploy-at-end-multithread/module1/pom.xml b/src/it/MDEPLOY-169_deploy-at-end-multithread/module1/pom.xml
index f36c443..4f75d9b 100644
--- a/src/it/MDEPLOY-169_deploy-at-end-multithread/module1/pom.xml
+++ b/src/it/MDEPLOY-169_deploy-at-end-multithread/module1/pom.xml
@@ -1,25 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.mdeploy-169</groupId>
- <artifactId>multithread</artifactId>
- <version>1.0</version>
- </parent>
- <artifactId>module1</artifactId>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mdeploy-169</groupId>
+ <artifactId>multithread</artifactId>
+ <version>1.0</version>
+ </parent>
+ <artifactId>module1</artifactId>
+
+</project>
diff --git a/src/it/MDEPLOY-169_deploy-at-end-multithread/module2/pom.xml b/src/it/MDEPLOY-169_deploy-at-end-multithread/module2/pom.xml
index 2373f39..2c41ab2 100644
--- a/src/it/MDEPLOY-169_deploy-at-end-multithread/module2/pom.xml
+++ b/src/it/MDEPLOY-169_deploy-at-end-multithread/module2/pom.xml
@@ -1,26 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.mdeploy-169</groupId>
- <artifactId>multithread</artifactId>
- <version>1.0</version>
- </parent>
- <artifactId>module2</artifactId>
- <packaging>pom</packaging>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mdeploy-169</groupId>
+ <artifactId>multithread</artifactId>
+ <version>1.0</version>
+ </parent>
+ <artifactId>module2</artifactId>
+ <packaging>pom</packaging>
+
+</project>
diff --git a/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml b/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
index af8d8c2..072ef1e 100644
--- a/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
+++ b/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
@@ -1,100 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.mdeploy-169</groupId>
- <artifactId>multithread</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
-
- <description>
- Tests deployment at end with two threads.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
- <distributionManagement>
- <repository>
- <id>it</id>
- <url>file:///${basedir}/target/repo</url>
- </repository>
- </distributionManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>@mavenCompilerPluginVersion@</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <deployAtEnd>true</deployAtEnd>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>@mavenInstallPluginVersion@</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>@mavenJarPluginVersion@</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>@mavenResourcesPluginVersion@</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>@mavenSourcePluginVersion@</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>@mavenSurefirePluginVersion@</version>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>module1</module>
- <module>module2</module>
- </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mdeploy-169</groupId>
+ <artifactId>multithread</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <description>Tests deployment at end with two threads.</description>
+
+ <modules>
+ <module>module1</module>
+ <module>module2</module>
+ </modules>
+
+ <distributionManagement>
+ <repository>
+ <id>it</id>
+ <url>file:///${basedir}/target/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>@mavenCompilerPluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <deployAtEnd>true</deployAtEnd>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>@mavenInstallPluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>@mavenJarPluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>@mavenResourcesPluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>@mavenSourcePluginVersion@</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>@mavenSurefirePluginVersion@</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/MDEPLOY-170_deploy-at-end-configperproject/module1/pom.xml b/src/it/MDEPLOY-170_deploy-at-end-configperproject/module1/pom.xml
index aecbca0..2bff0de 100644
--- a/src/it/MDEPLOY-170_deploy-at-end-configperproject/module1/pom.xml
+++ b/src/it/MDEPLOY-170_deploy-at-end-configperproject/module1/pom.xml
@@ -1,25 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.mdeploy-170</groupId>
- <artifactId>configperproject</artifactId>
- <version>1.0</version>
- </parent>
- <artifactId>module1</artifactId>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mdeploy-170</groupId>
+ <artifactId>configperproject</artifactId>
+ <version>1.0</version>
+ </parent>
+ <artifactId>module1</artifactId>
+
+</project>
diff --git a/src/it/MDEPLOY-170_deploy-at-end-configperproject/module2/pom.xml b/src/it/MDEPLOY-170_deploy-at-end-configperproject/module2/pom.xml
index d811568..0e71ceb 100644
--- a/src/it/MDEPLOY-170_deploy-at-end-configperproject/module2/pom.xml
+++ b/src/it/MDEPLOY-170_deploy-at-end-configperproject/module2/pom.xml
@@ -1,38 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.mdeploy-170</groupId>
- <artifactId>configperproject</artifactId>
- <version>1.0</version>
- </parent>
- <artifactId>module2</artifactId>
- <packaging>pom</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mdeploy-170</groupId>
+ <artifactId>configperproject</artifactId>
+ <version>1.0</version>
+ </parent>
+ <artifactId>module2</artifactId>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml b/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
index 8884e13..12f4d22 100644
--- a/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
+++ b/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
@@ -1,100 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.mdeploy-170</groupId>
- <artifactId>configperproject</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
-
- <description>
- Tests deployment at end with with different plugin configurations.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
- <distributionManagement>
- <repository>
- <id>it</id>
- <url>file:///${basedir}/target/repo</url>
- </repository>
- </distributionManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>@mavenCompilerPluginVersion@</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <deployAtEnd>true</deployAtEnd>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>@mavenInstallPluginVersion@</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>@mavenJarPluginVersion@</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>@mavenResourcesPluginVersion@</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>@mavenSourcePluginVersion@</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>@mavenSurefirePluginVersion@</version>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>module1</module>
- <module>module2</module>
- </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mdeploy-170</groupId>
+ <artifactId>configperproject</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <description>Tests deployment at end with with different plugin configurations.</description>
+
+ <modules>
+ <module>module1</module>
+ <module>module2</module>
+ </modules>
+
+ <distributionManagement>
+ <repository>
+ <id>it</id>
+ <url>file:///${basedir}/target/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>@mavenCompilerPluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <deployAtEnd>true</deployAtEnd>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>@mavenInstallPluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>@mavenJarPluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>@mavenResourcesPluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>@mavenSourcePluginVersion@</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>@mavenSurefirePluginVersion@</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/MDEPLOY-178_deployfile-with-embedded-pom/pom.xml b/src/it/MDEPLOY-178_deployfile-with-embedded-pom/pom.xml
index 8ff44f4..b584a32 100644
--- a/src/it/MDEPLOY-178_deployfile-with-embedded-pom/pom.xml
+++ b/src/it/MDEPLOY-178_deployfile-with-embedded-pom/pom.xml
@@ -1,46 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.deploy.its</groupId>
- <artifactId>mdeploy178</artifactId>
- <version>1.0</version>
-
- <description>
- Test to verify that the pom inside the jar in used when deploying the file
- </description>
-
- <url>https://issues.apache.org/jira/browse/MDEPLOY-178</url>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.deploy.its</groupId>
+ <artifactId>mdeploy178</artifactId>
+ <version>1.0</version>
+
+ <description>Test to verify that the pom inside the jar in used when deploying the file</description>
+
+ <url>https://issues.apache.org/jira/browse/MDEPLOY-178</url>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/src/it/MDEPLOY-184_deployfile-with-javadoc-and-sources/path/to/pom.xml b/src/it/MDEPLOY-184_deployfile-with-javadoc-and-sources/path/to/pom.xml
index 3b0f7d9..b8f0766 100644
--- a/src/it/MDEPLOY-184_deployfile-with-javadoc-and-sources/path/to/pom.xml
+++ b/src/it/MDEPLOY-184_deployfile-with-javadoc-and-sources/path/to/pom.xml
@@ -1,31 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.deploy.184</groupId>
- <artifactId>artifact-name</artifactId>
- <version>1.0</version>
-
- <url>https://issues.apache.org/jira/browse/MDEPLOY-184</url>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.deploy.184</groupId>
+ <artifactId>artifact-name</artifactId>
+ <version>1.0</version>
+
+ <url>https://issues.apache.org/jira/browse/MDEPLOY-184</url>
+
+</project>
diff --git a/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml b/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml
index a9a9992..48018f8 100644
--- a/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml
+++ b/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml
@@ -1,99 +1,94 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.mdeploy-170</groupId>
- <artifactId>configperproject</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
-
- <description>
- Tests file deployment with multiple execution blocks
- </description>
-
- <url>https://issues.apache.org/jira/browse/MDEPLOY-202</url>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
-
- <downloaded>lib</downloaded>
- <org.eclipse.osgi>1.0</org.eclipse.osgi>
- <org.eclipse.equinox.common>1.0</org.eclipse.equinox.common>
- </properties>
-
- <distributionManagement>
- <repository>
- <id>it</id>
- <url>file:///${basedir}/target/repo</url>
- </repository>
- </distributionManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <url>file:target/repo</url>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>deploy-equinox-snapshots</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-osgi</id>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <phase>deploy</phase>
- <configuration>
- <file>${downloaded}/org.eclipse.osgi_${org.eclipse.osgi}.jar</file>
- <sources>${downloaded}/org.eclipse.osgi.source_${org.eclipse.osgi}.jar</sources>
- <pomFile>${project.build.outputDirectory}/org.eclipse.osgi.pom</pomFile>
- </configuration>
- </execution>
- <execution>
- <id>deploy-equinox-common</id>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <phase>deploy</phase>
- <configuration>
- <file>${downloaded}/org.eclipse.equinox.common_${org.eclipse.equinox.common}.jar</file>
- <sources>${downloaded}/org.eclipse.equinox.common.source_${org.eclipse.equinox.common}.jar</sources>
- <pomFile>${project.build.outputDirectory}/org.eclipse.equinox.common.pom</pomFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mdeploy-170</groupId>
+ <artifactId>configperproject</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <description>Tests file deployment with multiple execution blocks</description>
+
+ <url>https://issues.apache.org/jira/browse/MDEPLOY-202</url>
+
+ <distributionManagement>
+ <repository>
+ <id>it</id>
+ <url>file:///${basedir}/target/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+
+ <downloaded>lib</downloaded>
+ <org.eclipse.osgi>1.0</org.eclipse.osgi>
+ <org.eclipse.equinox.common>1.0</org.eclipse.equinox.common>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <url>file:target/repo</url>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>deploy-equinox-snapshots</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-osgi</id>
+ <goals>
+ <goal>deploy-file</goal>
+ </goals>
+ <phase>deploy</phase>
+ <configuration>
+ <file>${downloaded}/org.eclipse.osgi_${org.eclipse.osgi}.jar</file>
+ <sources>${downloaded}/org.eclipse.osgi.source_${org.eclipse.osgi}.jar</sources>
+ <pomFile>${project.build.outputDirectory}/org.eclipse.osgi.pom</pomFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>deploy-equinox-common</id>
+ <goals>
+ <goal>deploy-file</goal>
+ </goals>
+ <phase>deploy</phase>
+ <configuration>
+ <file>${downloaded}/org.eclipse.equinox.common_${org.eclipse.equinox.common}.jar</file>
+ <sources>${downloaded}/org.eclipse.equinox.common.source_${org.eclipse.equinox.common}.jar</sources>
+ <pomFile>${project.build.outputDirectory}/org.eclipse.equinox.common.pom</pomFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/src/it/MDEPLOY-212/pom.xml b/src/it/MDEPLOY-212/pom.xml
index 8bca65b..80bd5e3 100644
--- a/src/it/MDEPLOY-212/pom.xml
+++ b/src/it/MDEPLOY-212/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,10 +25,8 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests that deploy-file only deploys the configured files when run in an existing project with attached artifacts
- </description>
-
+ <description>Tests that deploy-file only deploys the configured files when run in an existing project with attached artifacts</description>
+
<url>https://issues.apache.org/jira/browse/MDEPLOY-212</url>
<build>
diff --git a/src/it/MDEPLOY-212/src/main/java/org/apache/maven/test/HelloWorld.java b/src/it/MDEPLOY-212/src/main/java/org/apache/maven/test/HelloWorld.java
index ed8b2ca..4f6fcde 100644
--- a/src/it/MDEPLOY-212/src/main/java/org/apache/maven/test/HelloWorld.java
+++ b/src/it/MDEPLOY-212/src/main/java/org/apache/maven/test/HelloWorld.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.maven.test;
/*
@@ -22,16 +40,13 @@
/**
* Hello World class
*/
-public class HelloWorld
-{
+public class HelloWorld {
/**
* Main method
* @param args Arguments
*/
- public static void main( String[] args )
- {
- System.out.println( "Hello world" );
+ public static void main(String[] args) {
+ System.out.println("Hello world");
}
-
}
diff --git a/src/it/MDEPLOY-213/pom.xml b/src/it/MDEPLOY-213/pom.xml
index ff4574d..3221335 100644
--- a/src/it/MDEPLOY-213/pom.xml
+++ b/src/it/MDEPLOY-213/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,19 +25,16 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests that deploy-file does not change the main artifact of the project being built
- </description>
-
+ <description>Tests that deploy-file does not change the main artifact of the project being built</description>
+
<url>https://issues.apache.org/jira/browse/MDEPLOY-213</url>
-
+
<distributionManagement>
<repository>
<id>it</id>
<url>file://${basedir}/target/repo</url>
</repository>
</distributionManagement>
-
<build>
<plugins>
diff --git a/src/it/MDEPLOY-213/src/main/java/org/apache/maven/test/HelloWorld.java b/src/it/MDEPLOY-213/src/main/java/org/apache/maven/test/HelloWorld.java
index ed8b2ca..4f6fcde 100644
--- a/src/it/MDEPLOY-213/src/main/java/org/apache/maven/test/HelloWorld.java
+++ b/src/it/MDEPLOY-213/src/main/java/org/apache/maven/test/HelloWorld.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.maven.test;
/*
@@ -22,16 +40,13 @@
/**
* Hello World class
*/
-public class HelloWorld
-{
+public class HelloWorld {
/**
* Main method
* @param args Arguments
*/
- public static void main( String[] args )
- {
- System.out.println( "Hello world" );
+ public static void main(String[] args) {
+ System.out.println("Hello world");
}
-
}
diff --git a/src/it/MDEPLOY-224_deploy-at-end-only-modules/module1/pom.xml b/src/it/MDEPLOY-224_deploy-at-end-only-modules/module1/pom.xml
index 9f25508..e602f47 100644
--- a/src/it/MDEPLOY-224_deploy-at-end-only-modules/module1/pom.xml
+++ b/src/it/MDEPLOY-224_deploy-at-end-only-modules/module1/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
@@ -10,9 +9,7 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/src/it/MDEPLOY-224_deploy-at-end-only-modules/module2/pom.xml b/src/it/MDEPLOY-224_deploy-at-end-only-modules/module2/pom.xml
index 081edc5..6bde0ba 100644
--- a/src/it/MDEPLOY-224_deploy-at-end-only-modules/module2/pom.xml
+++ b/src/it/MDEPLOY-224_deploy-at-end-only-modules/module2/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
@@ -10,9 +9,7 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/src/it/MDEPLOY-224_deploy-at-end-only-modules/pom.xml b/src/it/MDEPLOY-224_deploy-at-end-only-modules/pom.xml
index f40c64a..6506119 100644
--- a/src/it/MDEPLOY-224_deploy-at-end-only-modules/pom.xml
+++ b/src/it/MDEPLOY-224_deploy-at-end-only-modules/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,12 @@
<version>1.0</version>
<packaging>pom</packaging>
- <description>
- Tests deployment at end only in modules.
- </description>
+ <description>Tests deployment at end only in modules.</description>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <modules>
+ <module>module1</module>
+ <module>module2</module>
+ </modules>
<distributionManagement>
<repository>
@@ -42,6 +39,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -79,9 +80,4 @@
</plugin>
</plugins>
</build>
-
- <modules>
- <module>module1</module>
- <module>module2</module>
- </modules>
</project>
diff --git a/src/it/MDEPLOY-225_deploy-at-end-skip-root/module1/pom.xml b/src/it/MDEPLOY-225_deploy-at-end-skip-root/module1/pom.xml
index 325a634..3dbc898 100644
--- a/src/it/MDEPLOY-225_deploy-at-end-skip-root/module1/pom.xml
+++ b/src/it/MDEPLOY-225_deploy-at-end-skip-root/module1/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
@@ -10,9 +9,7 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/src/it/MDEPLOY-225_deploy-at-end-skip-root/module2/pom.xml b/src/it/MDEPLOY-225_deploy-at-end-skip-root/module2/pom.xml
index 5bb4f62..c457d03 100644
--- a/src/it/MDEPLOY-225_deploy-at-end-skip-root/module2/pom.xml
+++ b/src/it/MDEPLOY-225_deploy-at-end-skip-root/module2/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
@@ -10,9 +9,7 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/src/it/MDEPLOY-225_deploy-at-end-skip-root/pom.xml b/src/it/MDEPLOY-225_deploy-at-end-skip-root/pom.xml
index 8ac0f82..ee0fff4 100644
--- a/src/it/MDEPLOY-225_deploy-at-end-skip-root/pom.xml
+++ b/src/it/MDEPLOY-225_deploy-at-end-skip-root/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,12 @@
<version>1.0</version>
<packaging>pom</packaging>
- <description>
- Tests deployment at end with skipped root project.
- </description>
+ <description>Tests deployment at end with skipped root project.</description>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <modules>
+ <module>module1</module>
+ <module>module2</module>
+ </modules>
<distributionManagement>
<repository>
@@ -42,6 +39,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -80,9 +81,4 @@
</plugin>
</plugins>
</build>
-
- <modules>
- <module>module1</module>
- <module>module2</module>
- </modules>
</project>
diff --git a/src/it/MDEPLOY-318-invalid-pom/pom.xml b/src/it/MDEPLOY-318-invalid-pom/pom.xml
index 2ac4f83..3b926e1 100644
--- a/src/it/MDEPLOY-318-invalid-pom/pom.xml
+++ b/src/it/MDEPLOY-318-invalid-pom/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,7 @@
<version>1.0</version>
<packaging>pom</packaging>
- <description>
- Tests the deployment of a simple release POM.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment of a simple release POM.</description>
<distributionManagement>
<repository>
@@ -42,6 +34,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/pom.xml b/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/pom.xml
index cd94381..64aa4a9 100644
--- a/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/pom.xml
+++ b/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,14 +25,8 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <description>
- Tests the deployment of snapshots to an alternative repository specified on the CLI when the POM
- also specifies distribution management.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment of snapshots to an alternative repository specified on the CLI when the POM
+ also specifies distribution management.</description>
<distributionManagement>
<repository>
@@ -43,6 +35,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml b/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml
index e29e00f..88afa75 100644
--- a/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml
+++ b/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,14 +25,8 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests the deployment to an alternative repository specified on the CLI when the POM also specifies
- distribution management.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment to an alternative repository specified on the CLI when the POM also specifies
+ distribution management.</description>
<distributionManagement>
<repository>
@@ -43,6 +35,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml b/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml
index 185d92d..cc56940 100644
--- a/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml
+++ b/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,10 +25,8 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests the deployment to an alternative repository specified on the CLI when the POM does not specify
- distribution management (MDEPLOY-50).
- </description>
+ <description>Tests the deployment to an alternative repository specified on the CLI when the POM does not specify
+ distribution management (MDEPLOY-50).</description>
<properties>
<maven.test.skip>true</maven.test.skip>
diff --git a/src/it/attach-release-jar/pom.xml b/src/it/attach-release-jar/pom.xml
index 916f246..7ec7254 100644
--- a/src/it/attach-release-jar/pom.xml
+++ b/src/it/attach-release-jar/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,7 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests the deployment of a simple release JAR with an attached artifact.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment of a simple release JAR with an attached artifact.</description>
<distributionManagement>
<repository>
@@ -42,6 +34,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -73,6 +69,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>@mavenSourcePluginVersion@</version>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ </configuration>
<executions>
<execution>
<id>attach-sources</id>
@@ -81,9 +80,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <forceCreation>true</forceCreation>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/it/deploy-at-end-fail/module1/pom.xml b/src/it/deploy-at-end-fail/module1/pom.xml
index ba919db..e3ed89c 100644
--- a/src/it/deploy-at-end-fail/module1/pom.xml
+++ b/src/it/deploy-at-end-fail/module1/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
@@ -10,9 +9,7 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/src/it/deploy-at-end-fail/pom.xml b/src/it/deploy-at-end-fail/pom.xml
index ed5f9ba..d05887c 100644
--- a/src/it/deploy-at-end-fail/pom.xml
+++ b/src/it/deploy-at-end-fail/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,11 @@
<version>1.0</version>
<packaging>pom</packaging>
- <description>
- Tests deployment at end.
- </description>
+ <description>Tests deployment at end.</description>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <modules>
+ <module>module1</module>
+ </modules>
<distributionManagement>
<repository>
@@ -42,6 +38,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -92,8 +92,4 @@
</plugin>
</plugins>
</build>
-
- <modules>
- <module>module1</module>
- </modules>
</project>
diff --git a/src/it/deploy-at-end-pass/module1/pom.xml b/src/it/deploy-at-end-pass/module1/pom.xml
index 602a8f5..93bfe89 100644
--- a/src/it/deploy-at-end-pass/module1/pom.xml
+++ b/src/it/deploy-at-end-pass/module1/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
@@ -10,9 +9,7 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/src/it/deploy-at-end-pass/module2/pom.xml b/src/it/deploy-at-end-pass/module2/pom.xml
index 827396f..981df88 100644
--- a/src/it/deploy-at-end-pass/module2/pom.xml
+++ b/src/it/deploy-at-end-pass/module2/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
@@ -10,9 +9,7 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/src/it/deploy-at-end-pass/module3/pom.xml b/src/it/deploy-at-end-pass/module3/pom.xml
index 48c9caa..6facadb 100644
--- a/src/it/deploy-at-end-pass/module3/pom.xml
+++ b/src/it/deploy-at-end-pass/module3/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
@@ -10,9 +9,7 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/src/it/deploy-at-end-pass/module4/pom.xml b/src/it/deploy-at-end-pass/module4/pom.xml
index 05f0762..2b1900b 100644
--- a/src/it/deploy-at-end-pass/module4/pom.xml
+++ b/src/it/deploy-at-end-pass/module4/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
@@ -10,9 +9,7 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/src/it/deploy-at-end-pass/pom.xml b/src/it/deploy-at-end-pass/pom.xml
index 90ed655..65d06e6 100644
--- a/src/it/deploy-at-end-pass/pom.xml
+++ b/src/it/deploy-at-end-pass/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,14 @@
<version>1.0</version>
<packaging>pom</packaging>
- <description>
- Tests deployment at end.
- </description>
+ <description>Tests deployment at end.</description>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <modules>
+ <module>module1</module>
+ <module>module2</module>
+ <module>module3</module>
+ <module>module4</module>
+ </modules>
<distributionManagement>
<repository>
@@ -42,6 +41,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -92,11 +95,4 @@
</plugin>
</plugins>
</build>
-
- <modules>
- <module>module1</module>
- <module>module2</module>
- <module>module3</module>
- <module>module4</module>
- </modules>
</project>
diff --git a/src/it/deploy-attached-sources/pom.xml b/src/it/deploy-attached-sources/pom.xml
index 01a4824..4205241 100644
--- a/src/it/deploy-attached-sources/pom.xml
+++ b/src/it/deploy-attached-sources/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/src/it/deploy-attached-sources/src/main/java/org/apache/maven/test/HelloWorld.java b/src/it/deploy-attached-sources/src/main/java/org/apache/maven/test/HelloWorld.java
index 4af3292..bd7d6fc 100644
--- a/src/it/deploy-attached-sources/src/main/java/org/apache/maven/test/HelloWorld.java
+++ b/src/it/deploy-attached-sources/src/main/java/org/apache/maven/test/HelloWorld.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.maven.test;
/*
@@ -22,17 +40,13 @@
/**
* Hello World class
*/
-public class HelloWorld
-{
+public class HelloWorld {
/**
* Main method
* @param args
*/
- public static void main( String[] args )
- {
- System.out.println( "Hello world" );
-
+ public static void main(String[] args) {
+ System.out.println("Hello world");
}
-
}
diff --git a/src/it/deploy-bom/pom.xml b/src/it/deploy-bom/pom.xml
index c0aee9b..6fefa67 100644
--- a/src/it/deploy-bom/pom.xml
+++ b/src/it/deploy-bom/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,9 +25,7 @@
<version>1.0</version>
<packaging>bom</packaging>
- <description>
- Tests the deployment of bom packaging.
- </description>
+ <description>Tests the deployment of bom packaging.</description>
<distributionManagement>
<repository>
diff --git a/src/it/deploy-default-packaging/pom.xml b/src/it/deploy-default-packaging/pom.xml
index 9440f68..e452c7c 100644
--- a/src/it/deploy-default-packaging/pom.xml
+++ b/src/it/deploy-default-packaging/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/src/it/deployfile-release-skip-fail/pom.xml b/src/it/deployfile-release-skip-fail/pom.xml
index ab4e9cb..3fa996d 100644
--- a/src/it/deployfile-release-skip-fail/pom.xml
+++ b/src/it/deployfile-release-skip-fail/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,31 +17,27 @@
specific language governing permissions and limitations
under the License.
-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.deploy.its</groupId>
+ <artifactId>deployfile-release-skip-fail</artifactId>
+ <version>1.0</version>
- <groupId>org.apache.maven.plugins.deploy.its</groupId>
- <artifactId>deployfile-release-skip-fail</artifactId>
- <version>1.0</version>
+ <description>Test to verify that skip stops artifact deployment</description>
- <description>
- Test to verify that skip stops artifact deployment
- </description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <version>1.0</version>
- <skip>snapshots</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <version>1.0</version>
+ <skip>snapshots</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/src/it/deployfile-release-skip/pom.xml b/src/it/deployfile-release-skip/pom.xml
index 3a02d9a..d109730 100644
--- a/src/it/deployfile-release-skip/pom.xml
+++ b/src/it/deployfile-release-skip/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,31 +17,27 @@
specific language governing permissions and limitations
under the License.
-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.deploy.its</groupId>
+ <artifactId>deployfile-release-skip</artifactId>
+ <version>1.0</version>
- <groupId>org.apache.maven.plugins.deploy.its</groupId>
- <artifactId>deployfile-release-skip</artifactId>
- <version>1.0</version>
+ <description>Test to verify that skip stops artifact deployment</description>
- <description>
- Test to verify that skip stops artifact deployment
- </description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <version>1.0</version>
- <skip>releases</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <version>1.0</version>
+ <skip>releases</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/src/it/deployfile-skip-fail/pom.xml b/src/it/deployfile-skip-fail/pom.xml
index ae7aa25..e70df57 100644
--- a/src/it/deployfile-skip-fail/pom.xml
+++ b/src/it/deployfile-skip-fail/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,30 +17,26 @@
specific language governing permissions and limitations
under the License.
-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.deploy.its</groupId>
+ <artifactId>deployfile-skip-fail</artifactId>
+ <version>1.0</version>
- <groupId>org.apache.maven.plugins.deploy.its</groupId>
- <artifactId>deployfile-skip-fail</artifactId>
- <version>1.0</version>
+ <description>Test to verify that skip stops artifact deployment</description>
- <description>
- Test to verify that skip stops artifact deployment
- </description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/src/it/deployfile-skip/pom.xml b/src/it/deployfile-skip/pom.xml
index 530a84e..4212e79 100644
--- a/src/it/deployfile-skip/pom.xml
+++ b/src/it/deployfile-skip/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,30 +17,26 @@
specific language governing permissions and limitations
under the License.
-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.deploy.its</groupId>
+ <artifactId>deployfile-skip</artifactId>
+ <version>1.0</version>
- <groupId>org.apache.maven.plugins.deploy.its</groupId>
- <artifactId>deployfile-skip</artifactId>
- <version>1.0</version>
+ <description>Test to verify that skip stops artifact deployment</description>
- <description>
- Test to verify that skip stops artifact deployment
- </description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/src/it/deployfile-snapshot-skip-fail/pom.xml b/src/it/deployfile-snapshot-skip-fail/pom.xml
index aba1a40..380346f 100644
--- a/src/it/deployfile-snapshot-skip-fail/pom.xml
+++ b/src/it/deployfile-snapshot-skip-fail/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,31 +17,27 @@
specific language governing permissions and limitations
under the License.
-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.deploy.its</groupId>
+ <artifactId>deployfile-snapshot-skip-fail</artifactId>
+ <version>1.0</version>
- <groupId>org.apache.maven.plugins.deploy.its</groupId>
- <artifactId>deployfile-snapshot-skip-fail</artifactId>
- <version>1.0</version>
+ <description>Test to verify that skip stops artifact deployment</description>
- <description>
- Test to verify that skip stops artifact deployment
- </description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <version>1.0-SNAPSHOT</version>
- <skip>releases</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <version>1.0-SNAPSHOT</version>
+ <skip>releases</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/src/it/deployfile-snapshot-skip/pom.xml b/src/it/deployfile-snapshot-skip/pom.xml
index cbedfd8..ad216cd 100644
--- a/src/it/deployfile-snapshot-skip/pom.xml
+++ b/src/it/deployfile-snapshot-skip/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,31 +17,27 @@
specific language governing permissions and limitations
under the License.
-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.deploy.its</groupId>
+ <artifactId>deployfile-snapshot-skip</artifactId>
+ <version>1.0</version>
- <groupId>org.apache.maven.plugins.deploy.its</groupId>
- <artifactId>deployfile-snapshot-skip</artifactId>
- <version>1.0</version>
+ <description>Test to verify that skip stops artifact deployment</description>
- <description>
- Test to verify that skip stops artifact deployment
- </description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <version>1.0-SNAPSHOT</version>
- <skip>snapshots</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <version>1.0-SNAPSHOT</version>
+ <skip>snapshots</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/src/it/external-release-jar/pom.xml b/src/it/external-release-jar/pom.xml
index 354f4d7..0233e50 100644
--- a/src/it/external-release-jar/pom.xml
+++ b/src/it/external-release-jar/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,10 +25,8 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests the manual deployment of a simple release JAR with a corresponding POM whose coordinates are inherited
- from the parent (cf. MDEPLOY-56).
- </description>
+ <description>Tests the manual deployment of a simple release JAR with a corresponding POM whose coordinates are inherited
+ from the parent (cf. MDEPLOY-56).</description>
<build>
<plugins>
diff --git a/src/it/gav-validation/pom.xml b/src/it/gav-validation/pom.xml
index a26382c..bc51b11 100644
--- a/src/it/gav-validation/pom.xml
+++ b/src/it/gav-validation/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,10 +25,8 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests that the manual installation validates the coordinates of the artifact just like the model validator would do
- (MDEPLOY-88).
- </description>
+ <description>Tests that the manual installation validates the coordinates of the artifact just like the model validator would do
+ (MDEPLOY-88).</description>
<build>
<plugins>
diff --git a/src/it/mdeploy-45-test/pom.xml b/src/it/mdeploy-45-test/pom.xml
index cdefaad..e5c5e24 100644
--- a/src/it/mdeploy-45-test/pom.xml
+++ b/src/it/mdeploy-45-test/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,24 +17,19 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.deploy.45</groupId>
<artifactId>test</artifactId>
<version>0.1</version>
- <!-- war to pom, see MDEPLOY-205 -->
+ <!-- war to pom, see MDEPLOY-205 -->
<packaging>pom</packaging>
<name>MDEPLOY-45</name>
<description>sample web project with classified artifact output</description>
<url>https://issues.apache.org/jira/browse/MDEPLOY-45</url>
- <properties>
- <mdp45.artifact.classifier>mdp45</mdp45.artifact.classifier>
- </properties>
-
<distributionManagement>
<repository>
<id>repo1</id>
@@ -49,6 +43,10 @@
</snapshotRepository>
</distributionManagement>
+ <properties>
+ <mdp45.artifact.classifier>mdp45</mdp45.artifact.classifier>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -67,17 +65,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>@mavenWarPluginVersion@</version>
+ <configuration>
+ <!-- this will cause an error -->
+ <classifier>${mdp45.artifact.classifier}</classifier>
+ </configuration>
<executions>
<execution>
<goals>
<goal>war</goal>
</goals>
- </execution>
+ </execution>
</executions>
- <configuration>
- <!-- this will cause an error -->
- <classifier>${mdp45.artifact.classifier}</classifier>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/it/no-main-artifact-1/pom.xml b/src/it/no-main-artifact-1/pom.xml
index 18944b6..8ad0718 100644
--- a/src/it/no-main-artifact-1/pom.xml
+++ b/src/it/no-main-artifact-1/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -28,14 +26,8 @@
<!-- jar to pom, see MDEPLOY-205 -->
<packaging>jar</packaging>
- <description>
- Tests the deployment of a non-POM project that has no main artifact file but only attached artifacts (see
- MDEPLOY-78). This variant of the test checks the build when target/classes is non-existent.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment of a non-POM project that has no main artifact file but only attached artifacts (see
+ MDEPLOY-78). This variant of the test checks the build when target/classes is non-existent.</description>
<distributionManagement>
<repository>
@@ -44,6 +36,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -55,16 +51,16 @@
<!--
NOTE: The Compiler Plugin sets this as the main artifact file, should be non-existent for this test.
-->
- <delete dir="target/classes"/>
+ <delete dir="target/classes" />
</target>
</configuration>
<executions>
<execution>
<id>delete-output-dir</id>
- <phase>verify</phase>
<goals>
<goal>run</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
diff --git a/src/it/no-main-artifact-2/pom.xml b/src/it/no-main-artifact-2/pom.xml
index f9644f9..dbeb7a7 100644
--- a/src/it/no-main-artifact-2/pom.xml
+++ b/src/it/no-main-artifact-2/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,14 +25,8 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests the installation of a non-POM project that has no main artifact file but only attached artifacts (see
- MDEPLOY-78). This variant of the test checks the build when target/classes is existent.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the installation of a non-POM project that has no main artifact file but only attached artifacts (see
+ MDEPLOY-78). This variant of the test checks the build when target/classes is existent.</description>
<distributionManagement>
<repository>
@@ -43,6 +35,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -54,16 +50,16 @@
<!--
NOTE: The Compiler Plugin sets this as the main artifact file, should be existent for this test.
-->
- <mkdir dir="target/classes"/>
+ <mkdir dir="target/classes" />
</target>
</configuration>
<executions>
<execution>
<id>make-output-dir</id>
- <phase>verify</phase>
<goals>
<goal>run</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
diff --git a/src/it/no-main-artifact-snapshot/pom.xml b/src/it/no-main-artifact-snapshot/pom.xml
index 89c4fc9..1ad2678 100644
--- a/src/it/no-main-artifact-snapshot/pom.xml
+++ b/src/it/no-main-artifact-snapshot/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,14 +25,8 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <description>
- Tests the deployment of a snapshot for a project that has no main artifact file but only attached artifacts
- and check whether the attached artifacts get the proper timestamped version (see MDEPLOY-112).
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment of a snapshot for a project that has no main artifact file but only attached artifacts
+ and check whether the attached artifacts get the proper timestamped version (see MDEPLOY-112).</description>
<distributionManagement>
<repository>
@@ -43,6 +35,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -66,6 +62,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>@mavenJarPluginVersion@</version>
+ <configuration>
+ <classifier>it</classifier>
+ </configuration>
<executions>
<execution>
<goals>
@@ -73,9 +72,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <classifier>it</classifier>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/it/offline/pom.xml b/src/it/offline/pom.xml
index cdad63c..c50787f 100644
--- a/src/it/offline/pom.xml
+++ b/src/it/offline/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <description>
- Tests that the deployment fails when Maven is in offline mode.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests that the deployment fails when Maven is in offline mode.</description>
<distributionManagement>
<repository>
@@ -42,6 +34,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/release-jar/pom.xml b/src/it/release-jar/pom.xml
index 1d275c9..9cfdc8d 100644
--- a/src/it/release-jar/pom.xml
+++ b/src/it/release-jar/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,7 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests the deployment of a simple release JAR.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment of a simple release JAR.</description>
<distributionManagement>
<repository>
@@ -42,6 +34,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/release-pom/pom.xml b/src/it/release-pom/pom.xml
index fe9c110..5994eee 100644
--- a/src/it/release-pom/pom.xml
+++ b/src/it/release-pom/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,7 @@
<version>1.0</version>
<packaging>pom</packaging>
- <description>
- Tests the deployment of a simple release POM.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment of a simple release POM.</description>
<distributionManagement>
<repository>
@@ -42,6 +34,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/settings.xml b/src/it/settings.xml
index c8f77f0..7467f66 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -49,6 +49,16 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
+ <pluginRepository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>apache.snapshots</id>
+ <url>https://repository.apache.org/snapshots/</url>
+ </pluginRepository>
</pluginRepositories>
</profile>
</profiles>
diff --git a/src/it/setup-mock-phase-maven-plugin/pom.xml b/src/it/setup-mock-phase-maven-plugin/pom.xml
index 4ebb8af..ed7c55c 100644
--- a/src/it/setup-mock-phase-maven-plugin/pom.xml
+++ b/src/it/setup-mock-phase-maven-plugin/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.deploy.mock</groupId>
@@ -28,12 +25,12 @@
<version>1.0</version>
<packaging>maven-plugin</packaging>
+ <description>plugin with Maven phase without m-deploy-p</description>
+
<prerequisites>
<maven>@mavenVersion@</maven>
</prerequisites>
- <description>plugin with Maven phase without m-deploy-p</description>
-
<build>
<pluginManagement>
<plugins>
diff --git a/src/it/skip-release-jar/pom.xml b/src/it/skip-release-jar/pom.xml
index 2774462..27852ed 100644
--- a/src/it/skip-release-jar/pom.xml
+++ b/src/it/skip-release-jar/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,7 @@
<version>1.0</version>
<packaging>jar</packaging>
- <description>
- Tests the deployment of a simple release JAR has been skipped.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment of a simple release JAR has been skipped.</description>
<distributionManagement>
<repository>
@@ -42,6 +34,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/skip-snapshot-jar/pom.xml b/src/it/skip-snapshot-jar/pom.xml
index a009904..8e939ef 100644
--- a/src/it/skip-snapshot-jar/pom.xml
+++ b/src/it/skip-snapshot-jar/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,7 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <description>
- Tests the deployment of a simple snapshot JAR has been skipped.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment of a simple snapshot JAR has been skipped.</description>
<distributionManagement>
<repository>
@@ -42,6 +34,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/skip/pom.xml b/src/it/skip/pom.xml
index 652b308..00a2252 100644
--- a/src/it/skip/pom.xml
+++ b/src/it/skip/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,9 +25,7 @@
<version>1.0</version>
<packaging>pom</packaging>
- <description>
- Tests the skipping of deployment upon user request via configuration.
- </description>
+ <description>Tests the skipping of deployment upon user request via configuration.</description>
<!-- NOTE: This must pass although the POM does not define <distributionManagement> (MDEPLOY-89) -->
diff --git a/src/it/snapshot-jar/pom.xml b/src/it/snapshot-jar/pom.xml
index 899b583..d0fbca8 100644
--- a/src/it/snapshot-jar/pom.xml
+++ b/src/it/snapshot-jar/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <description>
- Tests the deployment of a simple snapshot JAR.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment of a simple snapshot JAR.</description>
<distributionManagement>
<repository>
@@ -42,6 +34,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/snapshot-pom/pom.xml b/src/it/snapshot-pom/pom.xml
index 5ff795c..6ce326f 100644
--- a/src/it/snapshot-pom/pom.xml
+++ b/src/it/snapshot-pom/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,13 +25,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <description>
- Tests the deployment of a simple snapshot POM.
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <description>Tests the deployment of a simple snapshot POM.</description>
<distributionManagement>
<repository>
@@ -42,6 +34,10 @@
</repository>
</distributionManagement>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/test/resources/unit/basic-deploy-pom/target/deploy-test-file-1.0-SNAPSHOT.pom b/src/test/resources/unit/basic-deploy-pom/target/deploy-test-file-1.0-SNAPSHOT.pom
index 095ea0f..4c3836f 100644
--- a/src/test/resources/unit/basic-deploy-pom/target/deploy-test-file-1.0-SNAPSHOT.pom
+++ b/src/test/resources/unit/basic-deploy-pom/target/deploy-test-file-1.0-SNAPSHOT.pom
@@ -1,28 +1,28 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.test</groupId>
- <artifactId>maven-deploy-file-test</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
-
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.test</groupId>
+ <artifactId>maven-deploy-file-test</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+</project>
