Address some Java 21 warns

Disable or suppress "this escape" as that's unavoidable in most of the codebase. Signed-off-by: thc202 <[email protected]>
zaproxy · Jun 20, 2024 · d8acbb0 · d8acbb0
1 parent cebd4ec
commit d8acbb0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/addOns/addOns.gradle.kts b/addOns/addOns.gradle.kts
@@ -130,6 +130,12 @@ subprojects {
         }
     }
 
+    tasks.withType<JavaCompile>().configureEach {
+        if (JavaVersion.current().getMajorVersion() >= "21") {
+            options.compilerArgs = options.compilerArgs + "-Xlint:-this-escape"
+        }
+    }
+
     tasks.named<JacocoReport>("jacocoTestReport") {
         reports {
             xml.required.set(true)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -54,6 +54,9 @@ allprojects {
     }
 
     tasks.withType<JavaCompile>().configureEach {
+        if (JavaVersion.current().getMajorVersion() >= "21") {
+            options.compilerArgs = options.compilerArgs + "-Xlint:-this-escape"
+        }
         options.errorprone {
             disableAllChecks.set(true)
             error(

diff --git a/buildSrc/src/main/java/org/zaproxy/gradle/tasks/ProcessSvnDiggerFiles.java b/buildSrc/src/main/java/org/zaproxy/gradle/tasks/ProcessSvnDiggerFiles.java
@@ -45,6 +45,7 @@ public class ProcessSvnDiggerFiles extends DefaultTask {
     private final ConfigurableFileTree sourceFiles;
     private final DirectoryProperty outputDir;
 
+    @SuppressWarnings("this-escape")
     public ProcessSvnDiggerFiles() {
         this.sourceFiles = getProject().fileTree(getProject().file("src/main/" + SVNDIGGER_DIR));
         this.sourceFiles.exclude(LICENCE_FILE_NAME, README_FILE_NAME);