You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2013/03/14 21:04:18 UTC
[46/50] [abbrv] git commit: o missed mvn in the merge
o missed mvn in the merge
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3868007b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3868007b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3868007b
Branch: refs/heads/eclipse-aether
Commit: 3868007bf59e28da983e27d13eeccbaf0756c95d
Parents: 27ad985
Author: Jason van Zyl <ja...@tesla.io>
Authored: Thu Feb 14 21:05:08 2013 -0500
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Thu Feb 14 21:05:08 2013 -0500
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 19 -------------------
1 files changed, 0 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3868007b/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 52451ad..f535d38 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -53,18 +53,11 @@ mingw=false
case "`uname`" in
CYGWIN*) cygwin=true ;;
MINGW*) mingw=true;;
-<<<<<<< HEAD
- Darwin*) darwin=true
-
-=======
Darwin*) darwin=true
->>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
#
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
# for the new JDKs provided by Oracle.
#
-<<<<<<< HEAD
-=======
if [[ -z "$JAVA_HOME" && -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ]] ; then
#
# Apple JDKs
@@ -72,21 +65,10 @@ case "`uname`" in
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
fi
->>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then
#
# Apple JDKs
#
-<<<<<<< HEAD
- JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
- fi
-
- if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then
- #
- # Oracle JDKs
- #
- JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-=======
export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
@@ -95,7 +77,6 @@ case "`uname`" in
# Oracle JDKs
#
export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
->>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
fi
;;
esac