Merge pull request #270 from thc202/ci/java21

Add Java 21 to CI
zaproxy · Jan 26, 2024 · e6d8f7e · e6d8f7e
2 parents 3307874 + 3926dab
commit e6d8f7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [11, 17, 20]
+        java: [11, 17, 21]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/build.gradle b/build.gradle
@@ -57,6 +57,12 @@ test {
     useJUnitPlatform()
 }
 
+tasks.withType(JavaCompile) {
+    if (JavaVersion.current().getMajorVersion() >= "21") {
+        options.compilerArgs = options.compilerArgs + "-Xlint:-this-escape"
+    }
+}
+
 tasks.withType(Javadoc) {
     options {
         links = [ 'https://docs.oracle.com/javase/11/docs/api/' ]