[MPLUGIN-468] Upgrade plugins and components (in ITs)

apache · May 12, 2023 · ee9b35d · ee9b35d
1 parent 8c2f8a3
commit ee9b35d
Show file tree

Hide file tree

Showing 41 changed files with 160 additions and 83 deletions.
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
@@ -29,8 +29,8 @@ under the License.
 
   <name>Maven Integration Test :: annotation-with-inheritance-from-deps</name>
   <description>
-    Test plugin-plugin, which tests maven-plugin-tools-api and 
-    maven-plugin-tools-java. This will generate a plugin descriptor from 
+    Test plugin-plugin, which tests maven-plugin-tools-api and
+    maven-plugin-tools-java. This will generate a plugin descriptor from
     java-based mojo sources, install the plugin, and then use it.
   </description>
 
@@ -80,7 +80,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.4</version>
+          <version>@compilerPluginVersion@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
@@ -84,7 +84,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.4</version>
+          <version>@compilerPluginVersion@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
@@ -29,8 +29,8 @@ under the License.
 
   <name>Maven Integration Test :: annotation-with-inheritance</name>
   <description>
-    Test plugin-plugin, which tests maven-plugin-tools-api and 
-    maven-plugin-tools-java. This will generate a plugin descriptor from 
+    Test plugin-plugin, which tests maven-plugin-tools-api and
+    maven-plugin-tools-java. This will generate a plugin descriptor from
     java-based mojo sources, install the plugin, and then use it.
   </description>
 
@@ -76,7 +76,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.4</version>
+          <version>@compilerPluginVersion@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/expected-help.txt b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/expected-help.txt
@@ -1,7 +1,7 @@
-[INFO] help 1.0-SNAPSHOT
+[INFO] help-deprecated-annotation-only 1.0-SNAPSHOT
   Tests generation and compilation of the help mojo.
 
-help:test
+help-deprecated-annotation-only:test
   Deprecated. No reason given
 
   MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some important

diff --git a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/invoker.properties b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/invoker.properties
@@ -5,9 +5,9 @@
 # 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
@@ -16,4 +16,4 @@
 # under the License.
 
 invoker.goals.1 = clean install
-invoker.goals.2 = --log-file help.log org.apache.maven.its.plugin:help:1.0-SNAPSHOT:help
+invoker.goals.2 = --log-file help.log org.apache.maven.its.plugin:help-deprecated-annotation-only:1.0-SNAPSHOT:help
diff --git a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.its.plugin</groupId>
-  <artifactId>help</artifactId>
+  <artifactId>help-deprecated-annotation-only</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
@@ -56,7 +56,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.10.1</version>
+          <version>@compilerPluginVersion@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/verify.groovy b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/verify.groovy
@@ -20,7 +20,7 @@
 expected = new File( basedir, "expected-help.txt" ).text.trim().replace( "\r", "" )
 
 log = new File( basedir, "help.log" ).text.replace( "\r", "" )
-log = log.substring( log.indexOf( "[INFO] help 1.0-SNAPSHOT" ) )
+log = log.substring( log.indexOf( "[INFO] help-deprecated-annotation-only 1.0-SNAPSHOT" ) )
 log = log.substring( 0, log.indexOf( "[INFO]", 5 ) ).trim()
 
 assert log == expected

diff --git a/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml b/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
@@ -56,7 +56,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>@compilerPluginVersion@</version>
           <configuration>
             <source>11</source>
             <target>11</target>

diff --git a/maven-plugin-plugin/src/it/help-basic/pom.xml b/maven-plugin-plugin/src/it/help-basic/pom.xml
@@ -56,7 +56,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.4</version>
+          <version>@compilerPluginVersion@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/maven-plugin-plugin/src/it/help-package/pom.xml b/maven-plugin-plugin/src/it/help-package/pom.xml
@@ -50,7 +50,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.4</version>
+          <version>@compilerPluginVersion@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
@@ -29,8 +29,8 @@ under the License.
 
   <name>Maven Integration Test :: basic-java-annotations-jdk8</name>
   <description>
-    Test plugin-plugin, which tests maven-plugin-tools-api and 
-    maven-plugin-tools-java. This will generate a plugin descriptor from 
+    Test plugin-plugin, which tests maven-plugin-tools-api and
+    maven-plugin-tools-java. This will generate a plugin descriptor from
     java-based mojo sources, install the plugin, and then use it.
   </description>
 
@@ -69,7 +69,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.1</version>
+          <version>@compilerPluginVersion@</version>
           <configuration>
             <source>1.8</source><!-- avoid ${maven.compiler.source} since value is not as expected -->
             <target>1.8</target><!-- avoid ${maven.compiler.target} since value is not as expected -->

diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
@@ -29,8 +29,8 @@ under the License.
 
   <name>Maven Integration Test :: basic-java-annotations-jdk8</name>
   <description>
-    Test plugin-plugin, which tests maven-plugin-tools-api and 
-    maven-plugin-tools-java. This will generate a plugin descriptor from 
+    Test plugin-plugin, which tests maven-plugin-tools-api and
+    maven-plugin-tools-java. This will generate a plugin descriptor from
     java-based mojo sources, install the plugin, and then use it.
   </description>
 
@@ -65,7 +65,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>@compilerPluginVersion@</version>
           <configuration>
             <release>${java.specification.version}</release>
           </configuration>

diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml b/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
@@ -29,8 +29,8 @@ under the License.
 
   <name>Maven Integration Test :: basic-java-annotations</name>
   <description>
-    Test plugin-plugin, which tests maven-plugin-tools-api and 
-    maven-plugin-tools-java. This will generate a plugin descriptor from 
+    Test plugin-plugin, which tests maven-plugin-tools-api and
+    maven-plugin-tools-java. This will generate a plugin descriptor from
     java-based mojo sources, install the plugin, and then use it.
   </description>
 
@@ -70,7 +70,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.4</version>
+          <version>@compilerPluginVersion@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/maven-plugin-plugin/src/it/mplugin-223/pom.xml b/maven-plugin-plugin/src/it/mplugin-223/pom.xml
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.4</version>
+        <version>@compilerPluginVersion@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml b/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
+        <version>@compilerPluginVersion@</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>

diff --git a/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml b/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
@@ -56,7 +56,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.4</version>
+          <version>@compilerPluginVersion@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
@@ -57,7 +57,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.4</version>
+        <version>@compilerPluginVersion@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
@@ -57,7 +57,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.4</version>
+        <version>@compilerPluginVersion@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>maven-surefire-common</artifactId>
-      <version>2.19.1</version>
+      <version>3.1.0</version>
     </dependency>
   </dependencies>
 
@@ -57,7 +57,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.4</version>
+        <version>@compilerPluginVersion@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>