diff --git a/gradle.properties b/gradle.properties index 1db1b5cf..f56c731f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,9 +8,9 @@ PROJECT_LICENSE_URL=https://github.com/graphql-java-kickstart/spring-java-servle PROJECT_DEV_ID=oliemansm PROJECT_DEV_NAME=Michiel Oliemans LIB_GRAPHQL_JAVA_VER=22.3 -LIB_JACKSON_VER=2.17.2 -LIB_SLF4J_VER=2.0.16 -LIB_LOMBOK_VER=1.18.34 +LIB_JACKSON_VER=2.19.0 +LIB_SLF4J_VER=2.0.17 +LIB_LOMBOK_VER=1.18.38 # These constants are necessary to the automatic release of javax flavour LIB_JAVAX_SERVLET=4.0.1 LIB_JAVAX_WEBSOCKET=1.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b95..1b33c55b 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 79eb9d00..6514f919 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-8.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d..23d15a93 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019c..5eed7ee8 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/graphql-java-kickstart/build.gradle b/graphql-java-kickstart/build.gradle index 7744441a..c6381736 100644 --- a/graphql-java-kickstart/build.gradle +++ b/graphql-java-kickstart/build.gradle @@ -14,6 +14,6 @@ dependencies { // JSON api "com.fasterxml.jackson.core:jackson-core:$LIB_JACKSON_VER" api "com.fasterxml.jackson.core:jackson-annotations:$LIB_JACKSON_VER" - api "com.fasterxml.jackson.core:jackson-databind:2.17.2" + api "com.fasterxml.jackson.core:jackson-databind:2.19.0" api "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$LIB_JACKSON_VER" } diff --git a/graphql-java-servlet/build.gradle b/graphql-java-servlet/build.gradle index 084c469f..fd72a8f2 100644 --- a/graphql-java-servlet/build.gradle +++ b/graphql-java-servlet/build.gradle @@ -32,14 +32,14 @@ dependencies { testImplementation 'io.github.graphql-java:graphql-java-annotations:9.1' // Unit testing - testImplementation "org.apache.groovy:groovy-all:4.0.23" + testImplementation "org.apache.groovy:groovy-all:4.0.26" testImplementation "org.spockframework:spock-core:2.3-groovy-4.0" - testRuntimeOnly "net.bytebuddy:byte-buddy:1.15.2" + testRuntimeOnly "net.bytebuddy:byte-buddy:1.17.5" testRuntimeOnly "org.objenesis:objenesis:3.4" testImplementation "org.slf4j:slf4j-simple:$LIB_SLF4J_VER" - testImplementation "org.springframework:spring-test:6.1.13" - testRuntimeOnly "org.springframework:spring-web:6.1.13" - testImplementation 'com.google.guava:guava:33.3.1-jre' + testImplementation "org.springframework:spring-test:6.2.6" + testRuntimeOnly "org.springframework:spring-web:6.2.6" + testImplementation 'com.google.guava:guava:33.4.8-jre' testImplementation "jakarta.servlet:jakarta.servlet-api:6.1.0" testImplementation "jakarta.websocket:jakarta.websocket-api:2.2.0" testImplementation "jakarta.websocket:jakarta.websocket-client-api:2.2.0"