Skip to content

Commit 9ffc8fc

Browse files
committed
Fix IT compatibility with maven-parent 50: replace @version.maven-surefire@ with @surefire.version@
The maven-parent 50 (via apache:40) renamed the property: - apache:39: version.maven-surefire=3.5.6 (surefire.version=${version.maven-surefire}) - apache:40: surefire.version=3.6.0 (version.maven-surefire-plugin=${surefire.version}) The IT pom.xml files used @version.maven-surefire@ which is no longer defined in the parent chain, causing invoker to leave the literal placeholder in the filtered POM. Maven then fails to resolve the surefire-plugin version, making ITs fail with a different error than expected by verify.groovy scripts. Using @surefire.version@ which is defined in both apache:39 and apache:40.
1 parent dd33e90 commit 9ffc8fc

20 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ under the License.
8989
<plugin>
9090
<groupId>org.apache.maven.plugins</groupId>
9191
<artifactId>maven-surefire-plugin</artifactId>
92-
<version>@version.maven-surefire@</version>
92+
<version>@surefire.version@</version>
9393
</plugin>
9494
</plugins>
9595
</build>

‎src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ under the License.
8989
<plugin>
9090
<groupId>org.apache.maven.plugins</groupId>
9191
<artifactId>maven-surefire-plugin</artifactId>
92-
<version>@version.maven-surefire@</version>
92+
<version>@surefire.version@</version>
9393
</plugin>
9494
</plugins>
9595
</build>

‎src/it/MDEPLOY-224_deploy-at-end-only-modules/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ under the License.
7676
<plugin>
7777
<groupId>org.apache.maven.plugins</groupId>
7878
<artifactId>maven-surefire-plugin</artifactId>
79-
<version>@version.maven-surefire@</version>
79+
<version>@surefire.version@</version>
8080
</plugin>
8181
</plugins>
8282
</build>

‎src/it/MDEPLOY-225_deploy-at-end-skip-root/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ under the License.
7777
<plugin>
7878
<groupId>org.apache.maven.plugins</groupId>
7979
<artifactId>maven-surefire-plugin</artifactId>
80-
<version>@version.maven-surefire@</version>
80+
<version>@surefire.version@</version>
8181
</plugin>
8282
</plugins>
8383
</build>

‎src/it/alt-deploy-repo-with-dist-mgmt-snapshot/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ under the License.
6969
<plugin>
7070
<groupId>org.apache.maven.plugins</groupId>
7171
<artifactId>maven-surefire-plugin</artifactId>
72-
<version>@version.maven-surefire@</version>
72+
<version>@surefire.version@</version>
7373
</plugin>
7474
</plugins>
7575
</build>

‎src/it/alt-deploy-repo-with-dist-mgmt/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ under the License.
6969
<plugin>
7070
<groupId>org.apache.maven.plugins</groupId>
7171
<artifactId>maven-surefire-plugin</artifactId>
72-
<version>@version.maven-surefire@</version>
72+
<version>@surefire.version@</version>
7373
</plugin>
7474
</plugins>
7575
</build>

‎src/it/alt-deploy-repo-without-dist-mgmt/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ under the License.
6262
<plugin>
6363
<groupId>org.apache.maven.plugins</groupId>
6464
<artifactId>maven-surefire-plugin</artifactId>
65-
<version>@version.maven-surefire@</version>
65+
<version>@surefire.version@</version>
6666
</plugin>
6767
</plugins>
6868
</build>

‎src/it/attach-release-jar/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ under the License.
8484
<plugin>
8585
<groupId>org.apache.maven.plugins</groupId>
8686
<artifactId>maven-surefire-plugin</artifactId>
87-
<version>@version.maven-surefire@</version>
87+
<version>@surefire.version@</version>
8888
</plugin>
8989
</plugins>
9090
</build>

‎src/it/deploy-at-end-fail/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ under the License.
8888
<plugin>
8989
<groupId>org.apache.maven.plugins</groupId>
9090
<artifactId>maven-surefire-plugin</artifactId>
91-
<version>@version.maven-surefire@</version>
91+
<version>@surefire.version@</version>
9292
</plugin>
9393
</plugins>
9494
</build>

‎src/it/deploy-at-end-pass/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ under the License.
9191
<plugin>
9292
<groupId>org.apache.maven.plugins</groupId>
9393
<artifactId>maven-surefire-plugin</artifactId>
94-
<version>@version.maven-surefire@</version>
94+
<version>@surefire.version@</version>
9595
</plugin>
9696
</plugins>
9797
</build>

0 commit comments

Comments
 (0)