Update Java version check in installMavenCentOS.sh

Java version strings are of the form XX.YY.ZZ
For Java 8 and earlier, XX was always 1 and YY was major version number.
For Java 9 and later, XX is the major version number

OpenDaylight versions that supported Java 8 are now all EOL
and there is no more reason to check YY content.
- update installMavenCentOS.sh to retrieve only the XX parameter
- update shebang to /bin/sh since we are in the area

JIRA: TRNSPRTPCE-700
Change-Id: Id0cff27763d48be773286f1c1a8312bb50e52523
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

diff --git a/tests/installMavenCentOS.sh b/tests/installMavenCentOS.sh
index 35f20f84131a33fe591adcf5b1143fe6640a2bc1..a6887e7e95acdf06420138d5a115bb9606708846 100755 (executable)
--- a/tests/installMavenCentOS.sh
+++ b/tests/installMavenCentOS.sh
@@ -1,17 +1,17 @@
-#!/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
+if [ "$JAVA_VER" -ge 17 -a "$JAVAC_VER" -ge 17 ];then
         echo "ok, java is 17 or newer"
 else
     #java installation for CentOS (releng OS image target)