Fix antrun version in ITs

- use version defined in parent pom - replace task -> target for antrun 3.x
mojohaus · Sep 3, 2023 · 4598f78 · 4598f78
1 parent d839d8f
commit 4598f78
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 49 deletions.
diff --git a/src/it/released-version-existing-asset-issue-108/pom.xml b/src/it/released-version-existing-asset-issue-108/pom.xml
@@ -31,7 +31,9 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <version>@maven-antrun-plugin.version@</version>
         <executions>
           <execution>
             <id>mk-target-dir</id>
@@ -40,9 +42,9 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="${project.build.directory}" />
-              </tasks>
+              </target>
             </configuration>
           </execution>
 
@@ -53,12 +55,12 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>myReleasedVersion.version=${myReleasedVersion.version}</echo>
                 <echo>myReleasedVersion.majorVersion=${myReleasedVersion.majorVersion}</echo>
                 <echo>myReleasedVersion.minorVersion=${myReleasedVersion.minorVersion}</echo>
                 <echo>myReleasedVersion.incrementalVersion=${myReleasedVersion.incrementalVersion}</echo>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

diff --git a/src/it/released-version-existing-asset/pom.xml b/src/it/released-version-existing-asset/pom.xml
@@ -29,7 +29,9 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <version>@maven-antrun-plugin.version@</version>
         <executions>
           <execution>
             <id>mk-target-dir</id>
@@ -38,9 +40,9 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="${project.build.directory}" />
-              </tasks>
+              </target>
             </configuration>
           </execution>
 
@@ -51,12 +53,12 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>myReleasedVersion.version=${myReleasedVersion.version}</echo>
                 <echo>myReleasedVersion.majorVersion=${myReleasedVersion.majorVersion}</echo>
                 <echo>myReleasedVersion.minorVersion=${myReleasedVersion.minorVersion}</echo>
                 <echo>myReleasedVersion.incrementalVersion=${myReleasedVersion.incrementalVersion}</echo>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

diff --git a/src/it/released-version/pom.xml b/src/it/released-version/pom.xml
@@ -26,7 +26,9 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <version>@maven-antrun-plugin.version@</version>
         <executions>
           <execution>
             <id>mk-target-dir</id>
@@ -35,9 +37,9 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="${project.build.directory}" />
-              </tasks>
+              </target>
             </configuration>
           </execution>
 
@@ -48,12 +50,12 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>myReleasedVersion.version=${myReleasedVersion.version}</echo>
                 <echo>myReleasedVersion.majorVersion=${myReleasedVersion.majorVersion}</echo>
                 <echo>myReleasedVersion.minorVersion=${myReleasedVersion.minorVersion}</echo>
                 <echo>myReleasedVersion.incrementalVersion=${myReleasedVersion.incrementalVersion}</echo>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

diff --git a/src/it/reserve-ports-with-min-root-range/pom.xml b/src/it/reserve-ports-with-min-root-range/pom.xml
@@ -43,19 +43,20 @@
       </plugin>
 
        <plugin>
-
-        <artifactId>maven-antrun-plugin</artifactId>        
-        <executions>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+         <version>@maven-antrun-plugin.version@</version>
+         <executions>
           <execution>
             <id>mk-target-dir</id>
             <phase>compile</phase>
             <goals>
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="${project.build.directory}" />
-              </tasks>                
+              </target>
             </configuration>
           </execution>
 
@@ -66,11 +67,11 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>port1=${port1}</echo>
                 <echo>port2=${port2}</echo>
                 <echo>port3=${port3}</echo>
-              </tasks>                
+              </target>
             </configuration>
           </execution>
         </executions>

diff --git a/src/it/reserve-ports-with-min/pom.xml b/src/it/reserve-ports-with-min/pom.xml
@@ -72,19 +72,20 @@
       </plugin>
 
        <plugin>
-
-        <artifactId>maven-antrun-plugin</artifactId>        
-        <executions>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+         <version>@maven-antrun-plugin.version@</version>
+         <executions>
           <execution>
             <id>mk-target-dir</id>
             <phase>compile</phase>
             <goals>
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="${project.build.directory}" />
-              </tasks>                
+              </target>
             </configuration>
           </execution>
 
@@ -95,7 +96,7 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>port1=${port1}</echo>
                 <echo>port2=${port2}</echo>
                 <echo>port3=${port3}</echo>
@@ -105,7 +106,7 @@
                 <echo>port7=${port7}</echo>
                 <echo>port8=${port8}</echo>
                 <echo>port9=${port9}</echo>
-              </tasks>                
+              </target>
             </configuration>
           </execution>
         </executions>

diff --git a/src/it/reserve-ports-with-random/pom.xml b/src/it/reserve-ports-with-random/pom.xml
@@ -44,9 +44,9 @@
       </plugin>
 
        <plugin>
-
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
+        <version>@maven-antrun-plugin.version@</version>
         <executions>
           <execution>
             <id>mk-target-dir</id>
@@ -55,9 +55,9 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="${project.build.directory}" />
-              </tasks>
+              </target>
             </configuration>
           </execution>
 
@@ -68,11 +68,11 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>port1=${port1}</echo>
                 <echo>port2=${port2}</echo>
                 <echo>port3=${port3}</echo>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

diff --git a/src/it/reserve-ports-with-sequence/pom.xml b/src/it/reserve-ports-with-sequence/pom.xml
@@ -44,9 +44,9 @@
       </plugin>
 
        <plugin>
-
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
+        <version>@maven-antrun-plugin.version@</version>
         <executions>
           <execution>
             <id>mk-target-dir</id>
@@ -55,9 +55,9 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="${project.build.directory}" />
-              </tasks>
+              </target>
             </configuration>
           </execution>
 
@@ -68,11 +68,11 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>port1=${port1}</echo>
                 <echo>port2=${port2}</echo>
                 <echo>port3=${port3}</echo>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

diff --git a/src/it/reserve-ports-with-urls/pom.xml b/src/it/reserve-ports-with-urls/pom.xml
@@ -43,7 +43,9 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <version>@maven-antrun-plugin.version@</version>
         <executions>
           <execution>
             <id>mk-target-dir</id>
@@ -52,9 +54,9 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="${project.build.directory}" />
-              </tasks>
+              </target>
             </configuration>
           </execution>
 
@@ -65,11 +67,11 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>port1=${port1}</echo>
                 <echo>port2=${port2}</echo>
                 <echo>port3=${port3}</echo>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

diff --git a/src/it/reserve-ports/pom.xml b/src/it/reserve-ports/pom.xml
@@ -56,19 +56,20 @@
       </plugin>
 
        <plugin>
-
-        <artifactId>maven-antrun-plugin</artifactId>        
-        <executions>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+         <version>@maven-antrun-plugin.version@</version>
+         <executions>
           <execution>
             <id>mk-target-dir</id>
             <phase>compile</phase>
             <goals>
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="${project.build.directory}" />
-              </tasks>                
+              </target>
             </configuration>
           </execution>
 
@@ -79,11 +80,11 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>port1=${port1}</echo>
                 <echo>port2=${port2}</echo>
                 <echo>port3=${port3}</echo>
-              </tasks>                
+              </target>
             </configuration>
           </execution>
         </executions>