github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 23:27:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

[7.17] Update gradle wrapper to 8.4 (#99856) (#100926)

Browse source 
* Remove deprecated forConfigurationTime usage
This commit is contained in:
Rene Groeschke 2023-10-17 13:44:48 +02:00 • committed by GitHub
parent 56f8e477a7
commit 468bef1b9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build-tools-internal/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=bb09982fdf52718e4c7b25023d10df6d35a5fff969860bdf5a5bd27a3ab27a9e distributionSha256Sum=f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalBwcGitPlugin.java
View file

@ -53,7 +53,7 @@ public class InternalBwcGitPlugin implements Plugin<Project> {
public void apply(Project project) { public void apply(Project project) {
this.project = project; this.project = project;
this.gitExtension = project.getExtensions().create("bwcGitConfig", BwcGitExtension.class); this.gitExtension = project.getExtensions().create("bwcGitConfig", BwcGitExtension.class);
Provider<String> remote = providerFactory.systemProperty("bwc.remote").forUseAtConfigurationTime().orElse("elastic"); Provider<String> remote = providerFactory.systemProperty("bwc.remote").orElse("elastic");
TaskContainer tasks = project.getTasks(); TaskContainer tasks = project.getTasks();
TaskProvider<LoggedExec> createCloneTaskProvider = tasks.register("createClone", LoggedExec.class, createClone -> { TaskProvider<LoggedExec> createCloneTaskProvider = tasks.register("createClone", LoggedExec.class, createClone -> {

2
build-tools-internal/src/main/resources/minimumGradleVersion
View file

@ -1 +1 @@
8.3 8.4

2
client/rest-high-level/build.gradle
View file

@ -135,7 +135,7 @@ testClusters.configureEach {
extraConfigFile 'roles.yml', file('roles.yml') extraConfigFile 'roles.yml', file('roles.yml')
user username: clusterUserNameProvider.get(), user username: clusterUserNameProvider.get(),
password: clusterPasswordProvider.get(), password: clusterPasswordProvider.get(),
role: providers.systemProperty('tests.rest.cluster.role').orElse('admin').forUseAtConfigurationTime().get() role: providers.systemProperty('tests.rest.cluster.role').orElse('admin').get()
user username: 'admin_user', password: 'admin-password' user username: 'admin_user', password: 'admin-password'
extraConfigFile nodeCert.name, nodeCert extraConfigFile nodeCert.name, nodeCert

2
client/rest-high-level/qa/ssl-enabled/build.gradle
View file

@ -18,11 +18,9 @@ tasks.matching{ it.name == "javaRestTest" }.configureEach {
onlyIf { BuildParams.inFipsJvm == false} onlyIf { BuildParams.inFipsJvm == false}
systemProperty 'tests.rest.cluster.username', providers.systemProperty('tests.rest.cluster.username') systemProperty 'tests.rest.cluster.username', providers.systemProperty('tests.rest.cluster.username')
.orElse('test_user') .orElse('test_user')
.forUseAtConfigurationTime()
.get() .get()
systemProperty 'tests.rest.cluster.password', providers.systemProperty('tests.rest.cluster.password') systemProperty 'tests.rest.cluster.password', providers.systemProperty('tests.rest.cluster.password')
.orElse('test-user-password') .orElse('test-user-password')
.forUseAtConfigurationTime()
.get() .get()
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=bb09982fdf52718e4c7b25023d10df6d35a5fff969860bdf5a5bd27a3ab27a9e distributionSha256Sum=f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

14
gradlew vendored
View file

@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #( case $MAX_FD in #(
max*) max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. # 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 ) || MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit" warn "Could not query maximum file descriptor limit"
esac esac
@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #( '' | soft) :;; #(
*) *)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. # 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" || ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD" warn "Could not set maximum file descriptor limit to $MAX_FD"
esac esac
@ -202,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # 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"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command; # Collect all arguments for the java command:
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# shell script including quotes and variable substitutions, so put them in # and any embedded shellness will be escaped.
# double quotes to make sure that they get re-expanded; and # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# * put everything else in single quotes, so that it's not re-expanded. # treated as '${Hostname}' itself on the command line.
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \

4
plugins/examples/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=bb09982fdf52718e4c7b25023d10df6d35a5fff969860bdf5a5bd27a3ab27a9e distributionSha256Sum=f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
plugins/repository-azure/build.gradle
View file

@ -413,7 +413,7 @@ testClusters.matching { it.name == "yamlRestTest" }.configureEach {
setting 'azure.client.integration_test.endpoint_suffix', azureAddress setting 'azure.client.integration_test.endpoint_suffix', azureAddress
String firstPartOfSeed = BuildParams.testSeed.tokenize(':').get(0) String firstPartOfSeed = BuildParams.testSeed.tokenize(':').get(0)
def ignoreTestSeed = providers.systemProperty('ignore.tests.seed').forUseAtConfigurationTime().isPresent() ? PropertyNormalization.IGNORE_VALUE : PropertyNormalization.DEFAULT def ignoreTestSeed = providers.systemProperty('ignore.tests.seed').isPresent() ? PropertyNormalization.IGNORE_VALUE : PropertyNormalization.DEFAULT
setting 'thread_pool.repository_azure.max', (Math.abs(Long.parseUnsignedLong(firstPartOfSeed, 16) % 10) + 1).toString(), ignoreTestSeed setting 'thread_pool.repository_azure.max', (Math.abs(Long.parseUnsignedLong(firstPartOfSeed, 16) % 10) + 1).toString(), ignoreTestSeed
} }
} }

2
x-pack/plugin/eql/qa/correctness/build.gradle
View file

@ -14,7 +14,7 @@ dependencies {
} }
File serviceAccountFile = providers.environmentVariable('eql_test_credentials_file') File serviceAccountFile = providers.environmentVariable('eql_test_credentials_file')
.orElse(providers.systemProperty('eql.test.credentials.file').forUseAtConfigurationTime()) .orElse(providers.systemProperty('eql.test.credentials.file'))
.map { s -> new File(s)} .map { s -> new File(s)}
.getOrNull() .getOrNull()