Skip to content

Commit 6181e8e

Browse files
authored
Update Gradle to 8.4 (opensearch-project#1612)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent 2738bad commit 6181e8e

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

.github/workflows/CI-workflow.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
needs: Get-CI-Image-Tag
2424
strategy:
2525
matrix:
26-
java: [11, 17, 20]
26+
java: [11, 17, 21]
2727

2828
name: Build and Test MLCommons Plugin on linux
2929
if: github.repository == 'opensearch-project/ml-commons'
@@ -88,7 +88,7 @@ jobs:
8888
needs: Build-ml-linux
8989
strategy:
9090
matrix:
91-
java: [11, 17, 20]
91+
java: [11, 17, 21]
9292

9393
name: Test MLCommons Plugin on linux docker
9494
if: github.repository == 'opensearch-project/ml-commons'
@@ -173,7 +173,7 @@ jobs:
173173
Build-ml-windows:
174174
strategy:
175175
matrix:
176-
java: [11, 17, 20]
176+
java: [11, 17, 21]
177177
name: Build and Test MLCommons Plugin on Windows
178178
if: github.repository == 'opensearch-project/ml-commons'
179179
environment: ml-commons-cicd-env

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ buildscript {
4040
}
4141

4242
plugins {
43-
id 'com.netflix.nebula.ospackage' version "11.1.0"
43+
id 'com.netflix.nebula.ospackage' version "11.5.0"
4444
id 'java'
4545
id "io.freefair.lombok" version "8.0.1"
4646
id 'jacoco'

gradle/wrapper/gradle-wrapper.jar

1.61 KB
Binary file not shown.
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
55
networkTimeout=10000
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists

gradlew

+13-9
Original file line numberDiff line numberDiff line change
@@ -83,7 +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
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
8788

8889
# Use the maximum available, or set MAX_FD != -1 to use that value.
8990
MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
130131
fi
131132
else
132133
JAVACMD=java
133-
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.
134137
135138
Please set the JAVA_HOME variable in your environment to match the
136139
location of your Java installation."
140+
fi
137141
fi
138142

139143
# Increase the maximum file descriptors if we can.
140144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
141145
case $MAX_FD in #(
142146
max*)
143147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
144-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
145149
MAX_FD=$( ulimit -H -n ) ||
146150
warn "Could not query maximum file descriptor limit"
147151
esac
148152
case $MAX_FD in #(
149153
'' | soft) :;; #(
150154
*)
151155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
152-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
153157
ulimit -n "$MAX_FD" ||
154158
warn "Could not set maximum file descriptor limit to $MAX_FD"
155159
esac
@@ -198,11 +202,11 @@ fi
198202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200204

201-
# Collect all arguments for the java command;
202-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
203-
# shell script including quotes and variable substitutions, so put them in
204-
# double quotes to make sure that they get re-expanded; and
205-
# * put everything else in single quotes, so that it's not re-expanded.
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.
206210

207211
set -- \
208212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)