Merge pull request #318 from AikidoSec/feat/support-java-25

Add Java 25 support

Author: bitterpanda63

.github/workflows/end2end.yml

@@ -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

.github/workflows/gradle-tests.yml

@@ -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:

agent/build.gradle

@@ -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

agent/src/main/java/dev/aikido/agent/Agent.java

@@ -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);

agent_api/build.gradle

@@ -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 {

build.gradle

@@ -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
+    }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -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

sample-apps/JavalinMySQLKotlin/pom.xml

@@ -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>
 

sample-apps/JavalinPostgres/build.gradle

@@ -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'

sample-apps/JavalinPostgres/gradle/wrapper/gradle-wrapper.properties

@@ -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