[MINVOKER-362] Use properties from parent for plugins versions in ITs

by the way - replace pom.version with project.version
apache · May 1, 2024 · f121de5 · f121de5
1 parent ee34dc2
commit f121de5
Show file tree

Hide file tree

Showing 93 changed files with 150 additions and 140 deletions.
diff --git a/pom.xml b/pom.xml
@@ -375,21 +375,6 @@ under the License.
   <profiles>
     <profile>
       <id>run-its</id>
-      <properties>
-        <!-- plugins versions used in IT tests -->
-        <antrunPluginVersion>3.1.0</antrunPluginVersion>
-        <cleanPluginVersion>3.2.0</cleanPluginVersion>
-        <compilerPluginVersion>3.11.0</compilerPluginVersion>
-        <enforcerPluginVersion>3.2.1</enforcerPluginVersion>
-        <helpPluginVersion>3.4.0</helpPluginVersion>
-        <installPluginVersion>3.1.1</installPluginVersion>
-        <jarPluginVersion>3.3.0</jarPluginVersion>
-        <pluginPluginVersion>3.8.1</pluginPluginVersion>
-        <resourcesPluginVersion>3.3.1</resourcesPluginVersion>
-        <sitePluginVersion>3.12.1</sitePluginVersion>
-        <sourcePluginVersion>3.2.1</sourcePluginVersion>
-        <surefirePluginVersion>3.0.0</surefirePluginVersion>
-      </properties>
       <build>
         <pluginManagement>
           <plugins>

diff --git a/src/it/MINVOKER-191/plugin/pom.xml b/src/it/MINVOKER-191/plugin/pom.xml
@@ -39,6 +39,17 @@ under the License.
   </dependencies>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <configuration>
+            <goalPrefix>test</goalPrefix>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

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>@compilerPluginVersion@</version>
+          <version>@version.maven-compiler-plugin@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>@pluginPluginVersion@</version>
+          <version>@version.maven-plugin-tools@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>@resourcesPluginVersion@</version>
+          <version>@version.maven-resources-plugin@</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,12 +41,12 @@ 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>@resourcesPluginVersion@</version>
+        <version>@version.maven-resources-plugin@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <ignoreFailures>true</ignoreFailures>
           <writeJunitReport>true</writeJunitReport>

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>@resourcesPluginVersion@</version>
+        <version>@version.maven-resources-plugin@</version>
       </plugin>
     </plugins>
   </build>

diff --git a/src/it/MINVOKER-288-failed-setup-run/pom.xml b/src/it/MINVOKER-288-failed-setup-run/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
           <writeJunitReport>true</writeJunitReport>

diff --git a/src/it/MINVOKER-288-failed-setup-verify/pom.xml b/src/it/MINVOKER-288-failed-setup-verify/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
           <writeJunitReport>true</writeJunitReport>

diff --git a/src/it/MINVOKER-289/pom.xml b/src/it/MINVOKER-289/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <writeJunitReport>true</writeJunitReport>
           <debug>true</debug>

diff --git a/src/it/clone-clean/pom.xml b/src/it/clone-clean/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
           <cloneClean>true</cloneClean>

diff --git a/src/it/clone-maven-plugin-packaging/pom.xml b/src/it/clone-maven-plugin-packaging/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
           <cloneClean>true</cloneClean>

diff --git a/src/it/fail-build-streamLogsOnFailures/pom.xml b/src/it/fail-build-streamLogsOnFailures/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <writeJunitReport>true</writeJunitReport>
           <debug>false</debug>

diff --git a/src/it/fail-build-with-verify/pom.xml b/src/it/fail-build-with-verify/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <debug>true</debug>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

diff --git a/src/it/fail-build/pom.xml b/src/it/fail-build/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <writeJunitReport>true</writeJunitReport>
           <debug>true</debug>

diff --git a/src/it/fail-ignore-with-verify/pom.xml b/src/it/fail-ignore-with-verify/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <debug>true</debug>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

diff --git a/src/it/fail-ignore/pom.xml b/src/it/fail-ignore/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <debug>true</debug>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

diff --git a/src/it/fail-noprojects_integration-test/pom.xml b/src/it/fail-noprojects_integration-test/pom.xml
@@ -37,7 +37,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <failIfNoProjects>true</failIfNoProjects>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

diff --git a/src/it/fail-noprojects_run/pom.xml b/src/it/fail-noprojects_run/pom.xml
@@ -37,7 +37,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <failIfNoProjects>true</failIfNoProjects>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

diff --git a/src/it/fail-noprojects_verify/pom.xml b/src/it/fail-noprojects_verify/pom.xml
@@ -37,7 +37,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <failIfNoProjects>true</failIfNoProjects>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

diff --git a/src/it/fail-postbuild/pom.xml b/src/it/fail-postbuild/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <debug>true</debug>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

diff --git a/src/it/fail-prebuild/pom.xml b/src/it/fail-prebuild/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <debug>true</debug>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

diff --git a/src/it/fail-run-postbuild/pom.xml b/src/it/fail-run-postbuild/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <debug>true</debug>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

diff --git a/src/it/install-extra-artifacts/pom.xml b/src/it/install-extra-artifacts/pom.xml
@@ -40,7 +40,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
           <extraArtifacts>

diff --git a/src/it/integration-test-never-fails/pom.xml b/src/it/integration-test-never-fails/pom.xml
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <debug>true</debug>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

diff --git a/src/it/invocation-cmdline-exclude/pom.xml b/src/it/invocation-cmdline-exclude/pom.xml
@@ -31,7 +31,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
+    <version.maven-enforcer-plugin>@version.maven-enforcer-plugin@</version.maven-enforcer-plugin>
   </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>@enforcerPluginVersion@</version>
+        <version>@version.maven-enforcer-plugin@</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>@enforcerPluginVersion@</version>
+        <version>@version.maven-enforcer-plugin@</version>
         <executions>
           <execution>
             <goals>

diff --git a/src/it/invocation-debug/pom.xml b/src/it/invocation-debug/pom.xml
@@ -33,15 +33,15 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
+    <version.maven-enforcer-plugin>@version.maven-enforcer-plugin@</version.maven-enforcer-plugin>
   </properties>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <goals>
             <goal>validate</goal>

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>@enforcerPluginVersion@</version>
+        <version>@version.maven-enforcer-plugin@</version>
         <executions>
           <execution>
             <goals>

diff --git a/src/it/invocation-emptyproperty/pom.xml b/src/it/invocation-emptyproperty/pom.xml
@@ -31,7 +31,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
+    <version.maven-enforcer-plugin>@version.maven-enforcer-plugin@</version.maven-enforcer-plugin>
   </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>@enforcerPluginVersion@</version>
+        <version>@version.maven-enforcer-plugin@</version>
         <executions>
           <execution>
             <goals>

diff --git a/src/it/invocation-environmentvariable/pom.xml b/src/it/invocation-environmentvariable/pom.xml
@@ -32,8 +32,8 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
-    <helpPluginVersion>@helpPluginVersion@</helpPluginVersion>
+    <version.maven-enforcer-plugin>@version.maven-enforcer-plugin@</version.maven-enforcer-plugin>
+    <version.maven-help-plugin>@version.maven-help-plugin@</version.maven-help-plugin>
   </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>@enforcerPluginVersion@</version>
+            <version>@version.maven-enforcer-plugin@</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>@enforcerPluginVersion@</version>
+        <version>@version.maven-enforcer-plugin@</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>@helpPluginVersion@</version>
+        <version>@version.maven-help-plugin@</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>@enforcerPluginVersion@</version>
+        <version>@version.maven-enforcer-plugin@</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>@enforcerPluginVersion@</version>
+        <version>@version.maven-enforcer-plugin@</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>@enforcerPluginVersion@</version>
+        <version>@version.maven-enforcer-plugin@</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>@enforcerPluginVersion@</version>
+        <version>@version.maven-enforcer-plugin@</version>
         <executions>
           <execution>
             <id>enforce</id>