[MINVOKER-316] Refresh plugins versions in IT tests

use properties for plugins version used in IT tests
apache · Dec 13, 2022 · 8673771 · 8673771
1 parent bfb75f9
commit 8673771
Show file tree

Hide file tree

Showing 51 changed files with 103 additions and 53 deletions.
diff --git a/pom.xml b/pom.xml
@@ -357,7 +357,19 @@ under the License.
     <profile>
       <id>run-its</id>
       <properties>
+        <!-- plugins versions used in IT tests -->
+        <antrunPluginVersion>3.1.0</antrunPluginVersion>
+        <cleanPluginVersion>3.2.0</cleanPluginVersion>
+        <compilerPluginVersion>3.10.1</compilerPluginVersion>
+        <enforcerPluginVersion>3.1.0</enforcerPluginVersion>
+        <helpPluginVersion>3.3.0</helpPluginVersion>
+        <installPluginVersion>3.1.0</installPluginVersion>
+        <jarPluginVersion>3.3.0</jarPluginVersion>
+        <pluginPluginVersion>3.7.0</pluginPluginVersion>
+        <resourcesPluginVersion>3.3.0</resourcesPluginVersion>
         <sitePluginVersion>3.7.1</sitePluginVersion>
+        <sourcePluginVersion>3.2.1</sourcePluginVersion>
+        <surefirePluginVersion>3.0.0-M7</surefirePluginVersion>
       </properties>
       <build>
         <pluginManagement>

diff --git a/src/it/MINVOKER-191/pom.xml b/src/it/MINVOKER-191/pom.xml
@@ -49,17 +49,17 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.5.1</version>
+          <version>@compilerPluginVersion@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>2.9</version>
+          <version>@pluginPluginVersion@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.6</version>
+          <version>@resourcesPluginVersion@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/it/MINVOKER-196_junit_report_file/pom.xml b/src/it/MINVOKER-196_junit_report_file/pom.xml
@@ -41,7 +41,7 @@ under the License.
         <!-- This triggers the download of a known version of this plugin which can then be safely invoked by the IT project -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>@resourcesPluginVersion@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -54,6 +54,8 @@ under the License.
           <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
           <settingsFile>src/it/settings.xml</settingsFile>
           <goals>
+            <!-- Maven 4 require strict checksum by default, so relax here -->
+            <goal>-c</goal>
             <goal>validate</goal>
           </goals>
         </configuration>

diff --git a/src/it/MINVOKER-196_junit_report_file/src/it/project_2/pom.xml b/src/it/MINVOKER-196_junit_report_file/src/it/project_2/pom.xml
@@ -64,7 +64,7 @@ under the License.
     <plugins>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>@resourcesPluginVersion@</version>
       </plugin>
     </plugins>
   </build>

diff --git a/src/it/invocation-cmdline-exclude/pom.xml b/src/it/invocation-cmdline-exclude/pom.xml
@@ -31,6 +31,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
   </properties>
 
   <build>

diff --git a/src/it/invocation-cmdline-exclude/src/it/minvoker-140-executable/pom.xml b/src/it/invocation-cmdline-exclude/src/it/minvoker-140-executable/pom.xml
@@ -35,7 +35,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>@enforcerPluginVersion@</version>
         <executions>
           <execution>
             <goals>

diff --git a/src/it/invocation-cmdline-exclude/src/it/minvoker-140-ignorable/pom.xml b/src/it/invocation-cmdline-exclude/src/it/minvoker-140-ignorable/pom.xml
@@ -35,7 +35,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>@enforcerPluginVersion@</version>
         <executions>
           <execution>
             <goals>

diff --git a/src/it/invocation-debug/pom.xml b/src/it/invocation-debug/pom.xml
@@ -33,6 +33,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
   </properties>
 
   <build>

diff --git a/src/it/invocation-debug/src/it/minvoker-142/pom.xml b/src/it/invocation-debug/src/it/minvoker-142/pom.xml
@@ -35,7 +35,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.1.1</version>
+        <version>@enforcerPluginVersion@</version>
         <executions>
           <execution>
             <goals>

diff --git a/src/it/invocation-emptyproperty/pom.xml b/src/it/invocation-emptyproperty/pom.xml
@@ -31,6 +31,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
   </properties>
 
   <build>

diff --git a/src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml b/src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml
@@ -35,7 +35,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.1.1</version>
+        <version>@enforcerPluginVersion@</version>
         <executions>
           <execution>
             <goals>

diff --git a/src/it/invocation-environmentvariable/pom.xml b/src/it/invocation-environmentvariable/pom.xml
@@ -32,6 +32,8 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
+    <helpPluginVersion>@helpPluginVersion@</helpPluginVersion>
   </properties>
 
   <build>

diff --git a/src/it/invocation-environmentvariable/src/it/minvoker-145/pom.xml b/src/it/invocation-environmentvariable/src/it/minvoker-145/pom.xml
@@ -37,7 +37,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-enforcer-plugin</artifactId>
-            <version>1.1.1</version>
+            <version>@enforcerPluginVersion@</version>
             <executions>
               <execution>
                 <goals>

diff --git a/src/it/invocation-environmentvariable/src/it/minvoker-255/pom.xml b/src/it/invocation-environmentvariable/src/it/minvoker-255/pom.xml
@@ -36,7 +36,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M3</version>
+        <version>@enforcerPluginVersion@</version>
         <executions>
           <execution>
             <goals>

diff --git a/src/it/invocation-environmentvariable/src/it/minvoker-273/pom.xml b/src/it/invocation-environmentvariable/src/it/minvoker-273/pom.xml
@@ -36,7 +36,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-help-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>@helpPluginVersion@</version>
         <executions>
           <execution>
             <phase>validate</phase>

diff --git a/src/it/invocation-group-properties/src/it/projects/group-1/sub-1/pom.xml b/src/it/invocation-group-properties/src/it/projects/group-1/sub-1/pom.xml
@@ -31,7 +31,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M2</version>
+        <version>@enforcerPluginVersion@</version>
         <executions>
           <execution>
             <id>enforce</id>

diff --git a/src/it/invocation-group-properties/src/it/projects/group-1/sub-2/pom.xml b/src/it/invocation-group-properties/src/it/projects/group-1/sub-2/pom.xml
@@ -31,7 +31,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M2</version>
+        <version>@enforcerPluginVersion@</version>
         <executions>
           <execution>
             <id>enforce</id>

diff --git a/src/it/invocation-group-properties/src/it/projects/group-2/sub-1/pom.xml b/src/it/invocation-group-properties/src/it/projects/group-2/sub-1/pom.xml
@@ -31,7 +31,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M2</version>
+        <version>@enforcerPluginVersion@</version>
         <executions>
           <execution>
             <id>enforce</id>

diff --git a/src/it/invocation-group-properties/src/it/projects/group-2/sub-2/pom.xml b/src/it/invocation-group-properties/src/it/projects/group-2/sub-2/pom.xml
@@ -31,7 +31,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M2</version>
+        <version>@enforcerPluginVersion@</version>
         <executions>
           <execution>
             <id>enforce</id>

diff --git a/src/it/invocation-multiple/pom.xml b/src/it/invocation-multiple/pom.xml
@@ -31,6 +31,13 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <mavenVersion>@mavenVersion@</mavenVersion>
+    <compilerPluginVersion>@compilerPluginVersion@</compilerPluginVersion>
+    <installPluginVersion>@installPluginVersion@</installPluginVersion>
+    <jarPluginVersion>@jarPluginVersion@</jarPluginVersion>
+    <pluginPluginVersion>@pluginPluginVersion@</pluginPluginVersion>
+    <resourcesPluginVersion>@resourcesPluginVersion@</resourcesPluginVersion>
+    <surefirePluginVersion>@surefirePluginVersion@</surefirePluginVersion>
   </properties>
 
   <build>

diff --git a/src/it/invocation-multiple/src/it/project/pom.xml b/src/it/invocation-multiple/src/it/project/pom.xml
@@ -27,7 +27,7 @@ under the License.
   <packaging>maven-plugin</packaging>
 
   <prerequisites>
-    <maven>2.0</maven>
+    <maven>@mavenVersion@</maven>
   </prerequisites>
 
   <properties>
@@ -38,39 +38,40 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
+      <version>@mavenVersion@</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>@compilerPluginVersion@</version>
         <configuration>
           <source>${maven.compiler.source}</source>
           <target>${maven.compiler.target}</target>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-install-plugin</artifactId>
-        <version>2.2</version>
+        <version>@installPluginVersion@</version>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
+        <version>@jarPluginVersion@</version>
       </plugin>
       <plugin>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>2.4.2</version>
+        <version>@pluginPluginVersion@</version>
       </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>@resourcesPluginVersion@</version>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>@surefirePluginVersion@</version>
       </plugin>
     </plugins>
   </build>

diff --git a/src/it/invocation-reactor-indirect/pom.xml b/src/it/invocation-reactor-indirect/pom.xml
@@ -48,17 +48,17 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.5.1</version>
+          <version>@compilerPluginVersion@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>2.9</version>
+          <version>@pluginPluginVersion@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.6</version>
+          <version>@resourcesPluginVersion@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/it/invocation-spaces/pom.xml b/src/it/invocation-spaces/pom.xml
@@ -31,6 +31,11 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <compilerPluginVersion>@compilerPluginVersion@</compilerPluginVersion>
+    <installPluginVersion>@installPluginVersion@</installPluginVersion>
+    <jarPluginVersion>@jarPluginVersion@</jarPluginVersion>
+    <resourcesPluginVersion>@resourcesPluginVersion@</resourcesPluginVersion>
+    <surefirePluginVersion>@surefirePluginVersion@</surefirePluginVersion>
   </properties>
 
   <build>

diff --git a/src/it/invocation-spaces/src/it projects/project/spacy pom.xml b/src/it/invocation-spaces/src/it projects/project/spacy pom.xml
@@ -41,29 +41,29 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>@compilerPluginVersion@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
-        <version>2.2</version>
+        <version>@installPluginVersion@</version>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
+        <version>@jarPluginVersion@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>@resourcesPluginVersion@</version>
         <configuration>
           <encoding>${project.build.sourceEncoding}</encoding>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>@surefirePluginVersion@</version>
       </plugin>
     </plugins>
   </build>

diff --git a/src/it/local-repo-path/pom.xml b/src/it/local-repo-path/pom.xml
@@ -41,7 +41,7 @@ under the License.
         <!-- This triggers the download of a known version of this plugin which can then be safely invoked by the IT project -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>2.2</version>
+        <version>@cleanPluginVersion@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -54,7 +54,9 @@ under the License.
           </pomIncludes>
           <settingsFile>src/it/settings.xml</settingsFile>
           <goals>
-            <goal>org.apache.maven.plugins:maven-clean-plugin:2.2:clean</goal>
+            <!-- Maven 4 require strict checksum by default, so relax here -->
+            <goal>-c</goal>
+            <goal>org.apache.maven.plugins:maven-clean-plugin:3.2.0:clean</goal>
           </goals>
         </configuration>
         <executions>

diff --git a/src/it/local-repo-url/pom.xml b/src/it/local-repo-url/pom.xml
@@ -41,7 +41,7 @@ under the License.
         <!-- This triggers the download of a known version of this plugin which can then be safely invoked by the IT project -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>@resourcesPluginVersion@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -51,6 +51,8 @@ under the License.
           <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
           <settingsFile>src/it/settings.xml</settingsFile>
           <goals>
+            <!-- Maven 4 require strict checksum by default, so relax here -->
+            <goal>-c</goal>
             <goal>validate</goal>
           </goals>
         </configuration>

diff --git a/src/it/pom-filtering-encoding/pom.xml b/src/it/pom-filtering-encoding/pom.xml
@@ -29,6 +29,10 @@ under the License.
 
   <description>Test to check for proper handling of file encoding during POM filtering.</description>
 
+  <properties>
+    <resourcesPluginVersion>@resourcesPluginVersion@</resourcesPluginVersion>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

diff --git a/src/it/pom-filtering-encoding/src/it/latin-1/pom.xml b/src/it/pom-filtering-encoding/src/it/latin-1/pom.xml
@@ -47,7 +47,7 @@ under the License.
     <plugins>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>@resourcesPluginVersion@</version>
       </plugin>
     </plugins>
   </build>