Merge "Add functional tests for regenerator type"

[transportpce.git] / tests / installMavenCentOS.sh

diff --git a/tests/installMavenCentOS.sh b/tests/installMavenCentOS.sh
index 4a78f47a4248633f149ac9b3a928c569ef36051f..243524b3975a12facbacd0ecfdf175298ee7ff2c 100755 (executable)
--- a/tests/installMavenCentOS.sh
+++ b/tests/installMavenCentOS.sh
@@ -1,35 +1,35 @@
-#!/bin/bash
+#!/bin/sh
 
 set -x
 
 #check Java version install if any
 JAVA_CMD="java"
 [ -n "$JAVA_HOME" ] && JAVA_CMD="$JAVA_HOME/bin/java"
-JAVA_VER=$("$JAVA_CMD" -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*".*$/\1\2/p;')
+JAVA_VER=$("$JAVA_CMD" -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*".*$/\1/p;')
 echo $JAVA_VER
 JAVAC_CMD="javac"
 [ -n "$JAVA_HOME" ] && JAVAC_CMD="$JAVA_HOME/bin/javac"
-JAVAC_VER=$("$JAVAC_CMD" -version 2>&1 |  sed -n ';s/javac \(.*\)\.\(.*\)\..*.*$/\1\2/p;')
+JAVAC_VER=$("$JAVAC_CMD" -version 2>&1 |  sed -n ';s/javac \(.*\)\.\(.*\)\..*.*$/\1/p;')
 echo $JAVAC_VER
-if [ "$JAVA_VER" -ge 110 -a "$JAVAC_VER" -ge 110 ];then
-        echo "ok, java is 11 or newer"
+if [ "$JAVA_VER" -ge 17 -a "$JAVAC_VER" -ge 17 ];then
+        echo "ok, java is 17 or newer"
 else
-    #java 11 installation for CentOS (releng OS image target)
-        echo "install java 11"
-        sudo yum install -y java-11-openjdk java-11-openjdk-devel
-        last_installed_jdk11=$(ls -tr1 /usr/lib/jvm/ | grep java-11-openjdk-11 | tail -1)
-        if [ -n "$last_installed_jdk11" ];then
-            sudo alternatives --set java /usr/lib/jvm/$last_installed_jdk11/bin/java
-            sudo alternatives --set javac /usr/lib/jvm/$last_installed_jdk11/bin/javac
+    #java installation for CentOS (releng OS image target)
+        echo "install java 17"
+        sudo yum install -y java-17-openjdk java-17-openjdk-devel
+        last_installed_jdk17=$(ls -tr1 /usr/lib/jvm/ | grep java-17-openjdk-17 | tail -1)
+        if [ -n "$last_installed_jdk17" ];then
+            sudo alternatives --set java /usr/lib/jvm/$last_installed_jdk17/bin/java
+            sudo alternatives --set javac /usr/lib/jvm/$last_installed_jdk17/bin/javac
         else
-           echo "No java11 available"
+           echo "No java17 available"
            exit 1
         fi
 fi
 
-#download maven image 3.8.6 and install it
-wget -nv https://dlcdn.apache.org/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.tar.gz -P /tmp
+#download maven image 3.8.8 and install it
+wget -nv https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz -P /tmp
 sudo mkdir -p /opt
-sudo tar xf /tmp/apache-maven-3.8.6-bin.tar.gz -C /opt
-sudo ln -s /opt/apache-maven-3.8.6 /opt/maven
+sudo tar xf /tmp/apache-maven-3.8.8-bin.tar.gz -C /opt
+sudo ln -s /opt/apache-maven-3.8.8 /opt/maven
 sudo ln -s /opt/maven/bin/mvn /usr/bin/mvn