chore: Upgrade Gradle to 8.8

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [11, 21, 22]
 
     steps:
       - uses: actions/checkout@v4

CHANGELOG.md

@@ -4,7 +4,8 @@ All notable changes to this add-on will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
-
+### Changed
+- Maintenance changes.
 
 ## [1.6.0] - 2023-08-17
 ### Changed

build.gradle.kts

@@ -8,12 +8,12 @@ import org.zaproxy.gradle.addon.internal.tasks.GenerateReleaseStateLastCommit
 import org.zaproxy.gradle.addon.misc.ConvertMarkdownToHtml
 
 plugins {
-    id("com.diffplug.spotless") version "6.20.0"
-    id("com.github.ben-manes.versions") version "0.47.0"
-    id("net.ltgt.errorprone") version "3.1.0"
+    id("com.diffplug.spotless") version "6.25.0"
+    id("com.github.ben-manes.versions") version "0.51.0"
+    id("net.ltgt.errorprone") version "4.0.0"
     `java-library`
-    id("org.zaproxy.add-on") version "0.9.0"
-    id("org.zaproxy.common") version "0.1.0"
+    id("org.zaproxy.add-on") version "0.11.0"
+    id("org.zaproxy.common") version "0.3.0"
 }
 
 repositories {
@@ -27,7 +27,7 @@ java {
 }
 
 dependencies {
-    "errorprone"("com.google.errorprone:error_prone_core:2.18.0")
+    "errorprone"("com.google.errorprone:error_prone_core:2.28.0")
 }
 
 spotless {

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/main/java/org/zaproxy/zap/extension/neonmarker/NeonmarkerPanel.java

@@ -63,6 +63,7 @@
 import org.zaproxy.zap.extension.pscan.PassiveScanParam;
 import org.zaproxy.zap.view.ZapToggleButton;
 
+@SuppressWarnings("serial")
 class NeonmarkerPanel extends AbstractPanel {
 
     private static final long serialVersionUID = 3053763855777533887L;
@@ -74,7 +75,7 @@ class NeonmarkerPanel extends AbstractPanel {
     private static final String MULTIPLICATION_X = "\u2715";
 
     private Model historyTableModel;
-    private ArrayList<ExtensionNeonmarker.ColorMapping> colormap;
+    private List<ExtensionNeonmarker.ColorMapping> colormap;
     private Container colorSelectionPanel;
     private JToolBar toolbar;
     private JButton clearButton;
@@ -83,7 +84,7 @@ class NeonmarkerPanel extends AbstractPanel {
     private ExtensionHistory extHist =
             Control.getSingleton().getExtensionLoader().getExtension(ExtensionHistory.class);
 
-    NeonmarkerPanel(Model model, ArrayList<ExtensionNeonmarker.ColorMapping> colormap) {
+    NeonmarkerPanel(Model model, List<ExtensionNeonmarker.ColorMapping> colormap) {
         historyTableModel = model;
         this.colormap = colormap;
         initializePanel();

src/main/java/org/zaproxy/zap/extension/neonmarker/PopupMenuHistoryNeonmarker.java

@@ -25,6 +25,7 @@ public class PopupMenuHistoryNeonmarker extends PopupMenuHistoryReferenceContain
 
     private static final long serialVersionUID = 5126729231139965308L;
 
+    @SuppressWarnings("this-escape")
     public PopupMenuHistoryNeonmarker() {
         super(Constant.messages.getString("neonmarker.popup.label"), true);
         setIcon(ExtensionNeonmarker.getIcon());

src/main/java/org/zaproxy/zap/extension/neonmarker/PopupMenuItemHistoryColor.java

@@ -26,6 +26,7 @@
 import org.parosproxy.paros.model.HistoryReference;
 import org.zaproxy.zap.view.popup.PopupMenuItemHistoryReferenceContainer;
 
+@SuppressWarnings("serial")
 public class PopupMenuItemHistoryColor extends PopupMenuItemHistoryReferenceContainer {
 
     private static final long serialVersionUID = 2746419567363361343L;