Skip to content

Commit

Permalink
Upgrade gradle, it's dependencies and project dependencies (#1534)
Browse files Browse the repository at this point in the history
Signed-off-by: Bala.FA <bala@minio.io>
  • Loading branch information
balamurugana committed Mar 2, 2024
1 parent 8c050a0 commit a0dea73
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 22 deletions.
19 changes: 10 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

/*****************************/
/* gradleVersion = '8.4' */
/* gradleVersion = '8.6' */
/*****************************/

plugins {
Expand Down Expand Up @@ -52,15 +52,16 @@ 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 "commons-codec:commons-codec:1.16.1"
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"
Expand Down Expand Up @@ -242,7 +243,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')
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
29 changes: 17 additions & 12 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -133,26 +131,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 @@ -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" \
Expand Down

0 comments on commit a0dea73

Please sign in to comment.