[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
apache · Nov 12, 2022 · ce0666e · ce0666e
1 parent f5980b0
commit ce0666e
Show file tree

Hide file tree

Showing 27 changed files with 91 additions and 135 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>