From 7822358288805cb13c2ba811d32a16e2a99566f0 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Tue, 28 Jul 2026 22:57:31 +0200 Subject: [PATCH 1/2] Use Maven 3.10.0-rc-1 for integration tests verification --- .github/workflows/maven-verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index b42a76669..a07504bae 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -54,7 +54,7 @@ jobs: cache: 'maven' - name: Set up Maven - run: mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.4:wrapper "-Dmaven=3.9.12" + run: mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.4:wrapper "-Dmaven=3.10.0-rc-1" shell: bash - name: Running integration tests From 7bc1bf91dba67bd34884d239f0a3dd2a80288747 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Tue, 28 Jul 2026 23:50:07 +0200 Subject: [PATCH 2/2] Fix for version pattern matching like 3.10.0-rc-1 --- .../org/apache/maven/it/AbstractMavenIntegrationTestCase.java | 3 ++- .../java/org/apache/maven/it/MavenIntegrationTestCaseTest.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java index cc02af688..28a725866 100644 --- a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java +++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java @@ -55,7 +55,8 @@ public abstract class AbstractMavenIntegrationTestCase { private String testName; - private static final Pattern DEFAULT_MATCH_PATTERN = Pattern.compile("(.*?)-(RC[0-9]+|SNAPSHOT|RC[0-9]+-SNAPSHOT)"); + private static final Pattern DEFAULT_MATCH_PATTERN = + Pattern.compile("(.*?)-([Rr][Cc]-?[0-9]+|SNAPSHOT|[Rr][Cc]-?[0-9]+-SNAPSHOT)"); protected static final String ALL_MAVEN_VERSIONS = "[2.0,)"; diff --git a/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/MavenIntegrationTestCaseTest.java b/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/MavenIntegrationTestCaseTest.java index 1028ff412..1c938edff 100644 --- a/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/MavenIntegrationTestCaseTest.java +++ b/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/MavenIntegrationTestCaseTest.java @@ -39,6 +39,8 @@ public void testRemovePatternForTestWithVersionRange() { assertVersionEquals("2.0.10", "2.0.10-SNAPSHOT", test); assertVersionEquals("2.0.10", "2.0.10-RC1", test); assertVersionEquals("2.0.10", "2.0.10-RC1-SNAPSHOT", test); + assertVersionEquals("3.10.0", "3.10.0-RC-1", test); + assertVersionEquals("3.10.0", "3.10.0-rc-1", test); } private static void assertVersionEquals(String expected, String version, AbstractMavenIntegrationTestCase test) {