Update plugins in ITs and cleanups

- replace pom.version by project.version - use properties for plugins versions from parent
mojohaus · Jun 6, 2023 · a49676c · a49676c
1 parent 8b876a4
commit a49676c
Show file tree

Hide file tree

Showing 105 changed files with 182 additions and 180 deletions.
diff --git a/pom.xml b/pom.xml
@@ -119,6 +119,8 @@
     <version.httpcomponents.httpclient>4.5.14</version.httpcomponents.httpclient>
     <version.httpcomponents.httpcore>4.4.16</version.httpcomponents.httpcore>
 
+    <build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
+
     <!-- license configuration -->
     <license.useMissingFile>true</license.useMissingFile>
     <license.failOnMissing>true</license.failOnMissing>

diff --git a/src/it/ISSUE-135/pom.xml b/src/it/ISSUE-135/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>org.codehaus.mojo.license.test</groupId>
   <artifactId>test-ISSUE-135</artifactId>
-  <version>@pom.version@</version>
+  <version>@project.version@</version>
   <name>License Test :: ISSUE-135</name>
   <packaging>jar</packaging>
 
@@ -28,7 +28,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.11.0</version>
+          <version>@maven-compiler-plugin.version@</version>
           <configuration>
             <source>1.7</source>
             <target>1.7</target>
@@ -42,7 +42,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>@build-helper-maven-plugin.version@</version>
         <executions>
           <execution>
             <id>add-generated-source-directory</id>
@@ -61,7 +61,7 @@
 
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>@maven-resources-plugin.version@</version>
 
         <executions>
           <execution>
@@ -89,7 +89,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
 
         <executions>
           <execution>

diff --git a/src/it/ISSUE-145-2/pom.xml b/src/it/ISSUE-145-2/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.codehaus.mojo.license.test</groupId>
   <artifactId>test-ISSUE-145-2</artifactId>
-  <version>@pom.version@</version>
+  <version>@project.version@</version>
   <name>License Test :: ISSUE-145-2</name>
   <packaging>pom</packaging>
 
@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>@maven-compiler-plugin.version@</version>
       </plugin>
     </plugins>
 
@@ -49,7 +49,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>@pom.version@</version>
+          <version>@project.version@</version>
           <executions>
             <execution>
               <id>aggregate-add-third-party</id>

diff --git a/src/it/ISSUE-145-2/submodule1/pom.xml b/src/it/ISSUE-145-2/submodule1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.mojo.license.test</groupId>
     <artifactId>test-ISSUE-145-2</artifactId>
-    <version>@pom.version@</version>
+    <version>@project.version@</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>org.codehaus.mojo.license.test</groupId>
       <artifactId>test-ISSUE-145-2-submodule2</artifactId>
-      <version>@pom.version@</version>
+      <version>@project.version@</version>
     </dependency>
   </dependencies>
 

diff --git a/src/it/ISSUE-145-2/submodule2/pom.xml b/src/it/ISSUE-145-2/submodule2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.mojo.license.test</groupId>
     <artifactId>test-ISSUE-145-2</artifactId>
-    <version>@pom.version@</version>
+    <version>@project.version@</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>org.codehaus.mojo.license.test</groupId>
       <artifactId>test-ISSUE-145-2-submodule3</artifactId>
-      <version>@pom.version@</version>
+      <version>@project.version@</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/ISSUE-145-2/submodule3/pom.xml b/src/it/ISSUE-145-2/submodule3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.mojo.license.test</groupId>
     <artifactId>test-ISSUE-145-2</artifactId>
-    <version>@pom.version@</version>
+    <version>@project.version@</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.codehaus.mojo.license.test</groupId>
       <artifactId>test-ISSUE-145-2-submodule4</artifactId>
-      <version>@pom.version@</version>
+      <version>@project.version@</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/ISSUE-145-2/submodule4/pom.xml b/src/it/ISSUE-145-2/submodule4/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.mojo.license.test</groupId>
     <artifactId>test-ISSUE-145-2</artifactId>
-    <version>@pom.version@</version>
+    <version>@project.version@</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/src/it/ISSUE-145/pom.xml b/src/it/ISSUE-145/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.codehaus.mojo.license.test</groupId>
   <artifactId>test-ISSUE-145</artifactId>
-  <version>@pom.version@</version>
+  <version>@project.version@</version>
   <name>License Test :: ISSUE-145</name>
   <packaging>pom</packaging>
 
@@ -38,7 +38,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>@maven-compiler-plugin.version@</version>
       </plugin>
     </plugins>
 
@@ -47,7 +47,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>@pom.version@</version>
+          <version>@project.version@</version>
           <executions>
             <execution>
               <id>aggregate-add-third-party</id>

diff --git a/src/it/ISSUE-145/submodule1/pom.xml b/src/it/ISSUE-145/submodule1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.mojo.license.test</groupId>
     <artifactId>test-ISSUE-145</artifactId>
-    <version>@pom.version@</version>
+    <version>@project.version@</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>org.codehaus.mojo.license.test</groupId>
       <artifactId>test-ISSUE-145-submodule2</artifactId>
-      <version>@pom.version@</version>
+      <version>@project.version@</version>
     </dependency>
   </dependencies>
 

diff --git a/src/it/ISSUE-145/submodule2/pom.xml b/src/it/ISSUE-145/submodule2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.mojo.license.test</groupId>
     <artifactId>test-ISSUE-145</artifactId>
-    <version>@pom.version@</version>
+    <version>@project.version@</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/src/it/ISSUE-154/pom.xml b/src/it/ISSUE-154/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.codehaus.mojo.license.test</groupId>
   <artifactId>test-ISSUE-154</artifactId>
-  <version>@pom.version@</version>
+  <version>@project.version@</version>
 
   <name>License Test :: ISSUE-154</name>
   <packaging>jar</packaging>
@@ -63,7 +63,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>@pom.version@</version>
+          <version>@project.version@</version>
           <configuration>
             <licenseUrlReplacements>
               <licenseUrlReplacement>

diff --git a/src/it/ISSUE-159/pom.xml b/src/it/ISSUE-159/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.codehaus.mojo.license.test</groupId>
   <artifactId>test-ISSUE-159</artifactId>
-  <version>@pom.version@</version>
+  <version>@project.version@</version>
 
   <name>License Test :: ISSUE-159</name>
 
@@ -57,7 +57,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>@pom.version@</version>
+          <version>@project.version@</version>
           <configuration>
             <licenseMerges>
               <licenseMerge>The Apache Software License, Version 2.0|The Apache Software License, Version 2.0

diff --git a/src/it/ISSUE-166/pom.xml b/src/it/ISSUE-166/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>org.codehaus.mojo.license.test</groupId>
   <artifactId>ISSUE-166</artifactId>
-  <version>@pom.version@</version>
+  <version>@project.version@</version>
   <inceptionYear>2019</inceptionYear>
 
   <name>Test ISSUE-166</name>
@@ -36,7 +36,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>@pom.version@</version>
+          <version>@project.version@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/ISSUE-174/pom.xml b/src/it/ISSUE-174/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>org.codehaus.mojo.license.test</groupId>
   <artifactId>ISSUE-174</artifactId>
-  <version>@pom.version@</version>
+  <version>@project.version@</version>
 
   <name>Test ISSUE-174</name>
   <url>http://www.mojohaus.org</url>
@@ -64,7 +64,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>@pom.version@</version>
+          <version>@project.version@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/ISSUE-195/pom.xml b/src/it/ISSUE-195/pom.xml
@@ -31,7 +31,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <executions>
           <execution>
             <goals>

diff --git a/src/it/ISSUE-197/pom.xml b/src/it/ISSUE-197/pom.xml
@@ -31,7 +31,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
       </plugin>
     </plugins>
   </build>

diff --git a/src/it/ISSUE-21/pom.xml b/src/it/ISSUE-21/pom.xml
@@ -36,7 +36,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>@pom.version@</version>
+          <version>@project.version@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/ISSUE-22/pom.xml b/src/it/ISSUE-22/pom.xml
@@ -35,7 +35,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>@pom.version@</version>
+          <version>@project.version@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/ISSUE-324/child1/pom.xml b/src/it/ISSUE-324/child1/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.mojo.license.test</groupId>
     <artifactId>test-ISSUE-324</artifactId>
-    <version>@pom.version@</version>
+    <version>@project.version@</version>
   </parent>
   <artifactId>test-ISSUE-324-child1</artifactId>
   <packaging>jar</packaging>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.codehaus.mojo.license.test</groupId>
       <artifactId>test-ISSUE-324-child2</artifactId>
-      <version>@pom.version@</version>
+      <version>@project.version@</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/ISSUE-324/child2/pom.xml b/src/it/ISSUE-324/child2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.mojo.license.test</groupId>
     <artifactId>test-ISSUE-324</artifactId>
-    <version>@pom.version@</version>
+    <version>@project.version@</version>
   </parent>
   <artifactId>test-ISSUE-324-child2</artifactId>
   <packaging>jar</packaging>

diff --git a/src/it/ISSUE-324/pom.xml b/src/it/ISSUE-324/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.codehaus.mojo.license.test</groupId>
   <artifactId>test-ISSUE-324</artifactId>
-  <version>@pom.version@</version>
+  <version>@project.version@</version>
   <name>License Test :: ISSUE-324</name>
   <packaging>pom</packaging>
 
@@ -32,7 +32,7 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
         <inherited>false</inherited>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <excludedScopes>system,test</excludedScopes>
         </configuration>

diff --git a/src/it/ISSUE-345-2/pom.xml b/src/it/ISSUE-345-2/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.codehaus.mojo.license.test</groupId>
   <artifactId>issue-345-2</artifactId>
-  <version>@pom.version@</version>
+  <version>@project.version@</version>
 
   <name>License Test :: ISSUE-345-2</name>
 
@@ -45,7 +45,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>@pom.version@</version>
+          <version>@project.version@</version>
           <configuration>
             <licenseMerges>
               <licenseMerge>Apache-2.0|The Apache Software License, Version 2.0</licenseMerge>

diff --git a/src/it/ISSUE-345/pom.xml b/src/it/ISSUE-345/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.codehaus.mojo.license.test</groupId>
   <artifactId>issue-345</artifactId>
-  <version>@pom.version@</version>
+  <version>@project.version@</version>
 
   <name>License Test :: ISSUE-345</name>
 
@@ -45,7 +45,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>@pom.version@</version>
+          <version>@project.version@</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/ISSUE-38/pom.xml b/src/it/ISSUE-38/pom.xml
@@ -35,7 +35,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>@pom.version@</version>
+          <version>@project.version@</version>
           <configuration>
             <extraFiles>
               <DockerFile>properties</DockerFile>