From 71bb44361aaf8577b15f898b49cf5a1157bc0099 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Thu, 25 Sep 2025 20:01:51 +0200 Subject: [PATCH 1/3] Build project by JDK 25 --- .github/workflows/maven.yml | 4 ++-- its/core-it-suite/src/test/resources/mng-7045/pom.xml | 6 +++--- .../src/test/resources/mng-8525-maven-di-plugin/pom.xml | 6 +++--- .../src/test/resources/mng-8527-consumer-pom/pom.xml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index cf565f96ff64..5022c791181b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -94,7 +94,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - java: ['17', '21', '24'] + java: ['17', '21', '25'] steps: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5 @@ -193,7 +193,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - java: ['17', '21', '24'] + java: ['17', '21', '25'] steps: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5 diff --git a/its/core-it-suite/src/test/resources/mng-7045/pom.xml b/its/core-it-suite/src/test/resources/mng-7045/pom.xml index c031f24feff8..2cb0244cb819 100644 --- a/its/core-it-suite/src/test/resources/mng-7045/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7045/pom.xml @@ -32,7 +32,7 @@ org.codehaus.gmavenplus gmavenplus-plugin - 1.11.0 + 4.2.1 org.apache.groovy groovy-ant - 4.0.26 + 4.0.28 runtime org.apache.groovy groovy - 4.0.26 + 4.0.28 runtime diff --git a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml index e3939ba4b263..40e339101961 100644 --- a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml @@ -43,14 +43,14 @@ under the License. org.junit junit-bom - 5.11.4 + 5.13.4 pom import org.mockito mockito-bom - 5.15.2 + 5.20.0 pom import @@ -151,7 +151,7 @@ under the License. org.apache.maven.plugins maven-invoker-plugin - 3.6.1 + 3.9.1 true ${project.build.directory}/it diff --git a/its/core-it-suite/src/test/resources/mng-8527-consumer-pom/pom.xml b/its/core-it-suite/src/test/resources/mng-8527-consumer-pom/pom.xml index f1c79f062d41..3e9b56c6f5ad 100644 --- a/its/core-it-suite/src/test/resources/mng-8527-consumer-pom/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8527-consumer-pom/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven maven-parent - 43 + 45 org.apache.maven.its.mng-8527 From f4a6ba5aafb1ec92c439214910d8b9c717e60c59 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Thu, 25 Sep 2025 22:02:08 +0200 Subject: [PATCH 2/3] Disable MavenIT0009GoalConfigurationTest on windows with JDK25 --- .../apache/maven/it/MavenIT0009GoalConfigurationTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java index 6cc28d87ab6c..30faca320899 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java @@ -21,6 +21,9 @@ import java.io.File; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIf; +import org.junit.jupiter.api.condition.JRE; +import org.junit.jupiter.api.condition.OS; public class MavenIT0009GoalConfigurationTest extends AbstractMavenIntegrationTestCase { @@ -35,6 +38,7 @@ public MavenIT0009GoalConfigurationTest() { * @throws Exception in case of failure */ @Test + @DisabledIf(value = "isWindowsWithJDK25", disabledReason = "JDK-25 - JDK-8354450 files ending with space are not supported on Windows") public void testit0009() throws Exception { boolean supportSpaceInXml = matchesVersionRange("[3.1.0,)"); @@ -50,4 +54,8 @@ public void testit0009() throws Exception { verifier.verifyFileNotPresent("target/bad-item"); verifier.verifyErrorFreeLog(); } + + static boolean isWindowsWithJDK25() { + return OS.WINDOWS.isCurrentOs() && JRE.currentVersionNumber() >= 25; + } } From 4bc303caba95bdab0f89d8d465e6f65cb1e343fd Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Thu, 25 Sep 2025 22:42:05 +0200 Subject: [PATCH 3/3] Spotless --- .../org/apache/maven/it/MavenIT0009GoalConfigurationTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java index 30faca320899..83c140731948 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java @@ -38,7 +38,9 @@ public MavenIT0009GoalConfigurationTest() { * @throws Exception in case of failure */ @Test - @DisabledIf(value = "isWindowsWithJDK25", disabledReason = "JDK-25 - JDK-8354450 files ending with space are not supported on Windows") + @DisabledIf( + value = "isWindowsWithJDK25", + disabledReason = "JDK-25 - JDK-8354450 files ending with space are not supported on Windows") public void testit0009() throws Exception { boolean supportSpaceInXml = matchesVersionRange("[3.1.0,)");