Skip to content

Commit 7abef8c

Browse files
andrrossjainankitk
andauthored
Revert back to Gradle 8.14.3 (opensearch-project#19405)
Something in Gradle 9 broke the assemble workflow such that the tarballs are not being generated. This is a minimal revert of opensearch-project#19329 to go back to using Gradle 8.14.3 which fixes the assemble workflow. Signed-off-by: Andrew Ross <[email protected]> Signed-off-by: Ankit Jain <[email protected]> Co-authored-by: Ankit Jain <[email protected]>
1 parent e0ee3b4 commit 7abef8c

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
7070
- Fix ingestion state xcontent serialization in IndexMetadata and fail fast on mapping errors([#19320](https://github.com/opensearch-project/OpenSearch/pull/19320))
7171

7272
### Dependencies
73-
- Update to Gradle 9.1.0 ([#19329](https://github.com/opensearch-project/OpenSearch/pull/19329))
7473
- Bump `com.gradleup.shadow:shadow-gradle-plugin` from 8.3.5 to 8.3.9 ([#19400](https://github.com/opensearch-project/OpenSearch/pull/19400))
7574
- Bump `com.netflix.nebula.ospackage-base` from 12.0.0 to 12.1.0 ([#19019](https://github.com/opensearch-project/OpenSearch/pull/19019))
7675
- Bump `actions/checkout` from 4 to 5 ([#19023](https://github.com/opensearch-project/OpenSearch/pull/19023))

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.4-M6-groovy-4.0') {
133+
integTestImplementation('org.spockframework:spock-core:2.3-groovy-3.0') {
134134
exclude module: "groovy"
135135
}
136136
}

gradle.properties

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ 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-
# 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
29+
systemProp.org.gradle.warning.mode=fail
3330

3431
systemProp.jdk.tls.client.protocols=TLSv1.2,TLSv1.3
3532

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-9.1.0-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists
8-
distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85
8+
distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c

0 commit comments

Comments
 (0)