Repository: karaf Updated Branches: refs/heads/karaf-3.0.x d8e18aa59 -> a85de7306
[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/a85de730 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a85de730 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a85de730 Branch: refs/heads/karaf-3.0.x Commit: a85de73064b55c2ceaade180994f6e221a7d8524 Parents: d8e18aa Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Sep 25 09:01:06 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Sep 25 09:01:06 2015 +0200 ---------------------------------------------------------------------- .../features/framework/src/main/resources/resources/bin/karaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/a85de730/assemblies/features/framework/src/main/resources/resources/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/bin/karaf b/assemblies/features/framework/src/main/resources/resources/bin/karaf index aaed0f5..7c9ff2a 100755 --- a/assemblies/features/framework/src/main/resources/resources/bin/karaf +++ b/assemblies/features/framework/src/main/resources/resources/bin/karaf @@ -191,7 +191,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`
