diff --git a/build.gradle b/build.gradle index 1362b1830..2075ef506 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ */ /*****************************/ -/* gradleVersion = '8.4' */ +/* gradleVersion = '8.6' */ /*****************************/ plugins { @@ -52,15 +52,15 @@ subprojects { dependencies { api "com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" - api "com.google.guava:guava:32.1.3-jre" + api "com.google.guava:guava:33.0.0-jre" api "com.squareup.okhttp3:okhttp:4.12.0" - api "com.fasterxml.jackson.core:jackson-annotations:2.15.3" - api "com.fasterxml.jackson.core:jackson-core:2.15.3" - api "com.fasterxml.jackson.core:jackson-databind:2.15.3" - api "org.bouncycastle:bcprov-jdk18on:1.76" - api "org.apache.commons:commons-compress:1.24.0" + api "com.fasterxml.jackson.core:jackson-annotations:2.16.1" + api "com.fasterxml.jackson.core:jackson-core:2.16.1" + api "com.fasterxml.jackson.core:jackson-databind:2.16.1" + api "org.bouncycastle:bcprov-jdk18on:1.77" + api "org.apache.commons:commons-compress:1.26.0" api "org.xerial.snappy:snappy-java:1.1.10.5" - compileOnly "com.github.spotbugs:spotbugs-annotations:4.8.0" + compileOnly "com.github.spotbugs:spotbugs-annotations:4.8.3" testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0" testImplementation "junit:junit:4.13.2" @@ -242,7 +242,7 @@ project(':adminapi') { dependencies { api project(':api') - api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.3" + api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1" testImplementation project(':api') } @@ -346,7 +346,7 @@ project(':adminapi') { project(':examples') { dependencies { - compileOnly "me.tongfei:progressbar:0.9.5" + compileOnly "me.tongfei:progressbar:0.10.0" compileOnly project(':api') } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa..7f93135c4 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 744c64d12..a80b22ce5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d6..1aa94a426 100755 --- a/gradlew +++ b/gradlew @@ -83,10 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,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. @@ -144,7 +145,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 @@ -152,7 +153,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 @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# 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. + +# 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, 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" \