Skip to content

Commit e5f21b8

Browse files
andimarekandimarek
authored
Merge pull request #4173 from yeikel/java25
Build and test using Java 25
2 parents d1798b1 + 20856c5 commit e5f21b8

5 files changed

Lines changed: 24 additions & 15 deletions

File tree

‎.github/workflows/master.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17', 'test -x testWithJava11 -x testWithJava17' ]
14+
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17','testWithJava21', 'test -x testWithJava11 -x testWithJava17 -x testWithJava21' ]
1515
steps:
1616
- uses: actions/checkout@v6
1717
- uses: gradle/actions/wrapper-validation@v5
18-
- name: Set up JDK 21
18+
- name: Set up JDK 25
1919
uses: actions/setup-java@v5
2020
with:
21-
java-version: '21'
21+
java-version: '25'
2222
distribution: 'corretto'
2323
- name: build and test
2424
run: ./gradlew ${{matrix.gradle-argument}} --info --stacktrace
@@ -30,15 +30,16 @@ jobs:
3030
**/build/test-results/test/TEST-*.xml
3131
**/build/test-results/testWithJava11/TEST-*.xml
3232
**/build/test-results/testWithJava17/TEST-*.xml
33+
**/build/test-results/testWithJava21/TEST-*.xml
3334
javadoc:
3435
runs-on: ubuntu-latest
3536
steps:
3637
- uses: actions/checkout@v6
3738
- uses: gradle/actions/wrapper-validation@v5
38-
- name: Set up JDK 21
39+
- name: Set up JDK 25
3940
uses: actions/setup-java@v5
4041
with:
41-
java-version: '21'
42+
java-version: '25'
4243
distribution: 'corretto'
4344
- name: Verify Javadoc
4445
run: ./gradlew javadoc --info --stacktrace
@@ -55,10 +56,10 @@ jobs:
5556
steps:
5657
- uses: actions/checkout@v6
5758
- uses: gradle/actions/wrapper-validation@v5
58-
- name: Set up JDK 21
59+
- name: Set up JDK 25
5960
uses: actions/setup-java@v5
6061
with:
61-
java-version: '21'
62+
java-version: '25'
6263
distribution: 'corretto'
6364
- name: publishToMavenCentral
6465
run: ./gradlew assemble && ./gradlew check -x test -x testng --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

‎.github/workflows/pull_request.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
23-
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17', 'test -x testWithJava11 -x testWithJava17' ]
23+
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17','testWithJava21', 'test -x testWithJava11 -x testWithJava17 -x testWithJava21' ]
2424
steps:
2525
- uses: actions/checkout@v6
2626
- uses: gradle/actions/wrapper-validation@v5
27-
- name: Set up JDK 21
27+
- name: Set up JDK 25
2828
uses: actions/setup-java@v5
2929
with:
30-
java-version: '21'
30+
java-version: '25'
3131
distribution: 'corretto'
3232
- name: build and test
3333
run: ./gradlew ${{matrix.gradle-argument}} --info --stacktrace
@@ -39,15 +39,16 @@ jobs:
3939
**/build/test-results/test/TEST-*.xml
4040
**/build/test-results/testWithJava11/TEST-*.xml
4141
**/build/test-results/testWithJava17/TEST-*.xml
42+
**/build/test-results/testWithJava21/TEST-*.xml
4243
javadoc:
4344
runs-on: ubuntu-latest
4445
steps:
4546
- uses: actions/checkout@v6
4647
- uses: gradle/actions/wrapper-validation@v5
47-
- name: Set up JDK 21
48+
- name: Set up JDK 25
4849
uses: actions/setup-java@v5
4950
with:
50-
java-version: '21'
51+
java-version: '25'
5152
distribution: 'corretto'
5253
- name: Verify Javadoc
5354
run: ./gradlew javadoc --info --stacktrace

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v6
2323
- uses: gradle/actions/wrapper-validation@v5
24-
- name: Set up JDK 21
24+
- name: Set up JDK 25
2525
uses: actions/setup-java@v5
2626
with:
27-
java-version: '21'
27+
java-version: '25'
2828
distribution: 'corretto'
2929
- name: build test and publish
3030
run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ This file provides context for AI assistants working with this codebase.
77
When running tests, exclude the Java version-specific test tasks to avoid failures:
88

99
```bash
10-
./gradlew test -x testWithJava17 -x testWithJava11 -x testng
10+
./gradlew test -x testWithJava21 -x testWithJava17 -x testWithJava11 -x testng
1111
```

‎build.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,12 @@ tasks.withType(Test) {
357357
}
358358
}
359359

360+
tasks.register('testWithJava21', Test) {
361+
javaLauncher = javaToolchains.launcherFor {
362+
languageVersion = JavaLanguageVersion.of(21)
363+
}
364+
}
365+
360366
tasks.register('testWithJava17', Test) {
361367
javaLauncher = javaToolchains.launcherFor {
362368
languageVersion = JavaLanguageVersion.of(17)
@@ -385,6 +391,7 @@ tasks.register('testWithJava11', Test) {
385391

386392
}
387393

394+
test.dependsOn testWithJava21
388395
test.dependsOn testWithJava17
389396
test.dependsOn testWithJava11
390397

0 commit comments

Comments
 (0)