From 72f22575873914649fe46874acc9c370835073da Mon Sep 17 00:00:00 2001 From: Andrew Ross Date: Tue, 7 Oct 2025 15:32:26 -0700 Subject: [PATCH] Update to Gradle 9.1 Signed-off-by: Andrew Ross --- CHANGELOG.md | 1 + buildSrc/build.gradle | 2 +- .../internal/InternalDistributionArchiveSetupPlugin.java | 3 ++- gradle.properties | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80e76df2ecef3..82e9c29af8999 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Fix flaky test FieldDataLoadingIT.testIndicesFieldDataCacheSizeSetting ([#19571](https://github.com/opensearch-project/OpenSearch/pull/19571)) ### Dependencies +- Update to Gradle 9.1 ([#19575](https://github.com/opensearch-project/OpenSearch/pull/19575)) - Bump `peter-evans/create-or-update-comment` from 4 to 5 ([#19536](https://github.com/opensearch-project/OpenSearch/pull/19536)) - Bump `com.azure:azure-core-http-netty` from 1.15.12 to 1.16.1 ([#19533](https://github.com/opensearch-project/OpenSearch/pull/19533)) - Bump `org.apache.zookeeper:zookeeper` from 3.9.3 to 3.9.4 ([#19535](https://github.com/opensearch-project/OpenSearch/pull/19535)) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 23f8b0dd261f9..f9d6fd72c2227 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -130,7 +130,7 @@ dependencies { testFixturesApi gradleTestKit() testImplementation 'org.wiremock:wiremock-standalone:3.6.0' testImplementation "org.mockito:mockito-core:${props.getProperty('mockito')}" - integTestImplementation('org.spockframework:spock-core:2.3-groovy-3.0') { + integTestImplementation('org.spockframework:spock-core:2.4-M6-groovy-4.0') { exclude module: "groovy" } } diff --git a/buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java index a7f720855951a..0837169e347df 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java @@ -137,7 +137,8 @@ private void registerAndConfigureDistributionArchivesExtension(Project project) extractedConfiguration.setCanBeResolved(false); extractedConfiguration.getAttributes().attribute(ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE); sub.getArtifacts().add(EXTRACTED_CONFIGURATION_NAME, distributionArchive.getExpandedDistTask()); - + // Add the archive task as a dependency of assemble. This was not required before Gradle 9. + sub.getTasks().named("assemble").configure(t -> t.dependsOn(distributionArchive.getArchiveTask())); }); }); project.getExtensions().add("distribution_archives", container); diff --git a/gradle.properties b/gradle.properties index 47c3efdfbd2a0..1edc358f59e1f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,10 @@ options.forkOptions.memoryMaximumSize=3g systemProp.org.gradle.dependency.duplicate.project.detection=false # Enforce the build to fail on deprecated gradle api usage -systemProp.org.gradle.warning.mode=fail +# TODO: Waiting for https://github.com/google/protobuf-gradle-plugin/commit/894f2d25e2b511bc11661f4d23e47ee0671e82ad +# to be released in the Protobuf gradle plugin, at which this point can be changed +# back to `fail` +systemProp.org.gradle.warning.mode=all systemProp.jdk.tls.client.protocols=TLSv1.2,TLSv1.3 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2757f36aeea64..58751c425af0c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,8 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c +distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85