Build by JDK 25

.github/workflows/maven-verify.yml

@@ -19,6 +19,11 @@ name: Java CI
 
 on: [push, pull_request]
 
+# allow single build per branch or PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 # clear all permissions for GITHUB_TOKEN
 permissions: {}
 
@@ -30,26 +35,28 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        java: [8, 11, 17, 21, 24]
+        os: [ubuntu-latest,windows-latest, macOS-latest]
+        java: [8, 11, 17, 21, 25]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'temurin'
+          distribution: 'zulu'
           cache: 'maven'
 
       - name: Set up Maven
-        run: mvn --errors --batch-mode --show-version wrapper:wrapper "-Dtype=only-script" "-Dmaven=3.9.11"
+        run: mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.4:wrapper "-Dmaven=3.9.11"
+        shell: bash
 
       - name: Running integration tests
-        run: "./mvnw -B clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo"
+        run: ./mvnw -B clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo
+        shell: bash

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java

@@ -23,6 +23,9 @@
 import org.apache.maven.shared.verifier.Verifier;
 import org.apache.maven.shared.verifier.util.ResourceExtractor;
 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 {
 
@@ -37,6 +40,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")
     public void testit0009() throws Exception {
 
         boolean supportSpaceInXml = matchesVersionRange("[3.1.0,)");
@@ -52,4 +58,8 @@ public void testit0009() throws Exception {
         verifier.verifyFileNotPresent("target/bad-item");
         verifier.verifyErrorFreeLog();
     }
+
+    static boolean isWindowsWithJDK25() {
+        return OS.WINDOWS.isCurrentOs() && JRE.currentVersionNumber() >= 25;
+    }
 }

core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java

@@ -34,7 +34,7 @@
 class MavenITgh10937QuotedPipesInMavenOptsTest extends AbstractMavenIntegrationTestCase {
 
     MavenITgh10937QuotedPipesInMavenOptsTest() {
-        super("[3.0.0,)");
+        super("[3.9.12,)");
     }
 
     /**

core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java

@@ -33,7 +33,7 @@ public MavenITmng5774ConfigurationProcessorsTest() {
 
     @Test
     public void testBehaviourWhereThereIsOneUserSuppliedConfigurationProcessor() throws Exception {
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5774-configuration-processors");
+        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5774");
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
@@ -56,7 +56,7 @@ public void testBehaviourWhereThereIsOneUserSuppliedConfigurationProcessor() thr
 
     @Test
     public void testBehaviourWhereThereAreTwoUserSuppliedConfigurationProcessor() throws Exception {
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5774-configuration-processors");
+        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5774");
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");

core-it-suite/src/test/resources-filtered/bootstrap.txt

@@ -142,7 +142,7 @@ org.apache.maven:maven-script-ant:2.1.0
 org.apache.maven:maven-settings-builder:3.1.1
 org.apache.maven:maven-settings:3.1.1
 org.apache.maven.plugin-testing:maven-plugin-testing-harness:3.3.0
-org.codehaus.gmavenplus:gmavenplus-plugin:1.11.0
+org.codehaus.gmavenplus:gmavenplus-plugin:4.2.1
 org.codehaus.modello:modello-maven-plugin:2.1.1
 org.codehaus.mojo:build-helper-maven-plugin:3.2.0
 org.codehaus.mojo:flatten-maven-plugin:1.0.0

core-it-suite/src/test/resources/mng-7045/pom.xml

@@ -32,7 +32,7 @@
       <plugin>
         <groupId>org.codehaus.gmavenplus</groupId>
         <artifactId>gmavenplus-plugin</artifactId>
-        <version>1.11.0</version>
+        <version>4.2.1</version>
         <configuration>
           <scripts>
             <script><![CDATA[println("InstanceSource=" + javax.enterprise.inject.Instance.class.getProtectionDomain().getCodeSource())
@@ -43,13 +43,13 @@ javax.enterprise.inject.Instance.class.getDeclaredMethod("stream")]]></script>
           <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-ant</artifactId>
-            <version>4.0.26</version>
+            <version>4.0.28</version>
             <scope>runtime</scope>
           </dependency>
           <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>4.0.26</version>
+            <version>4.0.28</version>
             <scope>runtime</scope>
           </dependency>
         </dependencies>