diff options
| author | Anthony Dahanne | 2013-07-15 11:13:31 -0400 |
|---|---|---|
| committer | Adam Vandenberg | 2013-07-16 20:51:59 -0700 |
| commit | f160fa9eac083905f4b49e174165a8e0b78fb159 (patch) | |
| tree | bb19a2546485acd500a40313030ab57d6c21e4f8 /Library/Formula | |
| parent | 3a95572c766b1abbd107a7b85f6b74bb3cf44a83 (diff) | |
| download | homebrew-f160fa9eac083905f4b49e174165a8e0b78fb159.tar.bz2 | |
maven 3.1.0
Closes #21227.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/maven.rb | 77 |
1 files changed, 2 insertions, 75 deletions
diff --git a/Library/Formula/maven.rb b/Library/Formula/maven.rb index d60357be6..012d44476 100644 --- a/Library/Formula/maven.rb +++ b/Library/Formula/maven.rb @@ -2,15 +2,8 @@ require 'formula' class Maven < Formula homepage 'http://maven.apache.org/' - url 'http://www.apache.org/dyn/closer.cgi?path=maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz' - sha1 'aecc0d3d67732939c0056d4a0d8510483ee1167e' - - # Detect Java using java_home. - # This patch should be removed once Maven closes MNG-4226. - # http://jira.codehaus.org/browse/MNG-4226 - def patches - DATA - end + url 'http://www.apache.org/dyn/closer.cgi?path=maven/maven-3/3.1.0/binaries/apache-maven-3.1.0-bin.tar.gz' + sha1 'af0867027f0907631c1f85ecf668f74c08f5d5e9' def install # Remove windows files @@ -24,69 +17,3 @@ class Maven < Formula bin.install_symlink Dir["#{libexec}/bin/*"] end end - -__END__ -diff --git a/bin/mvn b/bin/mvn -index ba46c8e..d214611 100755 ---- a/bin/mvn -+++ b/bin/mvn -@@ -54,11 +54,12 @@ case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true -- if [ -z "$JAVA_VERSION" ] ; then -- JAVA_VERSION="CurrentJDK" -- fi - if [ -z "$JAVA_HOME" ] ; then -- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home -+ if [ -z "$JAVA_VERSION" ] ; then -+ JAVA_HOME=`/usr/libexec/java_home` -+ else -+ JAVA_HOME=`/usr/libexec/java_home -v ${JAVA_VERSION}` -+ fi - fi - ;; - esac -diff --git a/bin/mvnDebug b/bin/mvnDebug -index 291e1e2..11f6f3e 100755 ---- a/bin/mvnDebug -+++ b/bin/mvnDebug -@@ -58,11 +58,12 @@ case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true -- if [ -z "$JAVA_VERSION" ] ; then -- JAVA_VERSION="CurrentJDK" -- fi - if [ -z "$JAVA_HOME" ] ; then -- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home -+ if [ -z "$JAVA_VERSION" ] ; then -+ JAVA_HOME=`/usr/libexec/java_home` -+ else -+ JAVA_HOME=`/usr/libexec/java_home -v ${JAVA_VERSION}` -+ fi - fi - ;; - esac -diff --git a/bin/mvnyjp b/bin/mvnyjp -index b3e5e7e..de3631c 100755 ---- a/bin/mvnyjp -+++ b/bin/mvnyjp -@@ -62,11 +62,12 @@ case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true -- if [ -z "$JAVA_VERSION" ] ; then -- JAVA_VERSION="CurrentJDK" -- fi - if [ -z "$JAVA_HOME" ] ; then -- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home -+ if [ -z "$JAVA_VERSION" ] ; then -+ JAVA_HOME=`/usr/libexec/java_home` -+ else -+ JAVA_HOME=`/usr/libexec/java_home -v ${JAVA_VERSION}` -+ fi - fi - if [ -z "$YJP_HOME" ]; then - YJP_HOME=/Applications/YourKit.app - |