Merge pull request #49 from thc202/gradle/update-8.8

.github/workflows/ci.yml

@@ -19,8 +19,8 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
-      - uses: gradle/wrapper-validation-action@v1
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/wrapper-validation@v3
+      - uses: gradle/actions/setup-gradle@v3
       - run: ./gradlew assemble
       - run: ./gradlew check
 

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
+- Update minimum ZAP version to 2.15.0.
 
 ## [5] - 2024-01-11
 ### Changed

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
     eclipse
     id("com.diffplug.spotless")
     id("org.zaproxy.common")
-    id("org.zaproxy.add-on") version "0.10.0"
+    id("org.zaproxy.add-on") version "0.11.0"
     id("org.zaproxy.crowdin") version "0.4.0"
 }
 
@@ -20,7 +20,10 @@ eclipse {
     }
 }
 
-description = "FuzzDB web backdoors and attack files which can be used with the ZAP fuzzer or for manual penetration testing - contains files that may well be flagged by anti-virus tools"
+description = (
+    "FuzzDB web backdoors and attack files which can be used with the ZAP fuzzer or for manual penetration testing - contains files " +
+        "that may well be flagged by anti-virus tools"
+)
 
 java {
     val javaVersion = JavaVersion.VERSION_11
@@ -32,7 +35,7 @@ zapAddOn {
     addOnId.set(project.name.replace("-", ""))
     addOnName.set("FuzzDB Offensive")
     addOnStatus.set(AddOnStatus.RELEASE)
-    zapVersion.set("2.14.0")
+    zapVersion.set("2.15.0")
 
     releaseLink.set("https://github.com/zaproxy/fuzzdb-offensive/compare/v@[email protected]@CURRENT_VERSION@")
     unreleasedLink.set("https://github.com/zaproxy/fuzzdb-offensive/compare/v@[email protected]")

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
 

settings.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    id("org.zaproxy.common.settings") version "0.2.0"
+    id("org.zaproxy.common.settings") version "0.3.0"
 
-    id("com.diffplug.spotless") version "6.20.0" apply false
+    id("com.diffplug.spotless") version "6.25.0" apply false
 }
 
 rootProject.name = "fuzzdb-offensive"