honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-08 14:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Gradle wrapper to 6.5 (#57580) (#57653)

Browse Source 
* Update Gradle wrapper to 6.5
* Fix groovy incompatibility issue after gradle update
* Fix Gstring String incompatibility
This commit is contained in:
Rene Groeschke 2020-06-04 14:56:41 +02:00
parent 3bc2601ba3
commit 5226fef321
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/resources/minimumGradleVersion
View File

@ -1 +1 @@
6.4.1 6.5

2
distribution/bwc/build.gradle
View File

@ -107,7 +107,7 @@ BuildParams.bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInf
task checkoutBwcBranch() { task checkoutBwcBranch() {
dependsOn fetchLatest dependsOn fetchLatest
doLast { doLast {
String refspec = System.getProperty("bwc.refspec.${bwcBranch}") ?: System.getProperty("tests.bwc.refspec.${bwcBranch}") ?: "${remote}/${bwcBranch}" def refspec = System.getProperty("bwc.refspec." + bwcBranch) ?: System.getProperty("tests.bwc.refspec." + bwcBranch) ?: "${remote}/${bwcBranch}"
if (System.getProperty("bwc.checkout.align") != null) { if (System.getProperty("bwc.checkout.align") != null) {
/* /*
We use a time based approach to make the bwc versions built deterministic and compatible with the current hash. We use a time based approach to make the bwc versions built deterministic and compatible with the current hash.

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

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionSha256Sum=3fd824892df8ad5847be6e4fb7d3600068437de172939fd657cc280a1a629f63 distributionSha256Sum=c9910513d0eed63cd8f5c7fec4cb4a05731144770104a0871234a4edc3ba3cef