Skip to content

Commit d7cb1c5

Browse files
slawekjaranowskislawekjaranowski
committed
Fix antrun version in ITs
- use version defined in parent pom - replace task -> target for antrun 3.x
1 parent d839d8f commit d7cb1c5

9 files changed

Lines changed: 60 additions & 49 deletions

File tree

‎src/it/released-version-existing-asset-issue-108/pom.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
</executions>
3232
</plugin>
3333
<plugin>
34+
<groupId>org.apache.maven.plugins</groupId>
3435
<artifactId>maven-antrun-plugin</artifactId>
36+
<version>@maven-antrun-plugin.version@</version>
3537
<executions>
3638
<execution>
3739
<id>mk-target-dir</id>
@@ -40,9 +42,9 @@
4042
<goal>run</goal>
4143
</goals>
4244
<configuration>
43-
<tasks>
45+
<target>
4446
<mkdir dir="${project.build.directory}" />
45-
</tasks>
47+
</target>
4648
</configuration>
4749
</execution>
4850

@@ -53,12 +55,12 @@
5355
<goal>run</goal>
5456
</goals>
5557
<configuration>
56-
<tasks>
58+
<target>
5759
<echo>myReleasedVersion.version=${myReleasedVersion.version}</echo>
5860
<echo>myReleasedVersion.majorVersion=${myReleasedVersion.majorVersion}</echo>
5961
<echo>myReleasedVersion.minorVersion=${myReleasedVersion.minorVersion}</echo>
6062
<echo>myReleasedVersion.incrementalVersion=${myReleasedVersion.incrementalVersion}</echo>
61-
</tasks>
63+
</target>
6264
</configuration>
6365
</execution>
6466
</executions>

‎src/it/released-version-existing-asset/pom.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
</executions>
3030
</plugin>
3131
<plugin>
32+
<groupId>org.apache.maven.plugins</groupId>
3233
<artifactId>maven-antrun-plugin</artifactId>
34+
<version>@maven-antrun-plugin.version@</version>
3335
<executions>
3436
<execution>
3537
<id>mk-target-dir</id>
@@ -38,9 +40,9 @@
3840
<goal>run</goal>
3941
</goals>
4042
<configuration>
41-
<tasks>
43+
<target>
4244
<mkdir dir="${project.build.directory}" />
43-
</tasks>
45+
</target>
4446
</configuration>
4547
</execution>
4648

@@ -51,12 +53,12 @@
5153
<goal>run</goal>
5254
</goals>
5355
<configuration>
54-
<tasks>
56+
<target>
5557
<echo>myReleasedVersion.version=${myReleasedVersion.version}</echo>
5658
<echo>myReleasedVersion.majorVersion=${myReleasedVersion.majorVersion}</echo>
5759
<echo>myReleasedVersion.minorVersion=${myReleasedVersion.minorVersion}</echo>
5860
<echo>myReleasedVersion.incrementalVersion=${myReleasedVersion.incrementalVersion}</echo>
59-
</tasks>
61+
</target>
6062
</configuration>
6163
</execution>
6264
</executions>

‎src/it/released-version/pom.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
</executions>
2727
</plugin>
2828
<plugin>
29+
<groupId>org.apache.maven.plugins</groupId>
2930
<artifactId>maven-antrun-plugin</artifactId>
31+
<version>@maven-antrun-plugin.version@</version>
3032
<executions>
3133
<execution>
3234
<id>mk-target-dir</id>
@@ -35,9 +37,9 @@
3537
<goal>run</goal>
3638
</goals>
3739
<configuration>
38-
<tasks>
40+
<target>
3941
<mkdir dir="${project.build.directory}" />
40-
</tasks>
42+
</target>
4143
</configuration>
4244
</execution>
4345

@@ -48,12 +50,12 @@
4850
<goal>run</goal>
4951
</goals>
5052
<configuration>
51-
<tasks>
53+
<target>
5254
<echo>myReleasedVersion.version=${myReleasedVersion.version}</echo>
5355
<echo>myReleasedVersion.majorVersion=${myReleasedVersion.majorVersion}</echo>
5456
<echo>myReleasedVersion.minorVersion=${myReleasedVersion.minorVersion}</echo>
5557
<echo>myReleasedVersion.incrementalVersion=${myReleasedVersion.incrementalVersion}</echo>
56-
</tasks>
58+
</target>
5759
</configuration>
5860
</execution>
5961
</executions>

‎src/it/reserve-ports-with-min-root-range/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,20 @@
4343
</plugin>
4444

4545
<plugin>
46-
47-
<artifactId>maven-antrun-plugin</artifactId>
48-
<executions>
46+
<groupId>org.apache.maven.plugins</groupId>
47+
<artifactId>maven-antrun-plugin</artifactId>
48+
<version>@maven-antrun-plugin.version@</version>
49+
<executions>
4950
<execution>
5051
<id>mk-target-dir</id>
5152
<phase>compile</phase>
5253
<goals>
5354
<goal>run</goal>
5455
</goals>
5556
<configuration>
56-
<tasks>
57+
<target>
5758
<mkdir dir="${project.build.directory}" />
58-
</tasks>
59+
</target>
5960
</configuration>
6061
</execution>
6162

@@ -66,11 +67,11 @@
6667
<goal>run</goal>
6768
</goals>
6869
<configuration>
69-
<tasks>
70+
<target>
7071
<echo>port1=${port1}</echo>
7172
<echo>port2=${port2}</echo>
7273
<echo>port3=${port3}</echo>
73-
</tasks>
74+
</target>
7475
</configuration>
7576
</execution>
7677
</executions>

‎src/it/reserve-ports-with-min/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,20 @@
7272
</plugin>
7373

7474
<plugin>
75-
76-
<artifactId>maven-antrun-plugin</artifactId>
77-
<executions>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-antrun-plugin</artifactId>
77+
<version>@maven-antrun-plugin.version@</version>
78+
<executions>
7879
<execution>
7980
<id>mk-target-dir</id>
8081
<phase>compile</phase>
8182
<goals>
8283
<goal>run</goal>
8384
</goals>
8485
<configuration>
85-
<tasks>
86+
<target>
8687
<mkdir dir="${project.build.directory}" />
87-
</tasks>
88+
</target>
8889
</configuration>
8990
</execution>
9091

@@ -95,7 +96,7 @@
9596
<goal>run</goal>
9697
</goals>
9798
<configuration>
98-
<tasks>
99+
<target>
99100
<echo>port1=${port1}</echo>
100101
<echo>port2=${port2}</echo>
101102
<echo>port3=${port3}</echo>
@@ -105,7 +106,7 @@
105106
<echo>port7=${port7}</echo>
106107
<echo>port8=${port8}</echo>
107108
<echo>port9=${port9}</echo>
108-
</tasks>
109+
</target>
109110
</configuration>
110111
</execution>
111112
</executions>

‎src/it/reserve-ports-with-random/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
</plugin>
4545

4646
<plugin>
47-
47+
<groupId>org.apache.maven.plugins</groupId>
4848
<artifactId>maven-antrun-plugin</artifactId>
49-
<version>1.8</version>
49+
<version>@maven-antrun-plugin.version@</version>
5050
<executions>
5151
<execution>
5252
<id>mk-target-dir</id>
@@ -55,9 +55,9 @@
5555
<goal>run</goal>
5656
</goals>
5757
<configuration>
58-
<tasks>
58+
<target>
5959
<mkdir dir="${project.build.directory}" />
60-
</tasks>
60+
</target>
6161
</configuration>
6262
</execution>
6363

@@ -68,11 +68,11 @@
6868
<goal>run</goal>
6969
</goals>
7070
<configuration>
71-
<tasks>
71+
<target>
7272
<echo>port1=${port1}</echo>
7373
<echo>port2=${port2}</echo>
7474
<echo>port3=${port3}</echo>
75-
</tasks>
75+
</target>
7676
</configuration>
7777
</execution>
7878
</executions>

‎src/it/reserve-ports-with-sequence/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
</plugin>
4545

4646
<plugin>
47-
47+
<groupId>org.apache.maven.plugins</groupId>
4848
<artifactId>maven-antrun-plugin</artifactId>
49-
<version>1.8</version>
49+
<version>@maven-antrun-plugin.version@</version>
5050
<executions>
5151
<execution>
5252
<id>mk-target-dir</id>
@@ -55,9 +55,9 @@
5555
<goal>run</goal>
5656
</goals>
5757
<configuration>
58-
<tasks>
58+
<target>
5959
<mkdir dir="${project.build.directory}" />
60-
</tasks>
60+
</target>
6161
</configuration>
6262
</execution>
6363

@@ -68,11 +68,11 @@
6868
<goal>run</goal>
6969
</goals>
7070
<configuration>
71-
<tasks>
71+
<target>
7272
<echo>port1=${port1}</echo>
7373
<echo>port2=${port2}</echo>
7474
<echo>port3=${port3}</echo>
75-
</tasks>
75+
</target>
7676
</configuration>
7777
</execution>
7878
</executions>

‎src/it/reserve-ports-with-urls/pom.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343
</executions>
4444
</plugin>
4545
<plugin>
46+
<groupId>org.apache.maven.plugins</groupId>
4647
<artifactId>maven-antrun-plugin</artifactId>
48+
<version>@maven-antrun-plugin.version@</version>
4749
<executions>
4850
<execution>
4951
<id>mk-target-dir</id>
@@ -52,9 +54,9 @@
5254
<goal>run</goal>
5355
</goals>
5456
<configuration>
55-
<tasks>
57+
<target>
5658
<mkdir dir="${project.build.directory}" />
57-
</tasks>
59+
</target>
5860
</configuration>
5961
</execution>
6062

@@ -65,11 +67,11 @@
6567
<goal>run</goal>
6668
</goals>
6769
<configuration>
68-
<tasks>
70+
<target>
6971
<echo>port1=${port1}</echo>
7072
<echo>port2=${port2}</echo>
7173
<echo>port3=${port3}</echo>
72-
</tasks>
74+
</target>
7375
</configuration>
7476
</execution>
7577
</executions>

‎src/it/reserve-ports/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,20 @@
5656
</plugin>
5757

5858
<plugin>
59-
60-
<artifactId>maven-antrun-plugin</artifactId>
61-
<executions>
59+
<groupId>org.apache.maven.plugins</groupId>
60+
<artifactId>maven-antrun-plugin</artifactId>
61+
<version>@maven-antrun-plugin.version@</version>
62+
<executions>
6263
<execution>
6364
<id>mk-target-dir</id>
6465
<phase>compile</phase>
6566
<goals>
6667
<goal>run</goal>
6768
</goals>
6869
<configuration>
69-
<tasks>
70+
<target>
7071
<mkdir dir="${project.build.directory}" />
71-
</tasks>
72+
</target>
7273
</configuration>
7374
</execution>
7475

@@ -79,11 +80,11 @@
7980
<goal>run</goal>
8081
</goals>
8182
<configuration>
82-
<tasks>
83+
<target>
8384
<echo>port1=${port1}</echo>
8485
<echo>port2=${port2}</echo>
8586
<echo>port3=${port3}</echo>
86-
</tasks>
87+
</target>
8788
</configuration>
8889
</execution>
8990
</executions>

0 commit comments

Comments
 (0)