Skip to content

Commit

Permalink
Fix antrun version in ITs
Browse files Browse the repository at this point in the history
- use version defined in parent pom
- replace task -> target for antrun 3.x
  • Loading branch information
slawekjaranowski committed Sep 4, 2023
1 parent d839d8f commit d7cb1c5
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 49 deletions.
10 changes: 6 additions & 4 deletions src/it/released-version-existing-asset-issue-108/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -40,9 +42,9 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<mkdir dir="${project.build.directory}" />
</tasks>
</target>
</configuration>
</execution>

Expand All @@ -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>
Expand Down
10 changes: 6 additions & 4 deletions src/it/released-version-existing-asset/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -38,9 +40,9 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<mkdir dir="${project.build.directory}" />
</tasks>
</target>
</configuration>
</execution>

Expand All @@ -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>
Expand Down
10 changes: 6 additions & 4 deletions src/it/released-version/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -35,9 +37,9 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<mkdir dir="${project.build.directory}" />
</tasks>
</target>
</configuration>
</execution>

Expand All @@ -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>
Expand Down
15 changes: 8 additions & 7 deletions src/it/reserve-ports-with-min-root-range/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
15 changes: 8 additions & 7 deletions src/it/reserve-ports-with-min/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -95,7 +96,7 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<echo>port1=${port1}</echo>
<echo>port2=${port2}</echo>
<echo>port3=${port3}</echo>
Expand All @@ -105,7 +106,7 @@
<echo>port7=${port7}</echo>
<echo>port8=${port8}</echo>
<echo>port9=${port9}</echo>
</tasks>
</target>
</configuration>
</execution>
</executions>
Expand Down
12 changes: 6 additions & 6 deletions src/it/reserve-ports-with-random/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -55,9 +55,9 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<mkdir dir="${project.build.directory}" />
</tasks>
</target>
</configuration>
</execution>

Expand All @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions src/it/reserve-ports-with-sequence/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -55,9 +55,9 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<mkdir dir="${project.build.directory}" />
</tasks>
</target>
</configuration>
</execution>

Expand All @@ -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>
Expand Down
10 changes: 6 additions & 4 deletions src/it/reserve-ports-with-urls/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -52,9 +54,9 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<mkdir dir="${project.build.directory}" />
</tasks>
</target>
</configuration>
</execution>

Expand All @@ -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>
Expand Down
15 changes: 8 additions & 7 deletions src/it/reserve-ports/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down

0 comments on commit d7cb1c5

Please sign in to comment.