diff --git a/build.gradle b/build.gradle index 7bf01903..dc3e9ac1 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.4.0.8496' apply false + id 'org.sonarqube' version '7.5.0.8588' apply false } subprojects { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index eddabd2e..5097068a 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 2a7f6056..7483e388 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/gradlew.bat b/gradlew.bat index 8508ef68..03754c4c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,33 @@ @rem Set local scope for the variables, and ensure extensions are enabled setlocal EnableExtensions +@rem Catch executions from older scripts and ensure they exit cleanly. +@rem This can be removed once we can be reasonably confident that few people +@rem will be migrating directly to this new wrapper. +goto afterSafetyNet +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +goto exitWithErrorLevel +:afterSafetyNet + set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @rem This is normally unused @@ -45,13 +72,14 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -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 +1>&2 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. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -59,13 +87,14 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -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 +1>&2 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. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :execute @rem Setup the command line @@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2 @rem Execute gradlew @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 +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 & goto exitWithErrorLevel +@rem This label must not be changed. We rely on old scripts being able to jump to this point. :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 a65451bf..ed0527f1 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -24,11 +24,11 @@ tasks.named('jar', Jar) { def jsonProviders = [ [id : 'jackson', additionalVersions: ['2.2.0'], - group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.22.1'], + group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.22.3'], [id : 'gson', additionalVersions: ['2.3'], group: 'com.google.code.gson', name: 'gson', version: '2.14.0'], [id : 'orgJson', additionalVersions: ['20201115'], - group: 'org.json', name: 'json', version: '20260719'], + group: 'org.json', name: 'json', version: '20260814'], [id : 'kotlinxJson', additionalVersions: ['1.0.0'], group: 'org.jetbrains.kotlinx', name: 'kotlinx-serialization-json', version: '1.11.0'], [id : 'jakartaJson', additionalVersions: [], @@ -38,7 +38,7 @@ def jsonProviders = [ [id : 'jsonSmart', additionalVersions: ['1.1'], group: 'net.minidev', name: 'json-smart', version: '2.6.0'], [id : 'snakeYaml', additionalVersions: ['1.26', '2.0'], - group: 'org.yaml', name: 'snakeyaml', version: '2.6'], + group: 'org.yaml', name: 'snakeyaml', version: '2.7'], ] setupJava8Test(jsonProviders[0]) @@ -51,7 +51,7 @@ jsonProviders.forEach { } dependencies { - formatImplementation 'com.sanctionco.jmail:jmail:2.2.0' + formatImplementation 'com.sanctionco.jmail:jmail:2.2.2' jakartaJsonTestImplementation 'org.eclipse.parsson:parsson:1.1.9' testRuntimeOnly 'org.eclipse.parsson:parsson:1.1.9' @@ -60,8 +60,8 @@ dependencies { 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.2.0' + testFixturesApi 'org.mockito:mockito-core:5.24.0' + testFixturesApi 'com.sanctionco.jmail:jmail:2.2.2' testFixturesRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.14.4' } diff --git a/providers/jackson3/build.gradle b/providers/jackson3/build.gradle index d3bafaf9..eb55efa0 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.2.1' + implementation 'tools.jackson.core:jackson-databind:3.2.3' testImplementation testFixtures(project(':json-schema')) }