diff --git a/build/mvn b/build/mvn index fef589fc03476..aa3ba96f13495 100755 --- a/build/mvn +++ b/build/mvn @@ -125,21 +125,22 @@ install_mvn() { fi if [ $(version $MVN_DETECTED_VERSION) -ne $(version $MVN_VERSION) ]; then local MVN_TARBALL="apache-maven-${MVN_VERSION}-bin.tar.gz" - local FILE_PATH="maven/maven-3/${MVN_VERSION}/binaries/${MVN_TARBALL}" - local APACHE_MIRROR=${APACHE_MIRROR:-'https://www.apache.org/dyn/closer.lua'} - local MIRROR_URL_QUERY="?action=download" + local FILE_PATH="org/apache/maven/apache-maven/${MVN_VERSION}/${MVN_TARBALL}" + local MIRROR_BASE=${DEFAULT_ARTIFACT_REPOSITORY:-https://maven-central.storage-download.googleapis.com/maven2/} + local MIRROR_URL_QUERY="" if [ $(command -v curl) ]; then - if ! curl -L --output /dev/null --silent --head --fail "${APACHE_MIRROR}/${FILE_PATH}${MIRROR_URL_QUERY}" ; then + if ! curl -L --output /dev/null --silent --head --fail "${MIRROR_BASE%/}/${FILE_PATH}${MIRROR_URL_QUERY}" ; then # Fall back to archive.apache.org for older Maven echo "Falling back to archive.apache.org to download Maven" - APACHE_MIRROR="https://archive.apache.org/dist" + FILE_PATH="maven/maven-3/${MVN_VERSION}/binaries/${MVN_TARBALL}" + MIRROR_BASE="https://archive.apache.org/dist" MIRROR_URL_QUERY="" fi fi install_app \ - "${APACHE_MIRROR}" \ + "${MIRROR_BASE%/}" \ "${FILE_PATH}" \ "${MIRROR_URL_QUERY}" \ "sha512" \ diff --git a/build/sbt-launch-lib.bash b/build/sbt-launch-lib.bash index 713f88e082990..0f164146d05a4 100755 --- a/build/sbt-launch-lib.bash +++ b/build/sbt-launch-lib.bash @@ -43,7 +43,8 @@ acquire_sbt_jar () { # artifacts from internal repos only. # Ex: # DEFAULT_ARTIFACT_REPOSITORY=https://artifacts.internal.com/libs-release/ - URL1=${DEFAULT_ARTIFACT_REPOSITORY:-https://maven-central.storage-download.googleapis.com/maven2/}org/scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch-${SBT_VERSION}.jar + DEFAULT_ARTIFACT_REPOSITORY=${DEFAULT_ARTIFACT_REPOSITORY:-https://maven-central.storage-download.googleapis.com/maven2/} + URL1=${DEFAULT_ARTIFACT_REPOSITORY%/}/org/scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch-${SBT_VERSION}.jar JAR=build/sbt-launch-${SBT_VERSION}.jar sbt_jar=$JAR diff --git a/dev/check-license b/dev/check-license index 9836d8c464aa1..6b6eb6ba1f08c 100755 --- a/dev/check-license +++ b/dev/check-license @@ -20,7 +20,8 @@ acquire_rat_jar () { - URL="${DEFAULT_ARTIFACT_REPOSITORY:-https://repo1.maven.org/maven2/}org/apache/rat/apache-rat/${RAT_VERSION}/apache-rat-${RAT_VERSION}.jar" + DEFAULT_ARTIFACT_REPOSITORY=${DEFAULT_ARTIFACT_REPOSITORY:-https://maven-central.storage-download.googleapis.com/maven2/} + URL="${DEFAULT_ARTIFACT_REPOSITORY%/}/org/apache/rat/apache-rat/${RAT_VERSION}/apache-rat-${RAT_VERSION}.jar" JAR="$rat_jar"