You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ac...@apache.org on 2018/05/07 10:14:06 UTC

[karaf] branch master updated: Revert "[KARAF-5729] Karaf won't start on Solaris 11 and AIX 7.2"

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

acosentino 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 5991086  Revert "[KARAF-5729] Karaf won't start on Solaris 11 and AIX 7.2"
5991086 is described below

commit 5991086df4b63c335fc34632ebd2d01b4626800f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon May 7 12:13:51 2018 +0200

    Revert "[KARAF-5729] Karaf won't start on Solaris 11 and AIX 7.2"
    
    This reverts commit e6cf8b5c23704ab2d9a0cbb761bc4c648e38aa45.
---
 assemblies/features/base/src/main/filtered-resources/resources/bin/inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 be5f240..58c3ce3 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -208,7 +208,7 @@ detectJVM() {
 }
 
 checkJvmVersion() {
-    VERSION=$("${JAVA}" -version 2>&1 | grep -i version | sed 's/.*version ".*\.\(.*\)\..*"/\1/; 1q')
+    VERSION=$("${JAVA}" -version 2>&1 | awk -F '"' '/version/ {print $2}' | sed -e 's/_.*//g; s/^1\.//g ; s/\..*//g; s/-.*//g;')
     if [ "${VERSION}" -lt "8" ]; then
         die "JVM must be greater than 1.8"
     fi

-- 
To stop receiving notification emails like this one, please contact
acosentino@apache.org.