Change how we determine the Java version (use Runtime.version() inste…

…ad of setting environment variable)
NASA-AMMOS · Feb 21, 2024 · 59f8677 · 59f8677
1 parent 774a85f
commit 59f8677
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/cws-service/src/main/java/jpl/cws/controller/MvcCore.java b/cws-service/src/main/java/jpl/cws/controller/MvcCore.java
@@ -184,7 +184,7 @@ protected ModelAndView buildConfigurationModel(String message) {
 			model.addObject("historyDaysToLive", historyDaysToLive);
 			model.addObject("historyLevel", 		historyLevel);
 			model.addObject("javaHome", System.getenv("JAVA_HOME"));
-			model.addObject("javaVersion", System.getenv("JAVA_HOME_VERSION"));
+			model.addObject("javaVersion", Runtime.version().toString());
 			model.addObject("camundaVersion", System.getenv("CAMUNDA_VER"));
 
 			DiskUsage diskUsage = cwsConsoleService.getDiskUsage();

diff --git a/utils.sh b/utils.sh
@@ -140,7 +140,6 @@ function check_java_requirements () {
 
     JAVA_HOME_VERSION=$("${JAVA_HOME}/bin/java" -version 2>&1 | awk -F '"' '/version/ {print $2}')
     print "  JAVA_HOME Java version : ${JAVA_HOME_VERSION}"
-    export JAVA_HOME_VERSION="${JAVA_HOME_VERSION}"
 
     JAVA_PATH_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
     print "  PATH      Java version : ${JAVA_PATH_VERSION}  $(which java)"