Skip to content

Commit a0dea73

Browse files
authored
Upgrade gradle, it's dependencies and project dependencies (#1534)
Signed-off-by: Bala.FA <[email protected]>
1 parent 8c050a0 commit a0dea73

File tree

4 files changed

+29
-22
lines changed

4 files changed

+29
-22
lines changed

build.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
/*****************************/
18-
/* gradleVersion = '8.4' */
18+
/* gradleVersion = '8.6' */
1919
/*****************************/
2020

2121
plugins {
@@ -52,15 +52,16 @@ subprojects {
5252

5353
dependencies {
5454
api "com.carrotsearch.thirdparty:simple-xml-safe:2.7.1"
55-
api "com.google.guava:guava:32.1.3-jre"
55+
api "com.google.guava:guava:33.0.0-jre"
5656
api "com.squareup.okhttp3:okhttp:4.12.0"
57-
api "com.fasterxml.jackson.core:jackson-annotations:2.15.3"
58-
api "com.fasterxml.jackson.core:jackson-core:2.15.3"
59-
api "com.fasterxml.jackson.core:jackson-databind:2.15.3"
60-
api "org.bouncycastle:bcprov-jdk18on:1.76"
61-
api "org.apache.commons:commons-compress:1.24.0"
57+
api "com.fasterxml.jackson.core:jackson-annotations:2.16.1"
58+
api "com.fasterxml.jackson.core:jackson-core:2.16.1"
59+
api "com.fasterxml.jackson.core:jackson-databind:2.16.1"
60+
api "org.bouncycastle:bcprov-jdk18on:1.77"
61+
api "org.apache.commons:commons-compress:1.26.0"
62+
api "commons-codec:commons-codec:1.16.1"
6263
api "org.xerial.snappy:snappy-java:1.1.10.5"
63-
compileOnly "com.github.spotbugs:spotbugs-annotations:4.8.0"
64+
compileOnly "com.github.spotbugs:spotbugs-annotations:4.8.3"
6465

6566
testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
6667
testImplementation "junit:junit:4.13.2"
@@ -242,7 +243,7 @@ project(':adminapi') {
242243

243244
dependencies {
244245
api project(':api')
245-
api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.3"
246+
api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1"
246247
testImplementation project(':api')
247248
}
248249

gradle/wrapper/gradle-wrapper.jar

2.1 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
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"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
146147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
148149
MAX_FD=$( ulimit -H -n ) ||
149150
warn "Could not query maximum file descriptor limit"
150151
esac
151152
case $MAX_FD in #(
152153
'' | soft) :;; #(
153154
*)
154155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
156157
ulimit -n "$MAX_FD" ||
157158
warn "Could not set maximum file descriptor limit to $MAX_FD"
158159
esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
197198
done
198199
fi
199200

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

206211
set -- \
207212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)