[jboss-cvs] JBossAS SVN: r109217 - in trunk/tools/maven: bin and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 9 17:43:23 EST 2010
Author: pgier
Date: 2010-11-09 17:43:22 -0500 (Tue, 09 Nov 2010)
New Revision: 109217
Added:
trunk/tools/maven/lib/aether-api-1.7.jar
trunk/tools/maven/lib/aether-connector-wagon-1.7.jar
trunk/tools/maven/lib/aether-impl-1.7.jar
trunk/tools/maven/lib/aether-spi-1.7.jar
trunk/tools/maven/lib/aether-util-1.7.jar
trunk/tools/maven/lib/maven-aether-provider-3.0.jar
trunk/tools/maven/lib/maven-artifact-3.0.jar
trunk/tools/maven/lib/maven-compat-3.0.jar
trunk/tools/maven/lib/maven-core-3.0.jar
trunk/tools/maven/lib/maven-embedder-3.0.jar
trunk/tools/maven/lib/maven-model-3.0.jar
trunk/tools/maven/lib/maven-model-builder-3.0.jar
trunk/tools/maven/lib/maven-plugin-api-3.0.jar
trunk/tools/maven/lib/maven-repository-metadata-3.0.jar
trunk/tools/maven/lib/maven-settings-3.0.jar
trunk/tools/maven/lib/maven-settings-builder-3.0.jar
trunk/tools/maven/lib/plexus-component-annotations-1.5.5.jar
trunk/tools/maven/lib/plexus-interpolation-1.14.jar
trunk/tools/maven/lib/plexus-utils-2.0.4.jar
trunk/tools/maven/lib/sisu-guice-2.1.7-noaop.jar
trunk/tools/maven/lib/sisu-inject-bean-1.4.2.jar
trunk/tools/maven/lib/sisu-inject-plexus-1.4.2.jar
Removed:
trunk/tools/maven/lib/google-collections-1.0.jar
trunk/tools/maven/lib/maven-artifact-3.0-beta-1.jar
trunk/tools/maven/lib/maven-compat-3.0-beta-1.jar
trunk/tools/maven/lib/maven-core-3.0-beta-1.jar
trunk/tools/maven/lib/maven-embedder-3.0-beta-1.jar
trunk/tools/maven/lib/maven-model-3.0-beta-1.jar
trunk/tools/maven/lib/maven-model-builder-3.0-beta-1.jar
trunk/tools/maven/lib/maven-plugin-api-3.0-beta-1.jar
trunk/tools/maven/lib/maven-settings-3.0-beta-1.jar
trunk/tools/maven/lib/plexus-component-annotations-1.5.4.jar
trunk/tools/maven/lib/plexus-container-default-1.5.4.jar
trunk/tools/maven/lib/plexus-interpolation-1.11.jar
trunk/tools/maven/lib/plexus-utils-2.0.3.jar
trunk/tools/maven/lib/xbean-reflect-3.4.jar
Modified:
trunk/tools/maven/NOTICE.txt
trunk/tools/maven/bin/mvn
trunk/tools/maven/bin/mvnDebug
trunk/tools/maven/bin/mvnyjp
trunk/tools/maven/lib/wagon-file-1.0-beta-6.jar
trunk/tools/maven/lib/wagon-http-shared-1.0-beta-6.jar
trunk/tools/maven/lib/wagon-provider-api-1.0-beta-6.jar
Log:
[JBAS-8622] Update bundled Maven from 3.0-beta-1 to 3.0
Modified: trunk/tools/maven/NOTICE.txt
===================================================================
--- trunk/tools/maven/NOTICE.txt 2010-11-09 22:16:47 UTC (rev 109216)
+++ trunk/tools/maven/NOTICE.txt 2010-11-09 22:43:22 UTC (rev 109217)
@@ -4,17 +4,20 @@
== in this case for the Apache Maven distribution. ==
=========================================================================
+Apache Maven
+Copyright 2001-2010 The Apache Software Foundation
+
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
This product includes software (Plexus and Classworlds) developed by
The Codehaus Foundation (http://www.codehaus.org/).
-This product includes software (JSCH) developed by
-JCraft Inc. (http://www.jcraft.com/).
+This product includes software (Aether, Sisu, Spice, Plexus Ciper and Sec Dispatcher) developed by
+Sonatype Inc. (http://www.sonatype.org/).
-This product includes software (JTidy) developed by
+This product includes software (NekoHTML) developed by
SourceForge (http://www.sourceforge.net/).
-This product includes software (AspectJ) developed by
-The Eclipse Foundation (http://www.eclipse.org/aspectj/).
+This product includes software (Guice) developed by
+Google Code (http://code.google.com/).
Modified: trunk/tools/maven/bin/mvn
===================================================================
--- trunk/tools/maven/bin/mvn 2010-11-09 22:16:47 UTC (rev 109216)
+++ trunk/tools/maven/bin/mvn 2010-11-09 22:43:22 UTC (rev 109217)
@@ -33,14 +33,6 @@
# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
# ----------------------------------------------------------------------------
-QUOTED_ARGS=""
-while [ "$1" != "" ] ; do
-
- QUOTED_ARGS="$QUOTED_ARGS \"$1\""
- shift
-
-done
-
if [ -f /etc/mavenrc ] ; then
. /etc/mavenrc
fi
@@ -154,11 +146,9 @@
HOME=`cygpath --path --windows "$HOME"`
fi
-maven_exec_cmd="\"$JAVACMD\" \
+exec "$JAVACMD" \
$MAVEN_OPTS \
- -classpath \"${M2_HOME}\"/boot/plexus-classworlds-*.jar \
- \"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf\" \
- \"-Dmaven.home=${M2_HOME}\" \
- ${CLASSWORLDS_LAUNCHER}"
-
-eval $maven_exec_cmd "$QUOTED_ARGS"
+ -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
+ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+ "-Dmaven.home=${M2_HOME}" \
+ ${CLASSWORLDS_LAUNCHER} "$@"
Modified: trunk/tools/maven/bin/mvnDebug
===================================================================
--- trunk/tools/maven/bin/mvnDebug 2010-11-09 22:16:47 UTC (rev 109216)
+++ trunk/tools/maven/bin/mvnDebug 2010-11-09 22:43:22 UTC (rev 109217)
@@ -37,14 +37,6 @@
echo Preparing to Execute Maven in Debug Mode
-QUOTED_ARGS=""
-while [ "$1" != "" ] ; do
-
- QUOTED_ARGS="$QUOTED_ARGS \"$1\""
- shift
-
-done
-
if [ -f /etc/mavenrc ] ; then
. /etc/mavenrc
fi
@@ -158,12 +150,10 @@
HOME=`cygpath --path --windows "$HOME"`
fi
-maven_exec_cmd="\"$JAVACMD\" \
+exec "$JAVACMD" \
$MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \
- -classpath \"${M2_HOME}\"/boot/plexus-classworlds-*.jar \
- \"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf\" \
- \"-Dmaven.home=${M2_HOME}\" \
- ${CLASSWORLDS_LAUNCHER}"
-
-eval $maven_exec_cmd "$QUOTED_ARGS"
+ -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
+ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+ "-Dmaven.home=${M2_HOME}" \
+ ${CLASSWORLDS_LAUNCHER} "$@"
Modified: trunk/tools/maven/bin/mvnyjp
===================================================================
--- trunk/tools/maven/bin/mvnyjp 2010-11-09 22:16:47 UTC (rev 109216)
+++ trunk/tools/maven/bin/mvnyjp 2010-11-09 22:43:22 UTC (rev 109217)
@@ -33,10 +33,6 @@
# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
# ----------------------------------------------------------------------------
-YJPLIB=/applications/YourKit.app/bin/mac/libyjpagent.jnilib
-
-MAVEN_OPTS=-agentpath:$YJPLIB=onexit=snapshot,onexit=memory,tracing,onlylocal
-
QUOTED_ARGS=""
while [ "$1" != "" ] ; do
@@ -69,6 +65,10 @@
if [ -z "$JAVA_HOME" ] ; then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
fi
+ if [ -z "$YJP_HOME" ]; then
+ YJP_HOME=/Applications/YourKit.app
+ fi
+ YJPLIB=$YJP_HOME/bin/mac/libyjpagent.jnilib
;;
esac
@@ -158,6 +158,13 @@
HOME=`cygpath --path --windows "$HOME"`
fi
+if [ ! -f "$YJPLIB" ]; then
+ echo "Unable to autodetect the YJP library location. Please set YJPLIB variable"
+ exit 1
+fi
+
+MAVEN_OPTS="-agentpath:$YJPLIB=onexit=snapshot,onexit=memory,tracing,onlylocal $MAVEN_OPTS"
+
exec "$JAVACMD" \
$MAVEN_OPTS \
-classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
Added: trunk/tools/maven/lib/aether-api-1.7.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/aether-api-1.7.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/aether-connector-wagon-1.7.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/aether-connector-wagon-1.7.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/aether-impl-1.7.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/aether-impl-1.7.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/aether-spi-1.7.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/aether-spi-1.7.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/aether-util-1.7.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/aether-util-1.7.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/google-collections-1.0.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/maven-aether-provider-3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-aether-provider-3.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/maven-artifact-3.0-beta-1.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/maven-artifact-3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-artifact-3.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/maven-compat-3.0-beta-1.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/maven-compat-3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-compat-3.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/maven-core-3.0-beta-1.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/maven-core-3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-core-3.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/maven-embedder-3.0-beta-1.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/maven-embedder-3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-embedder-3.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/maven-model-3.0-beta-1.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/maven-model-3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-model-3.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/maven-model-builder-3.0-beta-1.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/maven-model-builder-3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-model-builder-3.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/maven-plugin-api-3.0-beta-1.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/maven-plugin-api-3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-plugin-api-3.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/maven-repository-metadata-3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-repository-metadata-3.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/maven-settings-3.0-beta-1.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/maven-settings-3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-settings-3.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/maven-settings-builder-3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-settings-builder-3.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/plexus-component-annotations-1.5.4.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/plexus-component-annotations-1.5.5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/plexus-component-annotations-1.5.5.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/plexus-container-default-1.5.4.jar
===================================================================
(Binary files differ)
Deleted: trunk/tools/maven/lib/plexus-interpolation-1.11.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/plexus-interpolation-1.14.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/plexus-interpolation-1.14.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/plexus-utils-2.0.3.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/plexus-utils-2.0.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/plexus-utils-2.0.4.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/sisu-guice-2.1.7-noaop.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/sisu-guice-2.1.7-noaop.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/sisu-inject-bean-1.4.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/sisu-inject-bean-1.4.2.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/sisu-inject-plexus-1.4.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/sisu-inject-plexus-1.4.2.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/tools/maven/lib/wagon-file-1.0-beta-6.jar
===================================================================
(Binary files differ)
Modified: trunk/tools/maven/lib/wagon-http-shared-1.0-beta-6.jar
===================================================================
(Binary files differ)
Modified: trunk/tools/maven/lib/wagon-provider-api-1.0-beta-6.jar
===================================================================
(Binary files differ)
Deleted: trunk/tools/maven/lib/xbean-reflect-3.4.jar
===================================================================
(Binary files differ)
More information about the jboss-cvs-commits
mailing list