Merge pull request #300 from thc202/gradle/update-7.6

Update Gradle, plugins, and test dependencies

Author: psiinon

build.gradle.kts

@@ -7,8 +7,8 @@ import org.zaproxy.gradle.addon.misc.ConvertMarkdownToHtml
 plugins {
     `java-library`
     id("org.zaproxy.add-on") version "0.8.0"
-    id("org.zaproxy.crowdin") version "0.1.0"
-    id("com.diffplug.spotless") version "6.11.0"
+    id("org.zaproxy.crowdin") version "0.3.1"
+    id("com.diffplug.spotless") version "6.14.1"
 }
 
 repositories {
@@ -48,16 +48,16 @@ crowdin {
     }
 }
 
-val jupiterVersion = "5.7.0-M1"
+val jupiterVersion = "5.9.2"
 
 dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:$jupiterVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-params:$jupiterVersion")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$jupiterVersion")
 
-    testImplementation("commons-io:commons-io:2.6")
-    testImplementation("org.assertj:assertj-core:3.11.0")
-    testImplementation("org.apache.commons:commons-lang3:3.8")
+    testImplementation("commons-io:commons-io:2.11.0")
+    testImplementation("org.assertj:assertj-core:3.24.2")
+    testImplementation("org.apache.commons:commons-lang3:3.12.0")
 
     // The following versions should match the ones of the add-ons.
     testImplementation("org.codehaus.groovy:groovy-all:2.4.14")
@@ -93,7 +93,7 @@ var scriptTypes = listOf(
     "targeted",
     "variant",
     "websocketfuzzerprocessor",
-    "websocketpassive"
+    "websocketpassive",
 )
 
 val syncScriptsDirTask by tasks.creating(Sync::class) {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionSha256Sum=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

gradlew.bat

@@ -68,7 +68,7 @@ class VerifyScripts {
     private static List<Path> files;
 
     @BeforeAll
-    private static void readScriptDirs() throws Exception {
+    static void readScriptDirs() throws Exception {
         readFiles();
     }
 
@@ -83,7 +83,7 @@ void shouldParseScript(
     }
 
     @AfterAll
-    private static void verifyAllFilesTested() {
+    static void verifyAllFilesTested() {
         assertThat(files).as("Not all files were tested: %s", files).isEmpty();
     }