Skip to content

Add Java 25 support #318

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
bitterpanda63 merged 3 commits into from
Jul 8, 2026
Merged

Add Java 25 support #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43f5d64
Add Java 25 support
Jul 8, 2026
4556539
Upgrade root build to Gradle 9.6.1 for JDK 25 support
Jul 8, 2026
55b0aff
Make e2e sample apps build/run on JDK 25
Jul 8, 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
7 changes: 6 additions & 1 deletion .github/workflows/end2end.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,13 @@ jobs:
- { name: JavalinMySQLKotlin, test_file: end2end/javalin_mysql_kotlin.py, db: mysql_database }
- { name: SpringBoot2.7Postgres, test_file: end2end/spring_boot_2.7_postgres.py, db: postgres_database }
- { name: SpringBootHyperSQL, test_file: end2end/spring_boot_hypersql.py, db: "" }
java-version: [17, 18, 19, 20, 21, 24]
java-version: [17, 18, 19, 20, 21, 24, 25]
distribution: ['adopt', 'corretto', 'oracle']
exclude:
# Spring Boot 2.7 uses the legacy javax stack and does not support JDK 25;
# keep this app on Java 17-24 only (its javax coverage stays exercised there).
- app: { name: SpringBoot2.7Postgres, test_file: end2end/spring_boot_2.7_postgres.py, db: postgres_database }
java-version: 25
steps:
- name: Download build artifacts
uses: actions/download-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
continue-on-error: true
strategy:
matrix:
java-version: [17, 18, 19, 20, 21, 24]
java-version: [17, 18, 19, 20, 21, 24, 25]
distribution: ['adopt', 'corretto', 'oracle']

steps:
Expand Down
4 changes: 2 additions & 2 deletions agent/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
plugins {
id 'java'
id 'com.github.johnrengelman.shadow' version '7.1.0'
id 'com.gradleup.shadow' version '9.5.1'
}

dependencies {
implementation project(':agent_api')
implementation 'net.bytebuddy:byte-buddy:1.15.11'
implementation 'net.bytebuddy:byte-buddy:1.18.11'
// Compile only for interface types :
compileOnly 'jakarta.servlet:jakarta.servlet-api:6.1.0' // spring 3 -> jakarta
compileOnly 'javax.servlet:javax.servlet-api:4.0.1' // spring 2 -> javax
Expand Down
4 changes: 2 additions & 2 deletions agent/src/main/java/dev/aikido/agent/Agent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ public static void premain(String agentArgs, Instrumentation inst) {
logger.error("Zen by Aikido requires Java 17 or newer. Current version: %d. The agent will not be loaded.", javaVersion);
return;
}
if (javaVersion > 24) {
logger.error("Zen by Aikido does not support Java %d (max supported version: 24). The agent will not be loaded.", javaVersion);
if (javaVersion > 25) {
logger.error("Zen by Aikido does not support Java %d (max supported version: 25). The agent will not be loaded.", javaVersion);
return;
}
logger.info("Zen by Aikido v%s starting.", Config.pkgVersion);
Expand Down
2 changes: 1 addition & 1 deletion agent_api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java'
id 'jacoco'
id 'com.github.johnrengelman.shadow' version '7.1.0'
id 'com.gradleup.shadow' version '9.5.1'
}

jacoco {
Expand Down
6 changes: 4 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ subprojects {
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}
sourceCompatibility = '16'
targetCompatibility = '16'
java {
sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Oct 10 12:48:48 CEST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion sample-apps/JavalinMySQLKotlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<kotlin.version>1.8.0</kotlin.version> <!-- Change to a stable version -->
<kotlin.version>2.2.20</kotlin.version> <!-- 2.2.x required for JDK 25 -->
<log4j2-version>2.24.3</log4j2-version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion sample-apps/JavalinPostgres/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'com.gradleup.shadow' version '9.5.1'
}

group = 'dev.aikido'
Expand Down
2 changes: 1 addition & 1 deletion sample-apps/JavalinPostgres/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Dec 17 13:31:53 CET 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion sample-apps/SpringBootHyperSQL/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion sample-apps/SpringBootMSSQL/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion sample-apps/SpringBootMySQL/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion sample-apps/SpringBootPostgres/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 4 additions & 0 deletions sample-apps/SpringMVCPostgresGroovy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ plugins {
group = 'com.example'
version = '0.0.1-SNAPSHOT'

// Spring Boot 3.4.1 manages an older Groovy 4.0.x whose ASM can't run on JDK 25;
// Groovy 4.0.27+ adds Java 25 support.
ext['groovy.version'] = '4.0.28'

java {
sourceCompatibility = '17'
targetCompatibility = '17'
Expand Down
2 changes: 1 addition & 1 deletion sample-apps/SpringMVCPostgresGroovy/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions sample-apps/SpringMVCPostgresKotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'org.jetbrains.kotlin.jvm' version '2.1.0'
id 'org.jetbrains.kotlin.plugin.spring' version '1.9.25'
id 'org.jetbrains.kotlin.jvm' version '2.2.20'
id 'org.jetbrains.kotlin.plugin.spring' version '2.2.20'
id 'war'
id 'org.springframework.boot' version '3.4.1'
id 'io.spring.dependency-management' version '1.1.7'
Expand Down
2 changes: 1 addition & 1 deletion sample-apps/SpringMVCPostgresKotlin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion sample-apps/SpringWebfluxSampleApp/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading