You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/09/25 08:59:17 UTC
karaf git commit: [KARAF-4012] Update java_home checker to 1.8 version
Repository: karaf
Updated Branches:
refs/heads/master 65c845817 -> 8a7b13990
[KARAF-4012] Update java_home checker to 1.8 version
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8a7b1399
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8a7b1399
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8a7b1399
Branch: refs/heads/master
Commit: 8a7b13990eddfc9fa8f02051258c76b1514ecb51
Parents: 65c8458
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Sep 25 08:58:51 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Sep 25 08:58:51 2015 +0200
----------------------------------------------------------------------
assemblies/features/base/src/main/resources/resources/bin/karaf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/8a7b1399/assemblies/features/base/src/main/resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf b/assemblies/features/base/src/main/resources/resources/bin/karaf
index 38e4b3e..ae03118 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf
@@ -192,7 +192,7 @@ locateJava() {
fi
if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then
- JAVA_HOME="$(/usr/libexec/java_home -v 1.7)"
+ JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
fi
if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then
JAVA_HOME=`java-config --jre-home`