(impala) branch master updated: IMPALA-13300: Upgrade Maven to 3.9.8

[asherman]

This is an automated email from the ASF dual-hosted git repository.

asherman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git


The following commit(s) were added to refs/heads/master by this push:
     new af5f3acd6 IMPALA-13300: Upgrade Maven to 3.9.8
af5f3acd6 is described below

commit af5f3acd6708df623cd2404b3616fe1985c26aab
Author: jasonmfehr <jf...@cloudera.com>
AuthorDate: Wed Aug 14 09:03:06 2024 -0700

    IMPALA-13300: Upgrade Maven to 3.9.8
    
    Maven version 3.9.7 consumed an upgraded version of the resolver
    plugin that contains a fix around file locking. Issues with locking
    files are seen occasionally on builds.
    
    This patch consumes Maven 3.9.8 since it is the latest version
    available at this time.
    
    Testing was performed by running only the download code in a Redhat 8
    docker container.
    
    Change-Id: I509dd94799b99bf637a583eadc2905bc32a87c87
    Reviewed-on: http://gerrit.cloudera.org:8080/21674
    Reviewed-by: Joe McDonnell <joemcdonn...@cloudera.com>
    Tested-by: Andrew Sherman <asher...@cloudera.com>
---
 bin/bootstrap_build.sh  | 11 ++++++-----
 bin/bootstrap_system.sh | 13 +++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/bin/bootstrap_build.sh b/bin/bootstrap_build.sh
index d5113ae4f..2d96ca989 100755
--- a/bin/bootstrap_build.sh
+++ b/bin/bootstrap_build.sh
@@ -48,12 +48,13 @@ sudo apt-get --yes install openjdk-${JDK_VERSION}-jdk 
openjdk-${JDK_VERSION}-sou
 export JAVA_HOME=/usr/lib/jvm/java-${JDK_VERSION}-openjdk-amd64
 
 # Download Maven since the packaged version is pretty old.
-if [ ! -d /usr/local/apache-maven-3.9.6 ]; then
+MVN_VERSION="3.9.8"
+if [ ! -d "/usr/local/apache-maven-${MVN_VERSION}" ]; then
   sudo wget -nv \
-    
https://archive.apache.org/dist/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz
-  sha512sum -c - <<< 
'706f01b20dec0305a822ab614d51f32b07ee11d0218175e55450242e49d2156386483b506b3a4e8a03ac8611bae96395fd5eec15f50d3013d5deed6d1ee18224
  apache-maven-3.9.6-bin.tar.gz'
-  sudo tar -C /usr/local -xzf apache-maven-3.9.6-bin.tar.gz
-  sudo ln -s /usr/local/apache-maven-3.9.6/bin/mvn /usr/local/bin
+    
"https://archive.apache.org/dist/maven/maven-3/${MVN_VERSION}/binaries/apache-maven-${MVN_VERSION}-bin.tar.gz";
+  sha512sum -c - <<< 
"7d171def9b85846bf757a2cec94b7529371068a0670df14682447224e57983528e97a6d1b850327e4ca02b139abaab7fcb93c4315119e6f0ffb3f0cbc0d0b9a2
 apache-maven-${MVN_VERSION}-bin.tar.gz"
+  sudo tar -C /usr/local -xzf apache-maven-${MVN_VERSION}-bin.tar.gz
+  sudo ln -s /usr/local/apache-maven-${MVN_VERSION}/bin/mvn /usr/local/bin
 fi
 
 # Try to prepopulate the m2 directory to save time
diff --git a/bin/bootstrap_system.sh b/bin/bootstrap_system.sh
index 40274a073..518d728f5 100755
--- a/bin/bootstrap_system.sh
+++ b/bin/bootstrap_system.sh
@@ -341,18 +341,19 @@ redhat sudo yum install -y ccache
 redhat sudo yum clean all
 
 # Download Maven since the packaged version is pretty old.
-if [ ! -d /usr/local/apache-maven-3.9.6 ]; then
+MVN_VERSION="3.9.8"
+if [ ! -d "/usr/local/apache-maven-${MVN_VERSION}" ]; then
   sudo wget -nv \
-    
https://archive.apache.org/dist/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz
-  sha512sum -c - <<< 
'706f01b20dec0305a822ab614d51f32b07ee11d0218175e55450242e49d2156386483b506b3a4e8a03ac8611bae96395fd5eec15f50d3013d5deed6d1ee18224
  apache-maven-3.9.6-bin.tar.gz'
-  sudo tar -C /usr/local -xzf apache-maven-3.9.6-bin.tar.gz
+    
"https://archive.apache.org/dist/maven/maven-3/${MVN_VERSION}/binaries/apache-maven-${MVN_VERSION}-bin.tar.gz";
+  sha512sum -c - <<< 
"7d171def9b85846bf757a2cec94b7529371068a0670df14682447224e57983528e97a6d1b850327e4ca02b139abaab7fcb93c4315119e6f0ffb3f0cbc0d0b9a2
 apache-maven-${MVN_VERSION}-bin.tar.gz"
+  sudo tar -C /usr/local -xzf "apache-maven-${MVN_VERSION}-bin.tar.gz"
   # Ensure that Impala's preferred version is installed locally,
   # even if a previous version exists there.
-  sudo ln -s -f /usr/local/apache-maven-3.9.6/bin/mvn /usr/local/bin
+  sudo ln -s -f "/usr/local/apache-maven-${MVN_VERSION}/bin/mvn" 
"/usr/local/bin"
 
   # reset permissions on redhat8
   # TODO: figure out why this is necessary for redhat8
-  MAVEN_DIRECTORY="/usr/local/apache-maven-3.9.6"
+  MAVEN_DIRECTORY="/usr/local/apache-maven-${MVN_VERSION}"
   redhat8 indocker sudo chmod 0755 ${MAVEN_DIRECTORY}
   redhat8 indocker sudo chmod 0755 ${MAVEN_DIRECTORY}/{bin,boot}
   redhat9 indocker sudo chmod 0755 ${MAVEN_DIRECTORY}