This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-3.10.x
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/maven-3.10.x by this push:
new e56033882 Align CP ordering with Maven 4 (#427)
e56033882 is described below
commit e5603388210462a8fc63816da7f5060f5d116d63
Author: Tamas Cservenak <[email protected]>
AuthorDate: Fri Jun 19 13:58:37 2026 +0200
Align CP ordering with Maven 4 (#427)
---
.../MavenITmng3813PluginClassPathOrderingTest.java | 30 +++++++++++++++-------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
index b7ce64cc9..6a7b64f48 100644
---
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
@@ -66,14 +66,26 @@ public class MavenITmng3813PluginClassPathOrderingTest
extends AbstractMavenInte
assertTrue(pclProps.getProperty(resName).endsWith("/dep-a-0.1.jar!/" +
resName));
assertEquals("8", pclProps.getProperty(resName + ".count"));
-
- assertTrue(pclProps.getProperty(resName +
".0").endsWith("/dep-a-0.1.jar!/" + resName));
- assertTrue(pclProps.getProperty(resName +
".1").endsWith("/dep-aa-0.1.jar!/" + resName));
- assertTrue(pclProps.getProperty(resName +
".2").endsWith("/dep-ac-0.1.jar!/" + resName));
- assertTrue(pclProps.getProperty(resName +
".3").endsWith("/dep-ab-0.1.jar!/" + resName));
- assertTrue(pclProps.getProperty(resName +
".4").endsWith("/dep-ad-0.1.jar!/" + resName));
- assertTrue(pclProps.getProperty(resName +
".5").endsWith("/dep-c-0.1.jar!/" + resName));
- assertTrue(pclProps.getProperty(resName +
".6").endsWith("/dep-b-0.1.jar!/" + resName));
- assertTrue(pclProps.getProperty(resName +
".7").endsWith("/dep-d-0.1.jar!/" + resName));
+ if (matchesVersionRange("[3.10.0-SNAPSHOT,)")) {
+ // all modern Maven 3, 3.10+ and above all up to Maven 4
+ assertTrue(pclProps.getProperty(resName +
".0").endsWith("/dep-a-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".1").endsWith("/dep-c-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".2").endsWith("/dep-b-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".3").endsWith("/dep-d-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".4").endsWith("/dep-aa-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".5").endsWith("/dep-ac-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".6").endsWith("/dep-ab-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".7").endsWith("/dep-ad-0.1.jar!/" + resName));
+ } else {
+ // all Maven 3 so far, 3.9.x and older
+ assertTrue(pclProps.getProperty(resName +
".0").endsWith("/dep-a-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".1").endsWith("/dep-aa-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".2").endsWith("/dep-ac-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".3").endsWith("/dep-ab-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".4").endsWith("/dep-ad-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".5").endsWith("/dep-c-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".6").endsWith("/dep-b-0.1.jar!/" + resName));
+ assertTrue(pclProps.getProperty(resName +
".7").endsWith("/dep-d-0.1.jar!/" + resName));
+ }
}
}