Skip to content

Commit 97b31bb

Browse files
chore(deps): Update java minor and patch
1 parent d33f478 commit 97b31bb

File tree

21 files changed

+500
-455
lines changed

21 files changed

+500
-455
lines changed

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ dependencies {
136136
testRuntimeOnly "io.opencensus:opencensus-impl:${openCensusVersion}"
137137

138138
// Used for unmarshalling a JSON GraphQL response
139-
testImplementation 'com.google.code.gson:gson:2.12.0'
139+
testImplementation 'com.google.code.gson:gson:2.12.1'
140140

141141
// Declare the dependency for your favourite test framework you want to use in your tests.
142142
testImplementation 'org.testng:testng:7.10.2'
@@ -146,7 +146,7 @@ dependencies {
146146
}
147147

148148
googleJavaFormat {
149-
toolVersion = '1.5'
149+
toolVersion = '1.25.2'
150150
exclude 'src/generated/**/*.java'
151151
}
152152
compileJava.dependsOn 'googleJavaFormat'

gradle/wrapper/gradle-wrapper.jar

-15.3 KB
Binary file not shown.
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

+113-99
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -69,90 +71,94 @@ app_path=$0
6971

7072
# Need this for daisy-chained symlinks.
7173
while
72-
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
73-
[ -h "${app_path}" ]
74+
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
75+
[ -h "$app_path" ]
7476
do
75-
ls=$(ls -ld "${app_path}")
76-
link=${ls#*' -> '}
77-
case ${link} in #(
78-
/*) app_path=${link} ;; #(
79-
*) app_path=${APP_HOME}${link} ;;
80-
esac
77+
ls=$( ls -ld "$app_path" )
78+
link=${ls#*' -> '}
79+
case $link in #(
80+
/*) app_path=$link ;; #(
81+
*) app_path=$APP_HOME$link ;;
82+
esac
8183
done
8284

83-
APP_HOME=$(cd "${APP_HOME:-./}" && pwd -P) || exit
84-
85-
APP_NAME="Gradle"
85+
# This is normally unused
86+
# shellcheck disable=SC2034
8687
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9090

9191
# Use the maximum available, or set MAX_FD != -1 to use that value.
9292
MAX_FD=maximum
9393

94-
warn() {
95-
echo "$*"
94+
warn () {
95+
echo "$*"
9696
} >&2
9797

98-
die() {
99-
echo
100-
echo "$*"
101-
echo
102-
exit 1
98+
die () {
99+
echo
100+
echo "$*"
101+
echo
102+
exit 1
103103
} >&2
104104

105105
# OS specific support (must be 'true' or 'false').
106106
cygwin=false
107107
msys=false
108108
darwin=false
109109
nonstop=false
110-
case "$(uname)" in #(
111-
CYGWIN*) cygwin=true ;; #(
112-
Darwin*) darwin=true ;; #(
113-
MSYS* | MINGW*) msys=true ;; #(
114-
NONSTOP*) nonstop=true ;;
110+
case "$( uname )" in #(
111+
CYGWIN* ) cygwin=true ;; #(
112+
Darwin* ) darwin=true ;; #(
113+
MSYS* | MINGW* ) msys=true ;; #(
114+
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=${APP_HOME}/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
118+
118119

119120
# Determine the Java command to use to start the JVM.
120-
if [ -n "${JAVA_HOME}" ]; then
121-
if [ -x "${JAVA_HOME}/jre/sh/java" ]; then
122-
# IBM's JDK on AIX uses strange locations for the executables
123-
JAVACMD=${JAVA_HOME}/jre/sh/java
124-
else
125-
JAVACMD=${JAVA_HOME}/bin/java
126-
fi
127-
if [ ! -x "${JAVACMD}" ]; then
128-
die "ERROR: JAVA_HOME is set to an invalid directory: ${JAVA_HOME}
121+
if [ -n "$JAVA_HOME" ] ; then
122+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
123+
# IBM's JDK on AIX uses strange locations for the executables
124+
JAVACMD=$JAVA_HOME/jre/sh/java
125+
else
126+
JAVACMD=$JAVA_HOME/bin/java
127+
fi
128+
if [ ! -x "$JAVACMD" ] ; then
129+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
129130
130131
Please set the JAVA_HOME variable in your environment to match the
131132
location of your Java installation."
132-
fi
133+
fi
133134
else
134-
JAVACMD=java
135-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
135+
JAVACMD=java
136+
if ! command -v java >/dev/null 2>&1
137+
then
138+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
136139
137140
Please set the JAVA_HOME variable in your environment to match the
138141
location of your Java installation."
142+
fi
139143
fi
140144

141145
# Increase the maximum file descriptors if we can.
142-
if ! "${cygwin}" && ! "${darwin}" && ! "${nonstop}"; then
143-
case ${MAX_FD} in #(
144-
max*)
145-
MAX_FD=$(ulimit -H -n) ||
146-
warn "Could not query maximum file descriptor limit"
147-
;;
148-
esac
149-
case ${MAX_FD} in #(
150-
'' | soft) : ;; #(
151-
*)
152-
ulimit -n "${MAX_FD}" ||
153-
warn "Could not set maximum file descriptor limit to ${MAX_FD}"
154-
;;
155-
esac
146+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
147+
case $MAX_FD in #(
148+
max*)
149+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
150+
# shellcheck disable=SC2039,SC3045
151+
MAX_FD=$( ulimit -H -n ) ||
152+
warn "Could not query maximum file descriptor limit"
153+
esac
154+
case $MAX_FD in #(
155+
'' | soft) :;; #(
156+
*)
157+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
158+
# shellcheck disable=SC2039,SC3045
159+
ulimit -n "$MAX_FD" ||
160+
warn "Could not set maximum file descriptor limit to $MAX_FD"
161+
esac
156162
fi
157163

158164
# Collect all arguments for the java command, stacking in reverse order:
@@ -164,49 +170,57 @@ fi
164170
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
165171

166172
# For Cygwin or MSYS, switch paths to Windows format before running java
167-
if "${cygwin}" || "${msys}"; then
168-
APP_HOME=$(cygpath --path --mixed "${APP_HOME}")
169-
CLASSPATH=$(cygpath --path --mixed "${CLASSPATH}")
170-
171-
JAVACMD=$(cygpath --unix "${JAVACMD}")
172-
173-
# Now convert the arguments - kludge to limit ourselves to /bin/sh
174-
for arg; do
175-
if
176-
case ${arg} in #(
177-
-*) false ;; # don't mess with options #(
178-
/?*)
179-
t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
180-
[ -e "${t}" ]
181-
;; #(
182-
*) false ;;
183-
esac
184-
then
185-
arg=$(cygpath --path --ignore --mixed "${arg}")
186-
fi
187-
# Roll the args list around exactly as many times as the number of
188-
# args, so each arg winds up back in the position where it started, but
189-
# possibly modified.
190-
#
191-
# NB: a `for` loop captures its iteration list before it begins, so
192-
# changing the positional parameters here affects neither the number of
193-
# iterations, nor the values presented in `arg`.
194-
shift # remove old arg
195-
set -- "$@" "${arg}" # push replacement arg
196-
done
173+
if "$cygwin" || "$msys" ; then
174+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176+
177+
JAVACMD=$( cygpath --unix "$JAVACMD" )
178+
179+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
180+
for arg do
181+
if
182+
case $arg in #(
183+
-*) false ;; # don't mess with options #(
184+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
185+
[ -e "$t" ] ;; #(
186+
*) false ;;
187+
esac
188+
then
189+
arg=$( cygpath --path --ignore --mixed "$arg" )
190+
fi
191+
# Roll the args list around exactly as many times as the number of
192+
# args, so each arg winds up back in the position where it started, but
193+
# possibly modified.
194+
#
195+
# NB: a `for` loop captures its iteration list before it begins, so
196+
# changing the positional parameters here affects neither the number of
197+
# iterations, nor the values presented in `arg`.
198+
shift # remove old arg
199+
set -- "$@" "$arg" # push replacement arg
200+
done
197201
fi
198202

199-
# Collect all arguments for the java command;
200-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
201-
# shell script including quotes and variable substitutions, so put them in
202-
# double quotes to make sure that they get re-expanded; and
203-
# * put everything else in single quotes, so that it's not re-expanded.
203+
204+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
205+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206+
207+
# Collect all arguments for the java command:
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209+
# and any embedded shellness will be escaped.
210+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211+
# treated as '${Hostname}' itself on the command line.
204212

205213
set -- \
206-
"-Dorg.gradle.appname=${APP_BASE_NAME}" \
207-
-classpath "${CLASSPATH}" \
208-
org.gradle.wrapper.GradleWrapperMain \
209-
"$@"
214+
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215+
-classpath "$CLASSPATH" \
216+
org.gradle.wrapper.GradleWrapperMain \
217+
"$@"
218+
219+
# Stop when "xargs" is not available.
220+
if ! command -v xargs >/dev/null 2>&1
221+
then
222+
die "xargs is not available"
223+
fi
210224

211225
# Use "xargs" to parse quoted args.
212226
#
@@ -228,10 +242,10 @@ set -- \
228242
#
229243

230244
eval "set -- $(
231-
printf '%s\n' "${DEFAULT_JVM_OPTS} ${JAVA_OPTS} ${GRADLE_OPTS}" |
232-
xargs -n1 |
233-
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
234-
tr '\n' ' '
235-
)" '"$@"'
245+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
246+
xargs -n1 |
247+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
248+
tr '\n' ' '
249+
)" '"$@"'
236250

237-
exec "${JAVACMD}" "$@"
251+
exec "$JAVACMD" "$@"

gradlew.bat

+21-16
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

17-
@if "%DEBUG%" == "" @echo off
19+
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
1921
@rem
2022
@rem Gradle startup script for Windows
@@ -25,7 +27,8 @@
2527
if "%OS%"=="Windows_NT" setlocal
2628

2729
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
30+
if "%DIRNAME%"=="" set DIRNAME=.
31+
@rem This is normally unused
2932
set APP_BASE_NAME=%~n0
3033
set APP_HOME=%DIRNAME%
3134

@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4043

4144
set JAVA_EXE=java.exe
4245
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
46+
if %ERRORLEVEL% equ 0 goto execute
4447

45-
echo.
46-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47-
echo.
48-
echo Please set the JAVA_HOME variable in your environment to match the
49-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5053

5154
goto fail
5255

@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5659

5760
if exist "%JAVA_EXE%" goto execute
5861

59-
echo.
60-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61-
echo.
62-
echo Please set the JAVA_HOME variable in your environment to match the
63-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6467

6568
goto fail
6669

@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7578

7679
:end
7780
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
81+
if %ERRORLEVEL% equ 0 goto mainEnd
7982

8083
:fail
8184
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8285
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
86+
set EXIT_CODE=%ERRORLEVEL%
87+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
88+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
89+
exit /b %EXIT_CODE%
8590

8691
:mainEnd
8792
if "%OS%"=="Windows_NT" endlocal

samples/DgraphJavaSample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
testImplementation 'junit:junit:4.13.2'
2424

2525
// https://mvnrepository.com/artifact/com.google.code.gson/gson
26-
implementation 'com.google.code.gson:gson:2.12.0'
26+
implementation 'com.google.code.gson:gson:2.12.1'
2727
}
2828

2929
// Define the main class for the application
Binary file not shown.

0 commit comments

Comments
 (0)