Skip to content

build(java): align toolchain and runtime to Java 25 (bytecode 17) #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pditommaso merged 5 commits into from
Jul 24, 2026
Merged

build(java): align toolchain and runtime to Java 25 (bytecode 17) #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
804ad69
build(java): align toolchain and runtime to Java 25 (bytecode 17)
cristianrcv Jul 8, 2026
ca904bf
ci(java): use Amazon Corretto distribution instead of Temurin
cristianrcv Jul 8, 2026
45dbaba
build(groovy): upgrade Groovy to 4.0.31 for JDK 25
cristianrcv Jul 8, 2026
e4c56d1
build: raise Java source/target to 25
cristianrcv Jul 14, 2026
3676ea1
build(java): adopt two-profile model (Profile A --release 17 default,…
pditommaso Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ jobs:
- uses: graalvm/setup-graalvm@cabbb10818fabc989d6dbd508e4846596d20dd2d # v1.6.0
if: ${{ matrix.musl }}
with:
java-version: '21'
java-version: '25'
github-token: ${{ secrets.GITHUB_TOKEN }}
native-image-job-reports: 'true'
native-image-musl: 'true'

- uses: graalvm/setup-graalvm@cabbb10818fabc989d6dbd508e4846596d20dd2d # v1.6.0
if: ${{ !matrix.musl }}
with:
java-version: '21'
java-version: '25'
github-token: ${{ secrets.GITHUB_TOKEN }}
native-image-job-reports: 'true'

Expand Down Expand Up @@ -138,8 +138,8 @@ jobs:
- name: Setup Java for JReleaser
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
with:
java-version: '21'
distribution: 'adopt'
java-version: '25'
distribution: 'corretto'

- name: Version
id: version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security-submit-dependecy-graph.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
- uses: graalvm/setup-graalvm@cabbb10818fabc989d6dbd508e4846596d20dd2d # v1.6.0
with:
java-version: 21
java-version: 25

- name: Generate and submit dependency graph for wave-cli
uses: gradle/actions/dependency-submission@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4
Expand Down
24 changes: 16 additions & 8 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,18 @@ plugins {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
languageVersion = JavaLanguageVersion.of(25)
}
sourceCompatibility = 17
targetCompatibility = 17
}

// Profile A (per adr#51): build on the Java 25 toolchain but target Java 17.
// Java sources use --release; Groovy ignores --release so it uses source/targetCompatibility.
tasks.withType(JavaCompile).configureEach {
options.release = 17
}
tasks.withType(GroovyCompile).configureEach {
sourceCompatibility = '17'
targetCompatibility = '17'
}

repositories {
Expand All @@ -32,10 +40,10 @@ dependencies {
// bump commons-io version to address security vulnerabilities
runtimeOnly 'commons-io:commons-io:2.18.0'

testImplementation "org.apache.groovy:groovy:4.0.24"
testImplementation "org.apache.groovy:groovy-nio:4.0.24"
testImplementation "org.apache.groovy:groovy-test:4.0.24"
testImplementation "org.apache.groovy:groovy-json:4.0.24"
testImplementation "org.apache.groovy:groovy:4.0.31"
testImplementation "org.apache.groovy:groovy-nio:4.0.31"
testImplementation "org.apache.groovy:groovy-test:4.0.31"
testImplementation "org.apache.groovy:groovy-json:4.0.31"
testImplementation "net.bytebuddy:byte-buddy:1.14.11"
testImplementation ("org.spockframework:spock-core:2.4-groovy-4.0") { exclude group: 'org.apache.groovy' }
}
Expand Down Expand Up @@ -96,7 +104,7 @@ graalvmNative {
}

javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(21)
languageVersion = JavaLanguageVersion.of(25)
vendor = JvmVendorSpec.matching("Oracle Corporation")
}
buildArgs.add('--enable-url-protocols=https')
Expand Down
Loading