diff --git a/build.gradle b/build.gradle index 00c9afc2d13..5786034133d 100644 --- a/build.gradle +++ b/build.gradle @@ -12,23 +12,23 @@ plugins { id 'java' id 'java-library' // needed to make sure that transitive deps have 'compile' scope - id "com.diffplug.spotless" version "6.1.2" + id "com.diffplug.spotless" version "6.9.0" id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' - id 'com.github.jk1.dependency-license-report' version '2.0' + id 'com.github.jk1.dependency-license-report' version '2.1' id "me.champeau.jmh" version "0.6.6" } configurations { taglet { - resolutionStrategy.force("net.sourceforge.plantuml:plantuml:1.2022.0") + resolutionStrategy.force("net.sourceforge.plantuml:plantuml:1.2022.6") } } dependencies { taglet 'com.commercetools.build.taglets:commercetools-taglets:2.1.4' - taglet 'org.jdrupes.taglets:plantuml-taglet:2.0.0' + taglet 'org.jdrupes.taglets:plantuml-taglet:2.0.1' } import java.text.SimpleDateFormat diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 1c8c9edd500..1aab6ee3a2b 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version "1.6.10" + id 'org.jetbrains.kotlin.jvm' version "1.7.10" } repositories { @@ -7,6 +7,6 @@ repositories { } dependencies { - implementation "com.github.javaparser:javaparser-symbol-solver-core:3.24.0" - implementation "com.google.code.gson:gson:2.8.9" + implementation "com.github.javaparser:javaparser-symbol-solver-core:3.24.2" + implementation "com.google.code.gson:gson:2.9.0" } diff --git a/gradle-scripts/subproject-dependencies.gradle b/gradle-scripts/subproject-dependencies.gradle index 37e51cba7e0..fd57f11e572 100644 --- a/gradle-scripts/subproject-dependencies.gradle +++ b/gradle-scripts/subproject-dependencies.gradle @@ -1,6 +1,6 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter:${versions.junit}" - testImplementation 'com.tngtech.junit.dataprovider:junit-jupiter-dataprovider:2.8' + testImplementation 'com.tngtech.junit.dataprovider:junit-jupiter-dataprovider:2.9' testImplementation "org.assertj:assertj-core:${versions.assertJ}" testImplementation "org.awaitility:awaitility:${versions.awaitility}" testImplementation "ch.qos.logback:logback-classic:${versions.logback}" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae..249e5832f09 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 669386b870a..2ec77e51a9c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787337f..a69d9cb6c20 100755 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9382..53a6b238d41 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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