From f29de59cfcfb25c8f6ceaf3280a7f09aaec401b7 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Sun, 5 Mar 2023 16:17:41 +0800 Subject: [PATCH 1/3] ban 3.9.x --- build/mvn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/mvn b/build/mvn index f1283a0fff9bf..dfe131fab8af5 100755 --- a/build/mvn +++ b/build/mvn @@ -119,7 +119,7 @@ install_mvn() { if [ "$MVN_BIN" ]; then local MVN_DETECTED_VERSION="$(mvn --version | head -n1 | awk '{print $3}')" fi - if [ $(version $MVN_DETECTED_VERSION) -lt $(version $MVN_VERSION) ]; then + if [[ $(version "$MVN_DETECTED_VERSION") =~ ^003009 ]] || [ $(version $MVN_DETECTED_VERSION) -lt $(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'} From c8a7bbb3100c733cb94186d021255c82a265f8f4 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Sun, 5 Mar 2023 16:42:03 +0800 Subject: [PATCH 2/3] add comments --- build/mvn | 1 + 1 file changed, 1 insertion(+) diff --git a/build/mvn b/build/mvn index dfe131fab8af5..87fb17eb718a4 100755 --- a/build/mvn +++ b/build/mvn @@ -119,6 +119,7 @@ install_mvn() { if [ "$MVN_BIN" ]; then local MVN_DETECTED_VERSION="$(mvn --version | head -n1 | awk '{print $3}')" fi + # SPARK-42673: Ban Maven 3.9.x for Spark build before finish SPARK-42380 if [[ $(version "$MVN_DETECTED_VERSION") =~ ^003009 ]] || [ $(version $MVN_DETECTED_VERSION) -lt $(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}" From 08005ad33ee3b7ab66ebf786f860e291c824c4ee Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Mon, 6 Mar 2023 13:36:34 +0800 Subject: [PATCH 3/3] -lt -> -ne --- build/mvn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/mvn b/build/mvn index 87fb17eb718a4..aee9358fe44c6 100755 --- a/build/mvn +++ b/build/mvn @@ -119,8 +119,7 @@ install_mvn() { if [ "$MVN_BIN" ]; then local MVN_DETECTED_VERSION="$(mvn --version | head -n1 | awk '{print $3}')" fi - # SPARK-42673: Ban Maven 3.9.x for Spark build before finish SPARK-42380 - if [[ $(version "$MVN_DETECTED_VERSION") =~ ^003009 ]] || [ $(version $MVN_DETECTED_VERSION) -lt $(version $MVN_VERSION) ]; then + 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'}