Fixed: Replace Bintray by a new place to upload the Gradle Wrapper

(OFBIZ-12192)

Changes script to use the proper Gradle wrapper version. Changes the
download url from Bintray to Gradle GitHub repository and removes the
backup link. Adjusts the sha checksums accordingly.

The Gradle download link pulls a gradle-wrapper.properties file which
references services.gradle.org/distributions/gradle-6.5-bin.zip instead
of a 6.5.1 distribution. This was left this way for consistency.
This commit is contained in:
Michael Brohl
2021-03-13 16:02:42 +01:00
parent e0e1df5eac
commit e08bfa17cb
2 changed files with 6 additions and 10 deletions
+5 -9
View File
@@ -22,13 +22,12 @@ GRADLE_OFBIZ_PATH="$OFBIZ_HOME/gradle"
GRADLE_WRAPPER_OFBIZ_PATH="$GRADLE_OFBIZ_PATH/wrapper"
# version and uri to download the wrapper
RELEASE="5.0.0"
GRADLE_WRAPPER_URI="https://dl.bintray.com/apacheofbiz/GradleWrapper/v$RELEASE/"
GRADLE_WRAPPER_URI_BACKUP="https://github.com/gradle/gradle/raw/v$RELEASE/gradle/wrapper/"
RELEASE="6.5.1"
GRADLE_WRAPPER_URI="https://github.com/gradle/gradle/raw/v$RELEASE/gradle/wrapper/"
# checksum to verify the downloaded file
SHASUM_GRADLE_WRAPPER_FILES="1d23286bcb9e7d3debff18c1b892b9dbb9a4ec6c gradle/wrapper/gradle-wrapper.jar
f9c2ad227ef1fe774cb0e141abfc431b05fc9fd4 gradle/wrapper/gradle-wrapper.properties
SHASUM_GRADLE_WRAPPER_FILES="33b0acb4572934fc1dd7d5880c65036724974e06 gradle/wrapper/gradle-wrapper.jar
b76cfc82d574180f435b4bd9d4b0f29a3c32294b gradle/wrapper/gradle-wrapper.properties
67bc176bca816684cf5218570a931f57d5f2b423 gradlew"
GRADLE_WRAPPER_JAR="gradle-wrapper.jar"
@@ -55,12 +54,9 @@ downloadFile() {
return 1
}
# Download the file from the main URI; if the download fails then use the backup URI
# Download the file from the main URI
resolveFile() {
downloadFile $1 $GRADLE_WRAPPER_URI;
if [ $? -eq 1 ]; then
downloadFile $1 $GRADLE_WRAPPER_URI_BACKUP;
fi
}
echo " === Prepare operation ===";
+1 -1
View File
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists