fixed grep for java version if openjdk (#4002)

marinakog · web-flow · commit 60880c8fae65 · 2023-02-24T08:49:49.000-05:00
diff --git a/jenkinsScript.sh b/jenkinsScript.sh
@@ -43,7 +43,7 @@ function checkEnvVars {
 }
 function ver { printf %02d%02d%02d%02d%02d $(echo "$1" | tr '.' ' '); }
 function checkJavaVersion {
-  java_version=`java -version 2>&1 >/dev/null | grep 'java version' | awk '{print $3}'`
+  java_version=`java -version 2>&1 >/dev/null | grep 'version' | awk '{print $3}'`
   echo "Info: java version ${java_version}"
   if [ $(ver $java_version) -lt $(ver "11.0.10") ]; then
     echo "Error: Java version should be 11.0.10 or higher"

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ function checkEnvVars {`
`43`	`43`	`}`
`44`	`44`	`function ver { printf %02d%02d%02d%02d%02d $(echo "$1" \| tr '.' ' '); }`
`45`	`45`	`function checkJavaVersion {`
`46`		- java_version=`java -version 2>&1 >/dev/null \| grep 'java version' \| awk '{print $3}'`
	`46`	+ java_version=`java -version 2>&1 >/dev/null \| grep 'version' \| awk '{print $3}'`
`47`	`47`	`echo "Info: java version ${java_version}"`
`48`	`48`	`if [ $(ver $java_version) -lt $(ver "11.0.10") ]; then`
`49`	`49`	`echo "Error: Java version should be 11.0.10 or higher"`