diff --git a/packages/java/build.gradle.kts b/packages/java/build.gradle.kts index 5564446..8e56136 100644 --- a/packages/java/build.gradle.kts +++ b/packages/java/build.gradle.kts @@ -16,7 +16,7 @@ import java.nio.file.Path import java.net.URI plugins { - id("com.diffplug.spotless") version "8.10.1" apply false + id("com.diffplug.spotless") version "8.10.3" apply false } val releaseVersionFile = rootProject.file("../../VERSION") @@ -79,8 +79,8 @@ subprojects { options.compilerArgs.add("-Xlint:deprecation") } dependencies { - add("testImplementation", "org.junit.jupiter:junit-jupiter:6.0.3") - add("testRuntimeOnly", "org.junit.platform:junit-platform-launcher:6.0.3") + add("testImplementation", "org.junit.jupiter:junit-jupiter:6.1.3") + add("testRuntimeOnly", "org.junit.platform:junit-platform-launcher:6.1.3") } tasks.withType().configureEach { useJUnitPlatform() } dependencyLocking { diff --git a/packages/java/core/build.gradle.kts b/packages/java/core/build.gradle.kts index cac32b2..37ef5c8 100644 --- a/packages/java/core/build.gradle.kts +++ b/packages/java/core/build.gradle.kts @@ -6,9 +6,9 @@ plugins { } dependencies { - implementation("com.networknt:json-schema-validator:3.0.4") - implementation("tools.jackson.core:jackson-core:3.1.7") - implementation("tools.jackson.core:jackson-databind:3.1.7") + implementation("com.networknt:json-schema-validator:3.0.7") + implementation("tools.jackson.core:jackson-core:3.2.3") + implementation("tools.jackson.core:jackson-databind:3.2.3") } spotless { diff --git a/packages/java/core/gradle.lockfile b/packages/java/core/gradle.lockfile index 3f12732..ff29980 100644 --- a/packages/java/core/gradle.lockfile +++ b/packages/java/core/gradle.lockfile @@ -6,14 +6,14 @@ com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,runtimeClas com.networknt:json-schema-validator:3.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.jspecify:jspecify:1.0.0=testCompileClasspath -org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:6.0.3=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:6.0.3=testRuntimeClasspath -org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath -org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:6.1.3=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:6.1.3=testRuntimeClasspath +org.junit.platform:junit-platform-launcher:6.1.3=testRuntimeClasspath +org.junit:junit-bom:6.1.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.snakeyaml:snakeyaml-engine:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/packages/java/gradle/wrapper/gradle-wrapper.jar b/packages/java/gradle/wrapper/gradle-wrapper.jar index f8e1ee3..5097068 100644 Binary files a/packages/java/gradle/wrapper/gradle-wrapper.jar and b/packages/java/gradle/wrapper/gradle-wrapper.jar differ diff --git a/packages/java/gradle/wrapper/gradle-wrapper.properties b/packages/java/gradle/wrapper/gradle-wrapper.properties index 5922b03..c1d138b 100644 --- a/packages/java/gradle/wrapper/gradle-wrapper.properties +++ b/packages/java/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip -distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip +distributionSha256Sum=bafd5ce9cfaea0fbccfdc8439a1ac42fbd4cd9c89dc9a988228d8a2639a58e6c networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/packages/java/gradlew b/packages/java/gradlew index adff685..249efbb 100755 --- a/packages/java/gradlew +++ b/packages/java/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/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/packages/java/gradlew.bat b/packages/java/gradlew.bat index e509b2d..03754c4 100644 --- a/packages/java/gradlew.bat +++ b/packages/java/gradlew.bat @@ -19,12 +19,39 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @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 + +@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=. @@ -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. -goto fail +"%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -59,35 +87,26 @@ 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. -goto fail +"%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :execute @rem Setup the command line -@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 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 & goto 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 +@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/packages/java/spring-boot-starter/build.gradle.kts b/packages/java/spring-boot-starter/build.gradle.kts index fb3debc..c12b6e0 100644 --- a/packages/java/spring-boot-starter/build.gradle.kts +++ b/packages/java/spring-boot-starter/build.gradle.kts @@ -9,12 +9,12 @@ dependencies { api(project(":core")) api(platform("org.springframework.boot:spring-boot-dependencies:4.1.1")) // Spring Boot 4.1.1 manages Jackson 3.1.5; pin 3.1.7 for current security fixes. - api(platform("tools.jackson:jackson-bom:3.1.7")) + api(platform("tools.jackson:jackson-bom:3.2.3")) api("org.springframework.boot:spring-boot-starter-webmvc") api("org.springframework.boot:spring-boot-starter-validation") - api("org.apache.tomcat.embed:tomcat-embed-core:11.0.25") - api("org.apache.tomcat.embed:tomcat-embed-el:11.0.25") - api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.25") + api("org.apache.tomcat.embed:tomcat-embed-core:11.0.26") + api("org.apache.tomcat.embed:tomcat-embed-el:11.0.26") + api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.26") annotationProcessor(platform("org.springframework.boot:spring-boot-dependencies:4.1.1")) annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") testImplementation(platform("org.springframework.boot:spring-boot-dependencies:4.1.1")) diff --git a/packages/java/spring-boot-starter/gradle.lockfile b/packages/java/spring-boot-starter/gradle.lockfile index 373aa57..dfc0949 100644 --- a/packages/java/spring-boot-starter/gradle.lockfile +++ b/packages/java/spring-boot-starter/gradle.lockfile @@ -35,14 +35,14 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.hibernate.validator:hibernate-validator:9.1.3.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jboss.logging:jboss-logging:3.6.3.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:6.0.3=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:6.0.3=testRuntimeClasspath -org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath -org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:6.1.3=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:6.1.3=testRuntimeClasspath +org.junit.platform:junit-platform-launcher:6.1.3=testRuntimeClasspath +org.junit:junit-bom:6.1.3=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath diff --git a/packages/java/spring-example/gradle.lockfile b/packages/java/spring-example/gradle.lockfile index a38a69b..f249dac 100644 --- a/packages/java/spring-example/gradle.lockfile +++ b/packages/java/spring-example/gradle.lockfile @@ -24,14 +24,14 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.hibernate.validator:hibernate-validator:9.1.3.Final=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jboss.logging:jboss-logging:3.6.3.Final=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:6.0.3=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:6.0.3=testRuntimeClasspath -org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath -org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:6.1.3=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:6.1.3=testRuntimeClasspath +org.junit.platform:junit-platform-launcher:6.1.3=testRuntimeClasspath +org.junit:junit-bom:6.1.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath diff --git a/packages/java/starter-api-consumer-test/gradle.lockfile b/packages/java/starter-api-consumer-test/gradle.lockfile index efa99bd..4ad512a 100644 --- a/packages/java/starter-api-consumer-test/gradle.lockfile +++ b/packages/java/starter-api-consumer-test/gradle.lockfile @@ -24,14 +24,14 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.hibernate.validator:hibernate-validator:9.1.3.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jboss.logging:jboss-logging:3.6.3.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:6.0.3=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:6.0.3=testRuntimeClasspath -org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath -org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:6.1.3=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:6.1.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:6.1.3=testRuntimeClasspath +org.junit.platform:junit-platform-launcher:6.1.3=testRuntimeClasspath +org.junit:junit-bom:6.1.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath