From 158d91be7afcec8bbab177a3dc2ab438e9813925 Mon Sep 17 00:00:00 2001
From: Sean Owen <sean.owen@databricks.com>
Date: Tue, 3 Sep 2019 13:55:35 -0500
Subject: [PATCH 1/2] Fall back to archive.apache.org in build/mvn for older
 releases

---
 build/mvn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/build/mvn b/build/mvn
index 75feb2f718d1..e2fd21573177 100755
--- a/build/mvn
+++ b/build/mvn
@@ -80,6 +80,17 @@ install_mvn() {
   fi
   if [ $(version $MVN_DETECTED_VERSION) -lt $(version $MVN_VERSION) ]; then
     local APACHE_MIRROR=${APACHE_MIRROR:-'https://www.apache.org/dyn/closer.lua?action=download&filename='}
+        
+    if [ $(command -v curl) ]; then
+      local TEST_MIRROR_URL="${APACHE_MIRROR}/maven/maven-3/${MVN_VERSION}/binaries/apache-maven-${MVN_VERSION}-bin.tar.gz"
+      if curl -L --output /dev/null --silent --head --fail "$TEST_MIRROR_URL" ; then
+        echo "Found Maven at $TEST_MIRROR_URL"
+      else
+        # 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"
+      fi
+    fi
 
     install_app \
       "${APACHE_MIRROR}/maven/maven-3/${MVN_VERSION}/binaries" \

From 5304c082da81136cf877f948673fd691f3622bd0 Mon Sep 17 00:00:00 2001
From: Sean Owen <sean.owen@databricks.com>
Date: Tue, 3 Sep 2019 14:22:57 -0500
Subject: [PATCH 2/2] Simplify test

---
 build/mvn | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build/mvn b/build/mvn
index e2fd21573177..f68377b3ddc7 100755
--- a/build/mvn
+++ b/build/mvn
@@ -83,9 +83,7 @@ install_mvn() {
         
     if [ $(command -v curl) ]; then
       local TEST_MIRROR_URL="${APACHE_MIRROR}/maven/maven-3/${MVN_VERSION}/binaries/apache-maven-${MVN_VERSION}-bin.tar.gz"
-      if curl -L --output /dev/null --silent --head --fail "$TEST_MIRROR_URL" ; then
-        echo "Found Maven at $TEST_MIRROR_URL"
-      else
+      if ! curl -L --output /dev/null --silent --head --fail "$TEST_MIRROR_URL" ; 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"