Merge pull request #67 from tofi86/develop

Release version 3.0.3
tofi86 · Jul 29, 2018 · 49e55ed · 49e55ed
2 parents 8e3b2dc + 6c2794d
commit 49e55ed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 ChangeLog
 ---------
 
+### v3.0.3 (2018-07-29)
+* Bugfix: changes for the new Java 10 `java -version` formatting (#66)
+
 ### v3.0.2 (2018-04-12)
 * Bugfix: fix typo in JVMOptions expansion on java exec call (PR #63, Thanks to @michaelweiser for his contribution)
 * Added a basic Travis CI build pipeline running a `shellcheck` test for errors and executing the basic testsuite

diff --git a/src/universalJavaApplicationStub b/src/universalJavaApplicationStub
@@ -11,8 +11,8 @@
 #                                                                                #
 # @author    Tobias Fischer                                                      #
 # @url       https://github.com/tofi86/universalJavaApplicationStub              #
-# @date      2018-04-12                                                          #
-# @version   3.0.2                                                               #
+# @date      2018-07-29                                                          #
+# @version   3.0.3                                                               #
 #                                                                                #
 ##################################################################################
 #                                                                                #
@@ -387,7 +387,7 @@ fi
 ################################################################################
 function get_java_version_from_cmd() {
 	# second sed command strips " and -ea from the version string
-	echo $("$1" -version 2>&1 | awk '/version/{print $NF}' | sed -E 's/"//g;s/-ea//g')
+	echo $("$1" -version 2>&1 | awk '/version/{print $3}' | sed -E 's/"//g;s/-ea//g')
 }
 
 

diff --git a/test/java-version-tester.sh b/test/java-version-tester.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Tests for the functions used in universalJavaApplicationStub script
-# tofi86 @ 2018-03-10
+# tofi86 @ 2018-07-29
 
 
 
@@ -15,7 +15,7 @@
 ################################################################################
 function get_java_version_from_cmd() {
 	# second sed command strips " and -ea from the version string
-	echo $("$1" -version 2>&1 | awk '/version/{print $NF}' | sed -E 's/"//g;s/-ea//g')
+	echo $("$1" -version 2>&1 | awk '/version/{print $3}' | sed -E 's/"//g;s/-ea//g')
 }