Skip to content

Commit

Permalink
chore(deps): update all non-major dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Sep 5, 2024
1 parent 866fa5c commit f1d4d62
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 38 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
27 changes: 17 additions & 10 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -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/.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -130,26 +134,29 @@ 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.
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
case $MAX_FD in #(
'' | 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
Expand Down Expand Up @@ -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" \
Expand Down
22 changes: 12 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##########################################################################
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion graphql-java-kickstart/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
24 changes: 12 additions & 12 deletions graphql-java-servlet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.22"
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.12"
testRuntimeOnly "org.springframework:spring-web:6.1.12"
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"
}

0 comments on commit f1d4d62

Please sign in to comment.