(impala) branch master updated: IMPALA-13014: Upgrade Maven to 3.9.6

[laszlog]

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

laszlog 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 d83b48cf7 IMPALA-13014: Upgrade Maven to 3.9.6
d83b48cf7 is described below

commit d83b48cf72fa94ec7f6e55da409b4dff3350543b
Author: Laszlo Gaal <laszlo.g...@cloudera.com>
AuthorDate: Thu Apr 18 19:22:57 2024 +0200

    IMPALA-13014: Upgrade Maven to 3.9.6
    
    IMPALA-12212 upgraded Maven to 3.9.2 to gain access to the parallel
    dependency resolver in the 3.9.x line. The Maven project has published
    several new releases since 3.9.2, fixing various issues with the new
    resolver, and also fixing problems with concurrent access to the
    local Maven cache.
    
    Pick up the latest version to gain access to these new fixes.
    
    Change-Id: I726618d084f4f0737f5b876879a90c17b0c3777c
    Reviewed-on: http://gerrit.cloudera.org:8080/21332
    Reviewed-by: Impala Public Jenkins <impala-public-jenk...@cloudera.com>
    Tested-by: Impala Public Jenkins <impala-public-jenk...@cloudera.com>
---
 bin/bootstrap_build.sh  | 10 +++++-----
 bin/bootstrap_system.sh | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bin/bootstrap_build.sh b/bin/bootstrap_build.sh
index 3e9f56a1f..d5113ae4f 100755
--- a/bin/bootstrap_build.sh
+++ b/bin/bootstrap_build.sh
@@ -48,12 +48,12 @@ 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.2 ]; then
+if [ ! -d /usr/local/apache-maven-3.9.6 ]; then
   sudo wget -nv \
-    
https://archive.apache.org/dist/maven/maven-3/3.9.2/binaries/apache-maven-3.9.2-bin.tar.gz
-  sha512sum -c - <<< 
'900bdeeeae550d2d2b3920fe0e00e41b0069f32c019d566465015bdd1b3866395cbe016e22d95d25d51d3a5e614af2c83ec9b282d73309f644859bbad08b63db
  apache-maven-3.9.2-bin.tar.gz'
-  sudo tar -C /usr/local -xzf apache-maven-3.9.2-bin.tar.gz
-  sudo ln -s /usr/local/apache-maven-3.9.2/bin/mvn /usr/local/bin
+    
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
 fi
 
 # Try to prepopulate the m2 directory to save time
diff --git a/bin/bootstrap_system.sh b/bin/bootstrap_system.sh
index 173a18dbf..40274a073 100755
--- a/bin/bootstrap_system.sh
+++ b/bin/bootstrap_system.sh
@@ -341,18 +341,18 @@ 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.2 ]; then
+if [ ! -d /usr/local/apache-maven-3.9.6 ]; then
   sudo wget -nv \
-    
https://archive.apache.org/dist/maven/maven-3/3.9.2/binaries/apache-maven-3.9.2-bin.tar.gz
-  sha512sum -c - <<< 
'900bdeeeae550d2d2b3920fe0e00e41b0069f32c019d566465015bdd1b3866395cbe016e22d95d25d51d3a5e614af2c83ec9b282d73309f644859bbad08b63db
  apache-maven-3.9.2-bin.tar.gz'
-  sudo tar -C /usr/local -xzf apache-maven-3.9.2-bin.tar.gz
+    
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
   # 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.2/bin/mvn /usr/local/bin
+  sudo ln -s -f /usr/local/apache-maven-3.9.6/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.2"
+  MAVEN_DIRECTORY="/usr/local/apache-maven-3.9.6"
   redhat8 indocker sudo chmod 0755 ${MAVEN_DIRECTORY}
   redhat8 indocker sudo chmod 0755 ${MAVEN_DIRECTORY}/{bin,boot}
   redhat9 indocker sudo chmod 0755 ${MAVEN_DIRECTORY}