diff --git a/gradle.properties b/gradle.properties index d306cb83..76b22d43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,10 +7,10 @@ PROJECT_LICENSE=MIT PROJECT_LICENSE_URL=https://github.com/graphql-java-kickstart/spring-java-servlet/blob/master/LICENSE.md PROJECT_DEV_ID=oliemansm PROJECT_DEV_NAME=Michiel Oliemans -LIB_GRAPHQL_JAVA_VER=22.1 -LIB_JACKSON_VER=2.16.1 -LIB_SLF4J_VER=2.0.12 -LIB_LOMBOK_VER=1.18.30 +LIB_GRAPHQL_JAVA_VER=22.3 +LIB_JACKSON_VER=2.17.2 +LIB_SLF4J_VER=2.0.16 +LIB_LOMBOK_VER=1.18.34 # 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 c1962a79..a4b76b95 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 2ea3535d..1ed247ec 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.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index aeb74cbb..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/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/. @@ -83,7 +85,9 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# 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 # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +134,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -141,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -149,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -198,11 +205,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_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. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 6689b85b..9b42019c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 goto fail diff --git a/graphql-java-kickstart/build.gradle b/graphql-java-kickstart/build.gradle index aca09040..7744441a 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.16.1" + api "com.fasterxml.jackson.core:jackson-databind:2.17.2" 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 4f1c9bf5..0542a10f 100644 --- a/graphql-java-servlet/build.gradle +++ b/graphql-java-servlet/build.gradle @@ -16,9 +16,9 @@ dependencies { api(project(':graphql-java-kickstart')) // Servlet - compileOnly "jakarta.servlet:jakarta.servlet-api:6.0.0" - compileOnly "jakarta.websocket:jakarta.websocket-api:2.1.1" - compileOnly "jakarta.websocket:jakarta.websocket-client-api:2.1.1" + compileOnly "jakarta.servlet:jakarta.servlet-api:6.1.0" + compileOnly "jakarta.websocket:jakarta.websocket-api:2.2.0" + compileOnly "jakarta.websocket:jakarta.websocket-client-api:2.2.0" implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER" // OSGi @@ -32,15 +32,15 @@ dependencies { testImplementation 'io.github.graphql-java:graphql-java-annotations:9.1' // Unit testing - testImplementation "org.apache.groovy:groovy-all:4.0.18" + testImplementation "org.apache.groovy:groovy-all:4.0.23" testImplementation "org.spockframework:spock-core:2.3-groovy-4.0" - testRuntimeOnly "net.bytebuddy:byte-buddy:1.14.12" - testRuntimeOnly "org.objenesis:objenesis:3.3" + testRuntimeOnly "net.bytebuddy:byte-buddy:1.15.1" + testRuntimeOnly "org.objenesis:objenesis:3.4" testImplementation "org.slf4j:slf4j-simple:$LIB_SLF4J_VER" - testImplementation "org.springframework:spring-test:6.1.4" - testRuntimeOnly "org.springframework:spring-web:6.1.4" - testImplementation 'com.google.guava:guava:33.0.0-jre' - testImplementation "jakarta.servlet:jakarta.servlet-api:6.0.0" - testImplementation "jakarta.websocket:jakarta.websocket-api:2.1.1" - testImplementation "jakarta.websocket:jakarta.websocket-client-api:2.1.1" + testImplementation "org.springframework:spring-test:6.1.13" + testRuntimeOnly "org.springframework:spring-web:6.1.13" + testImplementation 'com.google.guava:guava:33.3.0-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" }