From 865bf67a33acf516fc784df165e9926b40556558 Mon Sep 17 00:00:00 2001 From: Yeikel Santana Date: Sun, 16 Nov 2025 02:25:34 +0000 Subject: [PATCH 1/3] Build and test using Java 25 --- .github/workflows/master.yml | 11 ++++++----- .github/workflows/pull_request.yml | 7 ++++--- .github/workflows/release.yml | 4 ++-- build.gradle | 7 +++++++ 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index a55be6d94e..1a56984fe0 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -11,14 +11,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17', 'test -x testWithJava11 -x testWithJava17' ] + gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17','testWithJava21', 'test -x testWithJava11 -x testWithJava17 -x testWithJava21' ] steps: - uses: actions/checkout@v5 - uses: gradle/actions/wrapper-validation@v5 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: - java-version: '21' + java-version: '25' distribution: 'corretto' - name: build and test run: ./gradlew ${{matrix.gradle-argument}} --info --stacktrace @@ -30,6 +30,7 @@ jobs: **/build/test-results/test/TEST-*.xml **/build/test-results/testWithJava11/TEST-*.xml **/build/test-results/testWithJava17/TEST-*.xml + **/build/test-results/testWithJava21/TEST-*.xml publishToMavenCentral: needs: buildAndTest runs-on: ubuntu-latest @@ -43,10 +44,10 @@ jobs: steps: - uses: actions/checkout@v5 - uses: gradle/actions/wrapper-validation@v5 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: - java-version: '21' + java-version: '25' distribution: 'corretto' - name: publishToMavenCentral run: ./gradlew assemble && ./gradlew check -x test -x testng --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index de26c9f353..24c11c4e3a 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -20,14 +20,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17', 'test -x testWithJava11 -x testWithJava17' ] + gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17','testWithJava21', 'test -x testWithJava11 -x testWithJava17 -x testWithJava21' ] steps: - uses: actions/checkout@v5 - uses: gradle/actions/wrapper-validation@v5 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: - java-version: '21' + java-version: '25' distribution: 'corretto' - name: build and test run: ./gradlew ${{matrix.gradle-argument}} --info --stacktrace @@ -39,3 +39,4 @@ jobs: **/build/test-results/test/TEST-*.xml **/build/test-results/testWithJava11/TEST-*.xml **/build/test-results/testWithJava17/TEST-*.xml + **/build/test-results/testWithJava21/TEST-*.xml \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d368345e24..c3c48b94b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,10 +21,10 @@ jobs: steps: - uses: actions/checkout@v5 - uses: gradle/actions/wrapper-validation@v5 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: - java-version: '21' + java-version: '25' distribution: 'corretto' - name: build test and publish run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace diff --git a/build.gradle b/build.gradle index d69b06efb6..1ce093c953 100644 --- a/build.gradle +++ b/build.gradle @@ -358,6 +358,12 @@ tasks.withType(Test) { } } +tasks.register('testWithJava21', Test) { + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + } +} + tasks.register('testWithJava17', Test) { javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(17) @@ -368,6 +374,7 @@ tasks.register('testWithJava11', Test) { languageVersion = JavaLanguageVersion.of(11) } } +test.dependsOn testWithJava21 test.dependsOn testWithJava17 test.dependsOn testWithJava11 From 30b14e3e80cfb6986e21717ab90fc2d7672e6d97 Mon Sep 17 00:00:00 2001 From: Yeikel Santana Date: Tue, 9 Dec 2025 14:14:12 -0500 Subject: [PATCH 2/3] Print the java version under test --- build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.gradle b/build.gradle index c90e2040f0..54665fcf18 100644 --- a/build.gradle +++ b/build.gradle @@ -390,6 +390,13 @@ tasks.register('testWithJava11', Test) { dependsOn "jmhClasses" } + +test { + doFirst { + println "Running tests with JDK ${System.getProperty('java.version')}" + } +} + test.dependsOn testWithJava21 test.dependsOn testWithJava17 test.dependsOn testWithJava11 From 20856c550e6cc9937a5b3065e788bb4547f3fb2e Mon Sep 17 00:00:00 2001 From: Andreas Marek Date: Tue, 20 Jan 2026 11:00:09 +1000 Subject: [PATCH 3/3] Remove debug output and update AGENTS.md for Java 21 tests - Remove test doFirst block that printed JDK version - Add testWithJava21 exclusion to AGENTS.md test command --- AGENTS.md | 2 +- build.gradle | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 50afcbce83..369e771d62 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -7,5 +7,5 @@ This file provides context for AI assistants working with this codebase. When running tests, exclude the Java version-specific test tasks to avoid failures: ```bash -./gradlew test -x testWithJava17 -x testWithJava11 -x testng +./gradlew test -x testWithJava21 -x testWithJava17 -x testWithJava11 -x testng ``` diff --git a/build.gradle b/build.gradle index 54665fcf18..fd9a2d0979 100644 --- a/build.gradle +++ b/build.gradle @@ -391,12 +391,6 @@ tasks.register('testWithJava11', Test) { } -test { - doFirst { - println "Running tests with JDK ${System.getProperty('java.version')}" - } -} - test.dependsOn testWithJava21 test.dependsOn testWithJava17 test.dependsOn testWithJava11