diff --git a/hooks/persistence-defectdojo/hook/build.gradle b/hooks/persistence-defectdojo/hook/build.gradle index c1e11a2614..1af3a23ee4 100644 --- a/hooks/persistence-defectdojo/hook/build.gradle +++ b/hooks/persistence-defectdojo/hook/build.gradle @@ -4,11 +4,11 @@ plugins { id "java" - id "io.freefair.lombok" version "9.4.0" + id "io.freefair.lombok" version "9.5.0" // https://github.com/ben-manes/gradle-versions-plugin // Run: ./gradlew dependencyUpdates -Drevision=release id "com.github.ben-manes.versions" version "0.54.0" - id "org.sonarqube" version "7.2.3.7755" + id "org.sonarqube" version "7.3.0.8198" } group = "io.securecodebox" @@ -28,17 +28,17 @@ dependencies { // so it causes issues with the version in the defectdojo client implementation group: "org.springframework", name: "spring-web", version: "6.2.12" // https://github.com/FasterXML/jackson-bom - implementation platform("com.fasterxml.jackson:jackson-bom:2.21.2") + implementation platform("com.fasterxml.jackson:jackson-bom:2.21.3") implementation "com.fasterxml.jackson.core:jackson-core" implementation "com.fasterxml.jackson.core:jackson-annotations" implementation "com.fasterxml.jackson.core:jackson-databind" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" - implementation group: "org.slf4j", name: "slf4j-api", version: "2.0.17" - implementation group: "org.slf4j", name: "slf4j-log4j12", version: "2.0.17" + implementation group: "org.slf4j", name: "slf4j-api", version: "2.0.18" + implementation group: "org.slf4j", name: "slf4j-log4j12", version: "2.0.18" // If I try to notate this like the others (with separate strings) I got errors. No idea why sh... Gradle // want it like this. It is the official documented example: // https://github.com/junit-team/junit5-samples/blob/r5.10.0/junit5-jupiter-starter-gradle/build.gradle - testImplementation(platform("org.junit:junit-bom:6.0.3")) + testImplementation(platform("org.junit:junit-bom:6.1.0")) testImplementation("org.junit.jupiter:junit-jupiter") testImplementation group: "org.mockito", name: "mockito-core", version: "5.23.0" testImplementation group: "org.mockito", name: "mockito-junit-jupiter", version: "5.23.0" diff --git a/hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.jar b/hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.jar index d997cfc60f..b1b8ef56b4 100644 Binary files a/hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.jar and b/hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.jar differ diff --git a/hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.properties b/hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.properties index c82ad3ff01..e74c8700b2 100644 --- a/hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.properties +++ b/hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hooks/persistence-defectdojo/hook/gradlew b/hooks/persistence-defectdojo/hook/gradlew index 739907dfd1..b9bb139f79 100755 --- a/hooks/persistence-defectdojo/hook/gradlew +++ b/hooks/persistence-defectdojo/hook/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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/. diff --git a/hooks/persistence-defectdojo/hook/gradlew.bat b/hooks/persistence-defectdojo/hook/gradlew.bat old mode 100755 new mode 100644 index e509b2dd8f..aa5f10b069 --- a/hooks/persistence-defectdojo/hook/gradlew.bat +++ b/hooks/persistence-defectdojo/hook/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ 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 +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ 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 +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%