From 6b708fc3c960440ecbf7243b780ae162fd2b7816 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 14 May 2025 11:31:24 -0700 Subject: [PATCH] Update Gradle wrapper to 8.14 (#126519) (#128067) * Fix PatternSetFactory incompatibility * Update ospackage plugin * Remove ambigious method definitions * Cleanup verification metadata * Some cleanup on unused methods and attributes (cherry picked from commit a2e580fb60dead8d48af8c376a54406c7b13dec0) # Conflicts: # build-tools-internal/src/main/resources/minimumGradleVersion --- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../internal/test/rest/CopyRestApiTask.java | 7 +++---- .../internal/test/rest/CopyRestTestsTask.java | 15 +++++++-------- .../compat/RestCompatTestTransformTask.java | 16 +++++++--------- .../src/main/resources/minimumGradleVersion | 2 +- ...emPropertyCommandLineArgumentProvider.java | 5 ----- gradle/build.versions.toml | 2 +- gradle/verification-metadata.xml | 6 +++--- gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 4 ++-- gradlew.bat | 4 ++-- modules/reindex/build.gradle | 10 +++++----- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 14 files changed, 37 insertions(+), 46 deletions(-) diff --git a/build-tools-internal/gradle/wrapper/gradle-wrapper.properties b/build-tools-internal/gradle/wrapper/gradle-wrapper.properties index 2a6e21b2ba89..f373f37ad829 100644 --- a/build-tools-internal/gradle/wrapper/gradle-wrapper.properties +++ b/build-tools-internal/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestApiTask.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestApiTask.java index 1617f317d52c..aa932a717858 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestApiTask.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestApiTask.java @@ -25,8 +25,7 @@ import org.gradle.api.tasks.OutputDirectory; import org.gradle.api.tasks.SkipWhenEmpty; import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.util.PatternFilterable; -import org.gradle.api.tasks.util.PatternSet; -import org.gradle.internal.Factory; +import org.gradle.api.tasks.util.internal.PatternSetFactory; import java.io.File; import java.io.IOException; @@ -65,14 +64,14 @@ public class CopyRestApiTask extends DefaultTask { @Inject public CopyRestApiTask( ProjectLayout projectLayout, - Factory patternSetFactory, + PatternSetFactory patternSetFactory, FileSystemOperations fileSystemOperations, ObjectFactory objectFactory ) { this.include = objectFactory.listProperty(String.class); this.outputResourceDir = objectFactory.directoryProperty(); this.additionalYamlTestsDir = objectFactory.directoryProperty(); - this.patternSet = patternSetFactory.create(); + this.patternSet = patternSetFactory.createPatternSet(); this.projectLayout = projectLayout; this.fileSystemOperations = fileSystemOperations; } diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestTestsTask.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestTestsTask.java index 6890cfb65295..d6e888e33a3d 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestTestsTask.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestTestsTask.java @@ -29,8 +29,7 @@ import org.gradle.api.tasks.PathSensitivity; import org.gradle.api.tasks.SkipWhenEmpty; import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.util.PatternFilterable; -import org.gradle.api.tasks.util.PatternSet; -import org.gradle.internal.Factory; +import org.gradle.api.tasks.util.internal.PatternSetFactory; import java.io.File; import java.util.Map; @@ -66,25 +65,25 @@ public abstract class CopyRestTestsTask extends DefaultTask { private final ProjectLayout projectLayout; private final FileSystemOperations fileSystemOperations; - @Inject - public abstract FileOperations getFileOperations(); - @Inject public CopyRestTestsTask( ProjectLayout projectLayout, - Factory patternSetFactory, + PatternSetFactory patternSetFactory, FileSystemOperations fileSystemOperations, ObjectFactory objectFactory ) { this.includeCore = objectFactory.listProperty(String.class); this.includeXpack = objectFactory.listProperty(String.class); this.outputResourceDir = objectFactory.directoryProperty(); - this.corePatternSet = patternSetFactory.create(); - this.xpackPatternSet = patternSetFactory.create(); + this.corePatternSet = patternSetFactory.createPatternSet(); + this.xpackPatternSet = patternSetFactory.createPatternSet(); this.projectLayout = projectLayout; this.fileSystemOperations = fileSystemOperations; } + @Inject + public abstract FileOperations getFileOperations(); + @Input public ListProperty getIncludeCore() { return includeCore; diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java index ba242a8e2386..6d6590429feb 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java @@ -58,7 +58,7 @@ import org.gradle.api.tasks.SkipWhenEmpty; import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.util.PatternFilterable; import org.gradle.api.tasks.util.PatternSet; -import org.gradle.internal.Factory; +import org.gradle.api.tasks.util.internal.PatternSetFactory; import java.io.File; import java.io.IOException; @@ -98,18 +98,13 @@ public abstract class RestCompatTestTransformTask extends DefaultTask { // PatternFilterable -> list of full test names and reasons. Needed for 1 pattern may include many tests and reasons private final Map>> skippedTestByTestNameTransformations = new HashMap<>(); - @Inject - protected Factory getPatternSetFactory() { - throw new UnsupportedOperationException(); - } - @Inject public RestCompatTestTransformTask(FileSystemOperations fileSystemOperations, ObjectFactory objectFactory) { this.fileSystemOperations = fileSystemOperations; this.compatibleVersion = Version.fromString(VersionProperties.getVersions().get("elasticsearch")).getMajor() - 1; this.sourceDirectory = objectFactory.directoryProperty(); this.outputDirectory = objectFactory.directoryProperty(); - this.testPatternSet = getPatternSetFactory().create(); + this.testPatternSet = getPatternSetFactory().createPatternSet(); this.testPatternSet.include("/*" + "*/*.yml"); // concat these strings to keep build from thinking this is invalid javadoc // always inject compat headers headers.put("Content-Type", "application/vnd.elasticsearch+json;compatible-with=" + compatibleVersion); @@ -117,6 +112,9 @@ public abstract class RestCompatTestTransformTask extends DefaultTask { getTransformations().add(new InjectHeaders(headers, Sets.newHashSet(RestCompatTestTransformTask::doesNotHaveCatOperation))); } + @Inject + protected abstract PatternSetFactory getPatternSetFactory(); + private static boolean doesNotHaveCatOperation(ObjectNode doNodeValue) { final Iterator fieldNamesIterator = doNodeValue.fieldNames(); while (fieldNamesIterator.hasNext()) { @@ -144,7 +142,7 @@ public abstract class RestCompatTestTransformTask extends DefaultTask { ); } - PatternSet skippedPatternSet = getPatternSetFactory().create(); + PatternSet skippedPatternSet = getPatternSetFactory().createPatternSet(); // create file patterns for all a1/a2/a3/b.yml possibilities. for (int i = testParts.length - 1; i > 1; i--) { final String lastPart = testParts[i]; @@ -158,7 +156,7 @@ public abstract class RestCompatTestTransformTask extends DefaultTask { } public void skipTestsByFilePattern(String filePattern, String reason) { - PatternSet skippedPatternSet = getPatternSetFactory().create(); + PatternSet skippedPatternSet = getPatternSetFactory().createPatternSet(); skippedPatternSet.include(filePattern); skippedTestByFilePatternTransformations.put(skippedPatternSet, reason); } diff --git a/build-tools-internal/src/main/resources/minimumGradleVersion b/build-tools-internal/src/main/resources/minimumGradleVersion index 90c5b336175a..4ca6ef2e817d 100644 --- a/build-tools-internal/src/main/resources/minimumGradleVersion +++ b/build-tools-internal/src/main/resources/minimumGradleVersion @@ -1 +1 @@ -8.13 \ No newline at end of file +8.13 diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/test/SystemPropertyCommandLineArgumentProvider.java b/build-tools/src/main/java/org/elasticsearch/gradle/test/SystemPropertyCommandLineArgumentProvider.java index 70be689ca637..02146ee454d3 100644 --- a/build-tools/src/main/java/org/elasticsearch/gradle/test/SystemPropertyCommandLineArgumentProvider.java +++ b/build-tools/src/main/java/org/elasticsearch/gradle/test/SystemPropertyCommandLineArgumentProvider.java @@ -8,7 +8,6 @@ */ package org.elasticsearch.gradle.test; -import org.gradle.api.provider.Provider; import org.gradle.api.tasks.Input; import org.gradle.process.CommandLineArgumentProvider; @@ -20,10 +19,6 @@ import java.util.stream.Collectors; public class SystemPropertyCommandLineArgumentProvider implements CommandLineArgumentProvider { private final Map systemProperties = new LinkedHashMap<>(); - public void systemProperty(String key, Provider value) { - systemProperties.put(key, (Supplier) () -> String.valueOf(value.get())); - } - public void systemProperty(String key, Supplier value) { systemProperties.put(key, value); } diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 5cd740a7e294..08f7d1a7c7ab 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -48,4 +48,4 @@ wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2" xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2" [plugins] -ospackage = { id = "com.netflix.nebula.ospackage-base", version = "11.11.1" } +ospackage = { id = "com.netflix.nebula.ospackage-base", version = "11.11.2" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index d1d05073e04c..64284da165ed 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -946,9 +946,9 @@ - - - + + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644 GIT binary patch delta 642 zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|** z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$ z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O% zFic^X{7^$?^Ho04eona9n#mGMxKhA=~8B%JN`M zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n zVkxF2rjrjWR+_xr6e6@_u@s~2uv{9vi*1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^ z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK I1x7am0No)LiU0rr delta 584 zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe z+ES)HSrVnWLtJ&)lO%hRkV9zl5qqWRt0e;bb zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts AA^-pY diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a6e21b2ba89..f373f37ad829 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf93008b77e..23d15a936707 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019c7915..5eed7ee84528 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle index 42e1822c2014..f0c6e5394355 100644 --- a/modules/reindex/build.gradle +++ b/modules/reindex/build.gradle @@ -156,11 +156,11 @@ if (OS.current() == OS.WINDOWS) { tasks.named("javaRestTest").configure { dependsOn fixture - systemProperty "tests.fromOld", "true" - /* Use a closure on the string to delay evaluation until right before we - * run the integration tests so that we can be sure that the file is - * ready. */ - nonInputProperties.systemProperty "es${version}.port", fixture.map(f->f.addressAndPort) + systemProperty "tests.fromOld", "true" + /* Use a closure on the string to delay evaluation until right before we + * run the integration tests so that we can be sure that the file is + * ready. */ + nonInputProperties.systemProperty "es${version}.port", fixture.map(f->f.addressAndPort) } } } diff --git a/plugins/examples/gradle/wrapper/gradle-wrapper.properties b/plugins/examples/gradle/wrapper/gradle-wrapper.properties index 2a6e21b2ba89..f373f37ad829 100644 --- a/plugins/examples/gradle/wrapper/gradle-wrapper.properties +++ b/plugins/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME