Skip to content

Commit f4c7ac9

Browse files
authored
Update Gradle to 8.4 (#10138)
Signed-off-by: Andriy Redko <[email protected]>
1 parent 4fee40d commit f4c7ac9

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

buildSrc/src/main/java/org/opensearch/gradle/internal/InternalBwcGitPlugin.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public InternalBwcGitPlugin(ProviderFactory providerFactory, ExecOperations exec
7676
public void apply(Project project) {
7777
this.project = project;
7878
this.gitExtension = project.getExtensions().create("bwcGitConfig", BwcGitExtension.class);
79-
Provider<String> remote = providerFactory.systemProperty("bwc.remote").forUseAtConfigurationTime().orElse("opensearch-project");
79+
Provider<String> remote = providerFactory.systemProperty("bwc.remote").orElse("opensearch-project");
8080

8181
TaskContainer tasks = project.getTasks();
8282
TaskProvider<LoggedExec> createCloneTaskProvider = tasks.register("createClone", LoggedExec.class, createClone -> {
@@ -105,15 +105,13 @@ public void apply(Project project) {
105105
String remoteRepo = remote.get();
106106
// for testing only we can override the base remote url
107107
String remoteRepoUrl = providerFactory.systemProperty("testRemoteRepo")
108-
.forUseAtConfigurationTime()
109108
.getOrElse("https://github.com/" + remoteRepo + "/OpenSearch.git");
110109
addRemote.setCommandLine(asList("git", "remote", "add", remoteRepo, remoteRepoUrl));
111110
});
112111

113112
TaskProvider<LoggedExec> fetchLatestTaskProvider = tasks.register("fetchLatest", LoggedExec.class, fetchLatest -> {
114113
Provider<Object> gitFetchLatest = project.getProviders()
115114
.systemProperty("tests.bwc.git_fetch_latest")
116-
.forUseAtConfigurationTime()
117115
.orElse("true")
118116
.map(fetchProp -> {
119117
if ("true".equals(fetchProp)) {

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
distributionBase=GRADLE_USER_HOME
1313
distributionPath=wrapper/dists
14-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
14+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
1515
zipStoreBase=GRADLE_USER_HOME
1616
zipStorePath=wrapper/dists
17-
distributionSha256Sum=bb09982fdf52718e4c7b25023d10df6d35a5fff969860bdf5a5bd27a3ab27a9e
17+
distributionSha256Sum=f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419

gradlew

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145145
case $MAX_FD in #(
146146
max*)
147147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
149149
MAX_FD=$( ulimit -H -n ) ||
150150
warn "Could not query maximum file descriptor limit"
151151
esac
152152
case $MAX_FD in #(
153153
'' | soft) :;; #(
154154
*)
155155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
157157
ulimit -n "$MAX_FD" ||
158158
warn "Could not set maximum file descriptor limit to $MAX_FD"
159159
esac
@@ -202,11 +202,11 @@ fi
202202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204204

205-
# Collect all arguments for the java command;
206-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207-
# shell script including quotes and variable substitutions, so put them in
208-
# double quotes to make sure that they get re-expanded; and
209-
# * 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.
210210

211211
set -- \
212212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)