Skip to content

Commit 089fad3

Browse files
authored
Update to Gradle 9.1 (#19575)
Signed-off-by: Andrew Ross <andrross@amazon.com>
1 parent d3252cd commit 089fad3

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2020
- Avoid primary shard failure caused by merged segment warmer exceptions ([#19436](https://github.com/opensearch-project/OpenSearch/pull/19436))
2121

2222
### Dependencies
23+
- Update to Gradle 9.1 ([#19575](https://github.com/opensearch-project/OpenSearch/pull/19575))
2324
- Bump `peter-evans/create-or-update-comment` from 4 to 5 ([#19536](https://github.com/opensearch-project/OpenSearch/pull/19536))
2425
- Bump `com.azure:azure-core-http-netty` from 1.15.12 to 1.16.1 ([#19533](https://github.com/opensearch-project/OpenSearch/pull/19533))
2526
- Bump `org.apache.zookeeper:zookeeper` from 3.9.3 to 3.9.4 ([#19535](https://github.com/opensearch-project/OpenSearch/pull/19535))

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ dependencies {
130130
testFixturesApi gradleTestKit()
131131
testImplementation 'org.wiremock:wiremock-standalone:3.6.0'
132132
testImplementation "org.mockito:mockito-core:${props.getProperty('mockito')}"
133-
integTestImplementation('org.spockframework:spock-core:2.3-groovy-3.0') {
133+
integTestImplementation('org.spockframework:spock-core:2.4-M6-groovy-4.0') {
134134
exclude module: "groovy"
135135
}
136136
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ private void registerAndConfigureDistributionArchivesExtension(Project project)
137137
extractedConfiguration.setCanBeResolved(false);
138138
extractedConfiguration.getAttributes().attribute(ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
139139
sub.getArtifacts().add(EXTRACTED_CONFIGURATION_NAME, distributionArchive.getExpandedDistTask());
140-
140+
// Add the archive task as a dependency of assemble. This was not required before Gradle 9.
141+
sub.getTasks().named("assemble").configure(t -> t.dependsOn(distributionArchive.getArchiveTask()));
141142
});
142143
});
143144
project.getExtensions().add("distribution_archives", container);

gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ options.forkOptions.memoryMaximumSize=3g
2626
systemProp.org.gradle.dependency.duplicate.project.detection=false
2727

2828
# Enforce the build to fail on deprecated gradle api usage
29-
systemProp.org.gradle.warning.mode=fail
29+
# TODO: Waiting for https://github.com/google/protobuf-gradle-plugin/commit/894f2d25e2b511bc11661f4d23e47ee0671e82ad
30+
# to be released in the Protobuf gradle plugin, at which this point can be changed
31+
# back to `fail`
32+
systemProp.org.gradle.warning.mode=all
3033

3134
systemProp.jdk.tls.client.protocols=TLSv1.2,TLSv1.3
3235

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists
8-
distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
8+
distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85

0 commit comments

Comments
 (0)