This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git
The following commit(s) were added to refs/heads/master by this push: new ce0666e [MINSTALL-184] Cleanup IT tests ce0666e is described below commit ce0666e4220514e99a9384300981d2b50223b265 Author: Slawomir Jaranowski <s.jaranow...@gmail.com> AuthorDate: Thu Nov 10 00:00:37 2022 +0100 [MINSTALL-184] Cleanup IT tests remove createChecksum - parameter from tests - was removed in MINSTALL-143 remove updateReleaseInfo - parameter from tests - was removed in MINSTALL-149 refresh plugins versions in tests --- pom.xml | 11 +++++++++++ src/it/MINSTALL-108/invoker.properties | 1 - src/it/MINSTALL-108/module1/pom.xml | 22 ---------------------- src/it/MINSTALL-108/pom.xml | 8 ++++---- src/it/MINSTALL-98/pom.xml | 8 ++++---- src/it/MINSTALL-99/pom.xml | 8 ++++---- src/it/attach-jar-checksum/pom.xml | 16 ++++++++-------- src/it/attach-release-jar/pom.xml | 16 ++++++++-------- src/it/generate-pom-auto-1/test.properties | 1 - src/it/install-at-end-fail/module1/pom.xml | 2 +- src/it/install-at-end-fail/pom.xml | 8 ++++---- src/it/install-at-end-pass/pom.xml | 8 ++++---- src/it/jar-sources-javadoc/test.properties | 2 -- .../test.properties | 1 - .../test.properties | 1 - src/it/no-main-artifact-1/pom.xml | 14 +++++++------- src/it/no-main-artifact-2/pom.xml | 14 +++++++------- src/it/non-changed-artifact/invoker.properties | 1 - src/it/non-default-pom/non-default-pom.xml | 5 ----- src/it/pom-checksum/pom.xml | 14 +++----------- src/it/release-jar/pom.xml | 11 ++++------- src/it/release-pom/pom.xml | 14 +++----------- src/it/settings.xml | 10 +++++++--- src/it/setup-mock-phase-maven-plugin/pom.xml | 2 +- src/it/skip-install/pom.xml | 9 ++++----- src/it/snapshot-jar/pom.xml | 8 ++++---- src/it/snapshot-pom/pom.xml | 11 +++-------- 27 files changed, 91 insertions(+), 135 deletions(-) diff --git a/pom.xml b/pom.xml index 1f8201d..0dc36d7 100644 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,17 @@ <mavenVersion>3.2.5</mavenVersion> <aetherVersion>1.0.0.v20140518</aetherVersion> <!-- Maven bound --> <slf4jVersion>1.7.5</slf4jVersion> <!-- Maven bound --> + + <!-- plugin versions used in IT tests --> + <mavenAntrunPluginVersion>3.1.0</mavenAntrunPluginVersion> + <mavenCompilerPluginVersion>3.10.1</mavenCompilerPluginVersion> + <mavenEnforcerPluginVersion>3.1.0</mavenEnforcerPluginVersion> + <mavenJarPluginVersion>3.3.0</mavenJarPluginVersion> + <mavenPluginPluginVersion>3.7.0</mavenPluginPluginVersion> + <mavenResourcesPluginVersion>3.3.0</mavenResourcesPluginVersion> + <mavenSourcePluginVersion>3.2.1</mavenSourcePluginVersion> + <mavenSurefirePluginVersion>3.0.0-M7</mavenSurefirePluginVersion> + <project.build.outputTimestamp>2022-07-19T14:21:53Z</project.build.outputTimestamp> </properties> diff --git a/src/it/MINSTALL-108/invoker.properties b/src/it/MINSTALL-108/invoker.properties index 1b61977..a2c711e 100644 --- a/src/it/MINSTALL-108/invoker.properties +++ b/src/it/MINSTALL-108/invoker.properties @@ -17,4 +17,3 @@ invoker.goals = clean install # waiting for MINSTALL-108 fix -invoker.maven.version = 3.2.4+ diff --git a/src/it/MINSTALL-108/module1/pom.xml b/src/it/MINSTALL-108/module1/pom.xml index c8622c9..7708dde 100644 --- a/src/it/MINSTALL-108/module1/pom.xml +++ b/src/it/MINSTALL-108/module1/pom.xml @@ -22,26 +22,4 @@ </parent> <artifactId>module1</artifactId> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.3.1</version> - <executions> - <execution> - <id>enforce</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <AlwaysPass/> - </rules> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> diff --git a/src/it/MINSTALL-108/pom.xml b/src/it/MINSTALL-108/pom.xml index 9fc4da5..957e7b8 100644 --- a/src/it/MINSTALL-108/pom.xml +++ b/src/it/MINSTALL-108/pom.xml @@ -41,7 +41,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -54,17 +54,17 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.5</version> + <version>@mavenJarPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.12</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/MINSTALL-98/pom.xml b/src/it/MINSTALL-98/pom.xml index e13f7b6..b1ff426 100644 --- a/src/it/MINSTALL-98/pom.xml +++ b/src/it/MINSTALL-98/pom.xml @@ -41,7 +41,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -54,17 +54,17 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> + <version>@mavenJarPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.12</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/MINSTALL-99/pom.xml b/src/it/MINSTALL-99/pom.xml index 32ded5a..2f768b9 100644 --- a/src/it/MINSTALL-99/pom.xml +++ b/src/it/MINSTALL-99/pom.xml @@ -41,7 +41,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -54,17 +54,17 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> + <version>@mavenJarPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.12</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/attach-jar-checksum/pom.xml b/src/it/attach-jar-checksum/pom.xml index 991674c..8867c95 100644 --- a/src/it/attach-jar-checksum/pom.xml +++ b/src/it/attach-jar-checksum/pom.xml @@ -41,30 +41,30 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> <version>@project.version@</version> - <configuration> - <createChecksum>true</createChecksum> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> + <version>@mavenJarPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.0.4</version> + <version>@mavenSourcePluginVersion@</version> + <configuration> + <forceCreation>true</forceCreation> + </configuration> <executions> <execution> <id>attach-sources</id> @@ -77,7 +77,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/attach-release-jar/pom.xml b/src/it/attach-release-jar/pom.xml index e29f225..1527897 100644 --- a/src/it/attach-release-jar/pom.xml +++ b/src/it/attach-release-jar/pom.xml @@ -41,30 +41,30 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> <version>@project.version@</version> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> + <version>@mavenJarPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.0.4</version> + <version>@mavenSourcePluginVersion@</version> + <configuration> + <forceCreation>true</forceCreation> + </configuration> <executions> <execution> <id>attach-sources</id> @@ -77,7 +77,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/generate-pom-auto-1/test.properties b/src/it/generate-pom-auto-1/test.properties index 5b5a4fc..bfe720e 100644 --- a/src/it/generate-pom-auto-1/test.properties +++ b/src/it/generate-pom-auto-1/test.properties @@ -20,4 +20,3 @@ groupId = org.apache.maven.its.install.gpa1 artifactId = test version = 0.1 packaging = jar -createChecksum = true diff --git a/src/it/install-at-end-fail/module1/pom.xml b/src/it/install-at-end-fail/module1/pom.xml index 687cf5f..10ebadc 100644 --- a/src/it/install-at-end-fail/module1/pom.xml +++ b/src/it/install-at-end-fail/module1/pom.xml @@ -27,7 +27,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.2</version> + <version>@mavenEnforcerPluginVersion@</version> <executions> <execution> <id>enforce</id> diff --git a/src/it/install-at-end-fail/pom.xml b/src/it/install-at-end-fail/pom.xml index b22147a..23de9d8 100644 --- a/src/it/install-at-end-fail/pom.xml +++ b/src/it/install-at-end-fail/pom.xml @@ -41,7 +41,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -54,17 +54,17 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> + <version>@mavenJarPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.12</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/install-at-end-pass/pom.xml b/src/it/install-at-end-pass/pom.xml index 5149bb7..9bf0968 100644 --- a/src/it/install-at-end-pass/pom.xml +++ b/src/it/install-at-end-pass/pom.xml @@ -41,7 +41,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -54,17 +54,17 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> + <version>@mavenJarPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.12</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/jar-sources-javadoc/test.properties b/src/it/jar-sources-javadoc/test.properties index 88f40d0..b7330af 100644 --- a/src/it/jar-sources-javadoc/test.properties +++ b/src/it/jar-sources-javadoc/test.properties @@ -22,5 +22,3 @@ version = 0.1 packaging = jar javadoc = javadoc.jar sources = sources.jar -createChecksum = true -updateReleaseInfo = true diff --git a/src/it/local-repo-override-with-checksum-generatePom/test.properties b/src/it/local-repo-override-with-checksum-generatePom/test.properties index 26a7bbf..d796040 100644 --- a/src/it/local-repo-override-with-checksum-generatePom/test.properties +++ b/src/it/local-repo-override-with-checksum-generatePom/test.properties @@ -20,6 +20,5 @@ groupId = gid artifactId = test version = 0.1 packaging = jar -createChecksum = true generatePom = true localRepositoryPath = target/local-repo diff --git a/src/it/local-repo-override-with-checksum/test.properties b/src/it/local-repo-override-with-checksum/test.properties index bff58f1..cd619e3 100644 --- a/src/it/local-repo-override-with-checksum/test.properties +++ b/src/it/local-repo-override-with-checksum/test.properties @@ -20,5 +20,4 @@ groupId = gid artifactId = test version = 0.1 packaging = jar -createChecksum = true localRepositoryPath = target/local-repo diff --git a/src/it/no-main-artifact-1/pom.xml b/src/it/no-main-artifact-1/pom.xml index ef72ee8..850b2b5 100644 --- a/src/it/no-main-artifact-1/pom.xml +++ b/src/it/no-main-artifact-1/pom.xml @@ -43,14 +43,14 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> + <version>@mavenAntrunPluginVersion@</version> <configuration> - <tasks> + <target> <!-- NOTE: The Compiler Plugin sets this as the main artifact file, should be non-existent for this test. --> <delete dir="target/classes"/> - </tasks> + </target> </configuration> <executions> <execution> @@ -65,12 +65,12 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> + <version>@mavenJarPluginVersion@</version> <configuration> <classifier>it</classifier> </configuration> @@ -83,12 +83,12 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/no-main-artifact-2/pom.xml b/src/it/no-main-artifact-2/pom.xml index 1a7f363..93e0451 100644 --- a/src/it/no-main-artifact-2/pom.xml +++ b/src/it/no-main-artifact-2/pom.xml @@ -42,14 +42,14 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> + <version>@mavenAntrunPluginVersion@</version> <configuration> - <tasks> + <target> <!-- NOTE: The Compiler Plugin sets this as the main artifact file, should be existent for this test. --> <mkdir dir="target/classes"/> - </tasks> + </target> </configuration> <executions> <execution> @@ -64,12 +64,12 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> + <version>@mavenJarPluginVersion@</version> <configuration> <classifier>it</classifier> </configuration> @@ -82,12 +82,12 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/non-changed-artifact/invoker.properties b/src/it/non-changed-artifact/invoker.properties index 4877cab..919899c 100644 --- a/src/it/non-changed-artifact/invoker.properties +++ b/src/it/non-changed-artifact/invoker.properties @@ -18,4 +18,3 @@ # install called in two different Maven invocations, otherwise the build would fail with the Jar Plugin (MJAR-198) invoker.goals.1 = install invoker.goals.2 = install -invoker.maven.version = 2.2.2+, !3.0-alpha-1, !3.0-alpha-2 diff --git a/src/it/non-default-pom/non-default-pom.xml b/src/it/non-default-pom/non-default-pom.xml index 5584c2b..e59a49e 100644 --- a/src/it/non-default-pom/non-default-pom.xml +++ b/src/it/non-default-pom/non-default-pom.xml @@ -43,11 +43,6 @@ under the License. <artifactId>maven-install-plugin</artifactId> <version>@project.version@</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0-beta-5</version> - </plugin> </plugins> </build> diff --git a/src/it/pom-checksum/pom.xml b/src/it/pom-checksum/pom.xml index 9219dd1..4272bab 100644 --- a/src/it/pom-checksum/pom.xml +++ b/src/it/pom-checksum/pom.xml @@ -41,30 +41,22 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> <version>@project.version@</version> - <configuration> - <createChecksum>true</createChecksum> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0-beta-5</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/release-jar/pom.xml b/src/it/release-jar/pom.xml index 7e5d8f6..f243b3c 100644 --- a/src/it/release-jar/pom.xml +++ b/src/it/release-jar/pom.xml @@ -41,30 +41,27 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> <version>@project.version@</version> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> + <version>@mavenJarPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/release-pom/pom.xml b/src/it/release-pom/pom.xml index 1d55807..163efa3 100644 --- a/src/it/release-pom/pom.xml +++ b/src/it/release-pom/pom.xml @@ -41,30 +41,22 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> <version>@project.version@</version> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0-beta-5</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/settings.xml b/src/it/settings.xml index c8f77f0..992a605 100644 --- a/src/it/settings.xml +++ b/src/it/settings.xml @@ -23,18 +23,17 @@ under the License. <profiles> <profile> <id>it-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> <repositories> <repository> <id>local.central</id> <url>@localRepositoryUrl@</url> <releases> <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> </releases> <snapshots> <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> </snapshots> </repository> </repositories> @@ -44,12 +43,17 @@ under the License. <url>@localRepositoryUrl@</url> <releases> <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> </releases> <snapshots> <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> </snapshots> </pluginRepository> </pluginRepositories> </profile> </profiles> + <activeProfiles> + <activeProfile>it-repo</activeProfile> + </activeProfiles> </settings> diff --git a/src/it/setup-mock-phase-maven-plugin/pom.xml b/src/it/setup-mock-phase-maven-plugin/pom.xml index d0d5595..09ed9c3 100644 --- a/src/it/setup-mock-phase-maven-plugin/pom.xml +++ b/src/it/setup-mock-phase-maven-plugin/pom.xml @@ -45,7 +45,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.6.4</version> + <version>@mavenPluginPluginVersion@</version> <configuration> <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> </configuration> diff --git a/src/it/skip-install/pom.xml b/src/it/skip-install/pom.xml index ecf04ae..64ecd4a 100644 --- a/src/it/skip-install/pom.xml +++ b/src/it/skip-install/pom.xml @@ -41,31 +41,30 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> <version>@project.version@</version> <configuration> - <updateReleaseInfo>true</updateReleaseInfo> <skip>true</skip> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> + <version>@mavenJarPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.12</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/snapshot-jar/pom.xml b/src/it/snapshot-jar/pom.xml index c95ff05..392da48 100644 --- a/src/it/snapshot-jar/pom.xml +++ b/src/it/snapshot-jar/pom.xml @@ -41,12 +41,12 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> + <version>@mavenJarPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -56,12 +56,12 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build> diff --git a/src/it/snapshot-pom/pom.xml b/src/it/snapshot-pom/pom.xml index 3a9d533..2532c85 100644 --- a/src/it/snapshot-pom/pom.xml +++ b/src/it/snapshot-pom/pom.xml @@ -41,7 +41,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@mavenCompilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -51,17 +51,12 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>@mavenResourcesPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0-beta-5</version> + <version>@mavenSurefirePluginVersion@</version> </plugin> </plugins> </build>