Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@karaf.apache.org
Date: Wed, 08 Nov 2017 03:46:16 +0000
To: "commits@karaf.apache.org" <commits@karaf.apache.org>
Subject: [karaf] branch master updated: [KARAF-5467]Karaf doesn't recognize
 Java 9 on Ubuntu 16.04
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Message-ID: <151011277684.11594.13428871381771676714@gitbox.apache.org>
From: ffang@apache.org
Auto-Submitted: auto-generated
archived-at: Wed, 08 Nov 2017 03:46:19 -0000

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new c9bffd9  [KARAF-5467]Karaf doesn't recognize Java 9 on Ubuntu 16.04
c9bffd9 is described below

commit c9bffd932c27e362f9aaeaa045a2ca6b151c4259
Author: Freeman Fang <freeman.fang@gmail.com>
AuthorDate: Wed Nov 8 11:46:00 2017 +0800

    [KARAF-5467]Karaf doesn't recognize Java 9 on Ubuntu 16.04
---
 .../features/base/src/main/filtered-resources/resources/bin/inc     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
index bcd4962..67433ae 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -213,7 +213,9 @@ checkJvmVersion() {
         | awk '{print substr($3,2,length($3)-2)}' \
         | awk '{print substr($1, 3, 3)}' \
         | sed -e 's;\.;;g')
-    if [ "x${VERSION}" = "x" ]; then
+    MAJOR_VERSION=$("${JAVA}" -version 2>&1 \
+        |awk -F '"' '/version/ {print $2}')
+    if [ "${MAJOR_VERSION:0:1}" -ge "9" ]; then
        VERSION=90
     fi
     if [ "${VERSION}" -lt "80" ]; then
@@ -317,4 +319,4 @@ convertPaths() {
             CLASSPATH=$(cygpath --path --windows "${CLASSPATH}")
         fi
     fi
-}
\ No newline at end of file
+}

-- 
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <commits@karaf.apache.org>'].