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 2014/04/22 08:07:57 UTC
git commit: [KARAF-2921] Force selection for Java 7 on MacOS X
Repository: karaf
Updated Branches:
refs/heads/master 2705ad889 -> 0cb8c9133
[KARAF-2921] Force selection for Java 7 on MacOS X
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0cb8c913
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0cb8c913
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0cb8c913
Branch: refs/heads/master
Commit: 0cb8c9133cfe59c9087ca9e85e525683b023ba28
Parents: 2705ad8
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Apr 22 08:07:01 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Apr 22 08:07:01 2014 +0200
----------------------------------------------------------------------
.../framework/src/main/filtered-resources/resources/bin/client | 2 +-
.../framework/src/main/filtered-resources/resources/bin/instance | 2 +-
.../framework/src/main/filtered-resources/resources/bin/karaf | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/0cb8c913/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
index 4530b08..d004a13 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
@@ -188,7 +188,7 @@ locateJava() {
fi
if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then
- JAVA_HOME="$(/usr/libexec/java_home)"
+ JAVA_HOME="$(/usr/libexec/java_home -v 1.7)"
fi
if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then
JAVA_HOME=`java-config --jre-home`
http://git-wip-us.apache.org/repos/asf/karaf/blob/0cb8c913/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
index fe48c79..ef2e72b 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
@@ -188,7 +188,7 @@ locateJava() {
fi
if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then
- JAVA_HOME="$(/usr/libexec/java_home)"
+ JAVA_HOME="$(/usr/libexec/java_home -v 1.7)"
fi
if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then
JAVA_HOME=`java-config --jre-home`
http://git-wip-us.apache.org/repos/asf/karaf/blob/0cb8c913/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
index 6076bde..95b3303 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
@@ -195,7 +195,7 @@ locateJava() {
fi
if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then
- JAVA_HOME="$(/usr/libexec/java_home)"
+ JAVA_HOME="$(/usr/libexec/java_home -v 1.7)"
fi
if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then
JAVA_HOME=`java-config --jre-home`