Merge pull request #289 from AikidoSec/test-java-24

bitterpanda63 · web-flow · commit de88b89a3b44 · 2026-04-29T11:50:37.000+02:00
test with JDK 24 and update readme to remove latest tested ver entry
diff --git a/.github/workflows/end2end.yml b/.github/workflows/end2end.yml
@@ -49,7 +49,7 @@ 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]
+        java-version: [17, 18, 19, 20, 21, 24]
         distribution: ['adopt', 'corretto', 'oracle']
     steps:
       - name: Download build artifacts
diff --git a/.github/workflows/gradle-tests.yml b/.github/workflows/gradle-tests.yml
@@ -41,7 +41,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        java-version: [17, 18, 19, 20, 21]
+        java-version: [17, 18, 19, 20, 21, 24]
         distribution: ['adopt', 'corretto', 'oracle']
 
     steps:
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Zen is an embedded Web Application Firewall that autonomously protects your Java
 
 Zen protects your Java apps by preventing user input containing dangerous strings, which allow SQL injections. It runs on the same server as your Java app for easy installation and zero maintenance.
 
-Zen for Java currently supports onwards of Java 17. The latest tested version is Java 21. We offer support for Java, Kotlin and Groovy.
+Zen for Java currently supports onwards of Java 17. We offer support for Java, Kotlin and Groovy.
 
 ## Features
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample-apps/JavaRestletMySQL/gradle/wrapper/gradle-wrapper.properties b/sample-apps/JavaRestletMySQL/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample-apps/JavalinPostgres/gradle/wrapper/gradle-wrapper.properties b/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.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample-apps/KtorPostgresNetty/build.gradle.kts b/sample-apps/KtorPostgresNetty/build.gradle.kts
@@ -12,6 +12,10 @@ application {
     mainClass.set("com.example.ApplicationKt")
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 repositories {
     mavenCentral()
 }
diff --git a/sample-apps/KtorPostgresNetty/gradle/wrapper/gradle-wrapper.properties b/sample-apps/KtorPostgresNetty/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample-apps/SpringBoot2.7Postgres/gradle/wrapper/gradle-wrapper.properties b/sample-apps/SpringBoot2.7Postgres/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample-apps/SpringBootHyperSQL/gradle/wrapper/gradle-wrapper.properties b/sample-apps/SpringBootHyperSQL/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample-apps/SpringBootMSSQL/gradle/wrapper/gradle-wrapper.properties b/sample-apps/SpringBootMSSQL/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample-apps/SpringBootMongo/gradle/wrapper/gradle-wrapper.properties b/sample-apps/SpringBootMongo/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample-apps/SpringBootMySQL/gradle/wrapper/gradle-wrapper.properties b/sample-apps/SpringBootMySQL/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample-apps/SpringBootPostgres/gradle/wrapper/gradle-wrapper.properties b/sample-apps/SpringBootPostgres/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample-apps/SpringBootSQLite/gradle/wrapper/gradle-wrapper.properties b/sample-apps/SpringBootSQLite/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample-apps/SpringMVCPostgresGroovy/gradle/wrapper/gradle-wrapper.properties b/sample-apps/SpringMVCPostgresGroovy/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample-apps/SpringMVCPostgresKotlin/build.gradle b/sample-apps/SpringMVCPostgresKotlin/build.gradle
@@ -10,6 +10,7 @@ group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 
 kotlin {
+	jvmToolchain(17)
 	compilerOptions {
 		freeCompilerArgs.addAll '-Xjsr305=strict'
 	}
diff --git a/sample-apps/SpringMVCPostgresKotlin/gradle/wrapper/gradle-wrapper.properties b/sample-apps/SpringMVCPostgresKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample-apps/SpringWebfluxSampleApp/gradle/wrapper/gradle-wrapper.properties b/sample-apps/SpringWebfluxSampleApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@ application {`
`12`	`12`	`mainClass.set("com.example.ApplicationKt")`
`13`	`13`	`}`
`14`	`14`
	`15`	`+kotlin {`
	`16`	`+ jvmToolchain(17)`
	`17`	`+}`
	`18`	`+`
`15`	`19`	`repositories {`
`16`	`20`	`mavenCentral()`
`17`	`21`	`}`