You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2026/10/08 17:02:06 UTC

(maven) branch master updated: Run integration tests with JDK 26 (#13332)

This is an automated email from the ASF dual-hosted git repository.

slawekjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 61f92e956c Run integration tests with JDK 26 (#13332)
61f92e956c is described below

commit 61f92e956ce39723f7127a94c40df088cf6a2d81
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Thu Oct 8 19:02:00 2026 +0200

    Run integration tests with JDK 26 (#13332)
    
    * Run integration tests with JDK 26
    
    - Add Java 26 to CI matrix
    - Bump gmavenplus-plugin to 4.3.1
    - Upgrade Groovy dependencies to 4.0.33
    - Update test keystores to newer algorithms and 2048 bits
    
    Co-Authored-By: Claude Opus 5.5 <no...@anthropic.com>
    
    * Use JDK 17, 21 and 26
    
    ---------
    
    Co-authored-by: Claude Opus 5.5 <no...@anthropic.com>
---
 .github/workflows/maven.yml                           |   4 ++--
 .../maven/it/MavenITmng2305MultipleProxiesTest.java   |   5 +++--
 .../it/MavenITmng4428FollowHttpRedirectTest.java      |   5 +++--
 .../src/test/resources/mng-2305/keystore              | Bin 1374 -> 2255 bytes
 .../src/test/resources/mng-4428/keystore              | Bin 1364 -> 2249 bytes
 its/core-it-suite/src/test/resources/mng-7045/pom.xml |   6 +++---
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 90f600f103..5ac16c3a24 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -147,7 +147,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: ['17', '21', '25']
+        java: ['17', '25', '26']
     steps:
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
@@ -260,7 +260,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: ['17', '21', '25']
+        java: ['17', '25', '26']
     steps:
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
index 1c30fbd219..b7ad8591ba 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
@@ -63,8 +63,9 @@ public void testit() throws Exception {
         // NOTE: trust store cannot be reliably configured for the current JVM
         verifier.setForkJvm(true);
 
-        // keytool -genkey -alias https.mngit -keypass key-passwd -keystore keystore -storepass store-passwd \
-        //   -validity 4096 -dname "cn=https.mngit, ou=None, L=Seattle, ST=Washington, o=ExampleOrg, c=US" -keyalg RSA
+        // keytool -genkeypair -alias https.mngit -keyalg RSA -keysize 2048 -sigalg SHA256withRSA \
+        //   -storetype JKS -keystore keystore -storepass store-passwd -keypass key-passwd \
+        //   -validity 4096 -dname "cn=https.mngit, ou=None, L=Seattle, ST=Washington, o=ExampleOrg, c=US" -noprompt
         Path storePath = testDir.resolve("keystore");
         String storePwd = "store-passwd";
         String keyPwd = "key-passwd";
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
index b5fe46b5f1..0ee928cd23 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
@@ -93,8 +93,9 @@ private void testit(boolean fromHttp, boolean toHttp, boolean relativeLocation)
         // NOTE: trust store cannot be reliably configured for the current JVM
         verifier.setForkJvm(true);
 
-        // keytool -genkey -alias localhost -keypass key-passwd -keystore keystore -storepass store-passwd \
-        //   -validity 4096 -dname "cn=localhost, ou=None, L=Seattle, ST=Washington, o=ExampleOrg, c=US" -keyalg RSA
+        // keytool -genkeypair -alias localhost -keyalg RSA -keysize 2048 -sigalg SHA256withRSA \
+        //   -storetype JKS -keystore keystore -storepass store-passwd -keypass key-passwd \
+        //   -validity 4096 -dname "cn=localhost, ou=None, L=Seattle, ST=Washington, o=ExampleOrg, c=US" -noprompt
         String storePath = testDir.resolve("keystore").toString();
         String storePwd = "store-passwd";
         String keyPwd = "key-passwd";
diff --git a/its/core-it-suite/src/test/resources/mng-2305/keystore b/its/core-it-suite/src/test/resources/mng-2305/keystore
index 8fe45b9fce..184656f594 100644
Binary files a/its/core-it-suite/src/test/resources/mng-2305/keystore and b/its/core-it-suite/src/test/resources/mng-2305/keystore differ
diff --git a/its/core-it-suite/src/test/resources/mng-4428/keystore b/its/core-it-suite/src/test/resources/mng-4428/keystore
index b0ced05713..2f8906593f 100644
Binary files a/its/core-it-suite/src/test/resources/mng-4428/keystore and b/its/core-it-suite/src/test/resources/mng-4428/keystore differ
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 2cb0244cb8..0b4a9d9a43 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 @@
       <plugin>
         <groupId>org.codehaus.gmavenplus</groupId>
         <artifactId>gmavenplus-plugin</artifactId>
-        <version>4.2.1</version>
+        <version>4.3.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.28</version>
+            <version>4.0.33</version>
             <scope>runtime</scope>
           </dependency>
           <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>4.0.28</version>
+            <version>4.0.33</version>
             <scope>runtime</scope>
           </dependency>
         </dependencies>