diff --git a/build.gradle b/build.gradle index 2c2fe3e3..b02ede86 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { - id 'org.sonarqube' version '7.2.3.7755' apply false + id 'org.sonarqube' version '7.3.0.8198' apply false } subprojects { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc6..b1b8ef56 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 5b59ea8e..4dcb8425 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 739907df..b9bb139f 100755 --- a/gradlew +++ b/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/gradlew.bat b/gradlew.bat index e509b2dd..aa5f10b0 100644 --- a/gradlew.bat +++ b/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% diff --git a/lib/build.gradle b/lib/build.gradle index 958c067b..b29225a4 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -24,9 +24,9 @@ tasks.named('jar', Jar) { def jsonProviders = [ [id : 'jackson', additionalVersions: ['2.2.0'], - group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.21.2'], + group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.21.3'], [id : 'gson', additionalVersions: ['2.3'], - group: 'com.google.code.gson', name: 'gson', version: '2.13.2'], + group: 'com.google.code.gson', name: 'gson', version: '2.14.0'], [id : 'orgJson', additionalVersions: ['20201115'], group: 'org.json', name: 'json', version: '20251224'], [id : 'kotlinxJson', additionalVersions: ['1.0.0'], @@ -56,13 +56,13 @@ dependencies { jakartaJsonTestImplementation 'org.eclipse.parsson:parsson:1.1.7' testRuntimeOnly 'org.eclipse.parsson:parsson:1.1.7' - testFixturesApi 'org.junit.platform:junit-platform-launcher:1.14.3' - testFixturesApi 'org.junit.jupiter:junit-jupiter-api:5.14.3' - testFixturesApi 'org.junit.jupiter:junit-jupiter:5.14.3' + testFixturesApi 'org.junit.platform:junit-platform-launcher:1.14.4' + testFixturesApi 'org.junit.jupiter:junit-jupiter-api:5.14.4' + testFixturesApi 'org.junit.jupiter:junit-jupiter:5.14.4' testFixturesApi 'org.assertj:assertj-core:3.27.7' testFixturesApi 'org.mockito:mockito-core:5.23.0' testFixturesApi 'com.sanctionco.jmail:jmail:2.1.0' - testFixturesRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.14.3' + testFixturesRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.14.4' } processTestFixturesResources { diff --git a/providers/jackson3/build.gradle b/providers/jackson3/build.gradle index 3ce4600f..94a4d611 100644 --- a/providers/jackson3/build.gradle +++ b/providers/jackson3/build.gradle @@ -8,7 +8,7 @@ compileJava { dependencies { api project(':json-schema') - implementation 'tools.jackson.core:jackson-databind:3.1.2' + implementation 'tools.jackson.core:jackson-databind:3.1.3' testImplementation testFixtures(project(':json-schema')) }