Repository: maven Updated Branches: refs/heads/master 3db19368a -> eea4252f5
[MNG-5686] Use /usr/libexec/java_home to find JAVA_HOME Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/fbd6e53e Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fbd6e53e Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fbd6e53e Branch: refs/heads/master Commit: fbd6e53e838d3c77d689adeae19fa6de6ecc050f Parents: 3db1936 Author: Bernd Eckenfels <be...@eckenfels.net> Authored: Thu Jan 22 00:54:33 2015 +0100 Committer: Bernd Eckenfels <be...@eckenfels.net> Committed: Thu Jan 22 00:54:33 2015 +0100 ---------------------------------------------------------------------- apache-maven/src/bin/mvn | 2 +- apache-maven/src/bin/mvnDebug | 7 +++++++ apache-maven/src/bin/mvnyjp | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/fbd6e53e/apache-maven/src/bin/mvn ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index 1476eac..1ed3024 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -83,7 +83,7 @@ case "`uname`" in # # Apple JDKs # - export JAVA_HOME=/usr/libexec/java_home + export JAVA_HOME=`/usr/libexec/java_home` fi ;; esac http://git-wip-us.apache.org/repos/asf/maven/blob/fbd6e53e/apache-maven/src/bin/mvnDebug ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug index 7110352..291f81f 100755 --- a/apache-maven/src/bin/mvnDebug +++ b/apache-maven/src/bin/mvnDebug @@ -82,6 +82,13 @@ case "`uname`" in # export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi ;; esac http://git-wip-us.apache.org/repos/asf/maven/blob/fbd6e53e/apache-maven/src/bin/mvnyjp ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp index d66d354..faf3412 100755 --- a/apache-maven/src/bin/mvnyjp +++ b/apache-maven/src/bin/mvnyjp @@ -86,6 +86,13 @@ case "`uname`" in # export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi ;; esac
