Permalink
Browse files

Upgrade bundled maven to 3.0.4

  • Loading branch information...
1 parent 15a27ad commit 7228f7f7146f3b2d5fddccd13904ee68cae2cc11 @ctomc ctomc committed Oct 11, 2012
Showing with 55 additions and 13 deletions.
  1. +1 −1 tools/maven/NOTICE.txt
  2. +1 −0 tools/maven/bin/m2.conf
  3. +17 −4 tools/maven/bin/mvn
  4. +17 −4 tools/maven/bin/mvnDebug
  5. +17 −4 tools/maven/bin/mvnyjp
  6. BIN tools/maven/lib/aether-api-1.13.1.jar
  7. BIN tools/maven/lib/aether-api-1.9.jar
  8. BIN tools/maven/lib/aether-connector-wagon-1.13.1.jar
  9. BIN tools/maven/lib/aether-connector-wagon-1.9.jar
  10. BIN tools/maven/lib/aether-impl-1.13.1.jar
  11. BIN tools/maven/lib/aether-impl-1.9.jar
  12. BIN tools/maven/lib/aether-spi-1.13.1.jar
  13. BIN tools/maven/lib/aether-spi-1.9.jar
  14. BIN tools/maven/lib/aether-util-1.13.1.jar
  15. BIN tools/maven/lib/aether-util-1.9.jar
  16. +2 −0 tools/maven/lib/ext/README.txt
  17. BIN tools/maven/lib/maven-aether-provider-3.0.2.jar
  18. BIN tools/maven/lib/maven-aether-provider-3.0.4.jar
  19. BIN tools/maven/lib/maven-artifact-3.0.2.jar
  20. BIN tools/maven/lib/maven-artifact-3.0.4.jar
  21. BIN tools/maven/lib/{maven-compat-3.0.2.jar → maven-compat-3.0.4.jar}
  22. BIN tools/maven/lib/{maven-core-3.0.2.jar → maven-core-3.0.4.jar}
  23. BIN tools/maven/lib/maven-embedder-3.0.2.jar
  24. BIN tools/maven/lib/maven-embedder-3.0.4.jar
  25. BIN tools/maven/lib/maven-model-3.0.2.jar
  26. BIN tools/maven/lib/maven-model-3.0.4.jar
  27. BIN tools/maven/lib/maven-model-builder-3.0.2.jar
  28. BIN tools/maven/lib/maven-model-builder-3.0.4.jar
  29. BIN tools/maven/lib/{maven-plugin-api-3.0.2.jar → maven-plugin-api-3.0.4.jar}
  30. BIN tools/maven/lib/{maven-repository-metadata-3.0.2.jar → maven-repository-metadata-3.0.4.jar}
  31. BIN tools/maven/lib/{maven-settings-3.0.2.jar → maven-settings-3.0.4.jar}
  32. BIN tools/maven/lib/{maven-settings-builder-3.0.2.jar → maven-settings-builder-3.0.4.jar}
  33. BIN tools/maven/lib/nekohtml-1.9.6.2.jar
  34. BIN tools/maven/lib/plexus-cipher-1.4.jar
  35. BIN tools/maven/lib/plexus-cipher-1.7.jar
  36. BIN tools/maven/lib/plexus-utils-2.0.4.jar
  37. BIN tools/maven/lib/plexus-utils-2.0.6.jar
  38. BIN tools/maven/lib/sisu-guava-0.9.9.jar
  39. BIN tools/maven/lib/sisu-guice-2.9.1-noaop.jar
  40. BIN tools/maven/lib/sisu-guice-3.1.0-no_aop.jar
  41. BIN tools/maven/lib/sisu-inject-bean-1.4.3.1.jar
  42. BIN tools/maven/lib/sisu-inject-bean-2.3.0.jar
  43. BIN tools/maven/lib/sisu-inject-plexus-1.4.3.1.jar
  44. BIN tools/maven/lib/sisu-inject-plexus-2.3.0.jar
  45. BIN tools/maven/lib/wagon-file-1.0-beta-7.jar
  46. BIN tools/maven/lib/wagon-file-2.2.jar
  47. BIN tools/maven/lib/wagon-http-2.2-shaded.jar
  48. BIN tools/maven/lib/wagon-http-lightweight-1.0-beta-7.jar
  49. BIN tools/maven/lib/wagon-http-shared-1.0-beta-7.jar
  50. BIN tools/maven/lib/wagon-provider-api-1.0-beta-7.jar
  51. BIN tools/maven/lib/wagon-provider-api-2.2.jar
  52. BIN tools/maven/lib/xercesMinimal-1.9.6.2.jar
View
@@ -5,7 +5,7 @@
=========================================================================
Apache Maven
-Copyright 2001-2010 The Apache Software Foundation
+Copyright 2001-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
View
@@ -3,4 +3,5 @@ main is org.apache.maven.cli.MavenCli from plexus.core
set maven.home default ${user.home}/m2
[plexus.core]
+optionally ${maven.home}/lib/ext/*.jar
load ${maven.home}/lib/*.jar
View
@@ -56,8 +56,6 @@ case "`uname`" in
Darwin*) darwin=true
if [ -z "$JAVA_VERSION" ] ; then
JAVA_VERSION="CurrentJDK"
- else
- echo "Using Java version: $JAVA_VERSION"
fi
if [ -z "$JAVA_HOME" ] ; then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
@@ -116,6 +114,21 @@ if $mingw ; then
# TODO classpath?
fi
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" -a ! "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -147,8 +160,8 @@ if $cygwin; then
M2_HOME=`cygpath --path --windows "$M2_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- [ -n "$HOME" ] &&
- HOME=`cygpath --path --windows "$HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
exec "$JAVACMD" \
View
@@ -60,8 +60,6 @@ case "`uname`" in
Darwin*) darwin=true
if [ -z "$JAVA_VERSION" ] ; then
JAVA_VERSION="CurrentJDK"
- else
- echo "Using Java version: $JAVA_VERSION"
fi
if [ -z "$JAVA_HOME" ] ; then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
@@ -120,6 +118,21 @@ if $mingw ; then
# TODO classpath?
fi
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" -a ! "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -151,8 +164,8 @@ if $cygwin; then
M2_HOME=`cygpath --path --windows "$M2_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- [ -n "$HOME" ] &&
- HOME=`cygpath --path --windows "$HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
exec "$JAVACMD" \
View
@@ -64,8 +64,6 @@ case "`uname`" in
Darwin*) darwin=true
if [ -z "$JAVA_VERSION" ] ; then
JAVA_VERSION="CurrentJDK"
- else
- echo "Using Java version: $JAVA_VERSION"
fi
if [ -z "$JAVA_HOME" ] ; then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
@@ -128,6 +126,21 @@ if $mingw ; then
# TODO classpath?
fi
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" -a ! "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -159,8 +172,8 @@ if $cygwin; then
M2_HOME=`cygpath --path --windows "$M2_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- [ -n "$HOME" ] &&
- HOME=`cygpath --path --windows "$HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
if [ ! -f "$YJPLIB" ]; then
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,2 @@
+Use this directory to contribute 3rd-party extensions to the Maven core. These extensions can either extend or override
+Maven's default implementation.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 7228f7f

Please sign in to comment.