[jboss-cvs] JBossAS SVN: r105727 - in trunk/tools/maven: bin and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 4 11:57:29 EDT 2010
Author: pgier
Date: 2010-06-04 11:57:28 -0400 (Fri, 04 Jun 2010)
New Revision: 105727
Added:
trunk/tools/maven/bin/mvnyjp
trunk/tools/maven/boot/plexus-classworlds-2.2.3.jar
trunk/tools/maven/lib/commons-cli-1.2.jar
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/nekohtml-1.9.6.2.jar
trunk/tools/maven/lib/plexus-cipher-1.4.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-sec-dispatcher-1.3.jar
trunk/tools/maven/lib/plexus-utils-2.0.3.jar
trunk/tools/maven/lib/wagon-file-1.0-beta-6.jar
trunk/tools/maven/lib/wagon-http-lightweight-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
trunk/tools/maven/lib/xbean-reflect-3.4.jar
trunk/tools/maven/lib/xercesMinimal-1.9.6.2.jar
Removed:
trunk/tools/maven/boot/classworlds-1.1.jar
trunk/tools/maven/lib/maven-2.2.1-uber.jar
Modified:
trunk/tools/maven/LICENSE.txt
trunk/tools/maven/NOTICE.txt
trunk/tools/maven/README.txt
trunk/tools/maven/bin/m2.conf
trunk/tools/maven/bin/mvn
trunk/tools/maven/bin/mvn.bat
trunk/tools/maven/bin/mvnDebug
trunk/tools/maven/bin/mvnDebug.bat
trunk/tools/maven/conf/settings.xml
Log:
[JBAS-8067] Update to Maven 3-beta-1
Modified: trunk/tools/maven/LICENSE.txt
===================================================================
--- trunk/tools/maven/LICENSE.txt 2010-06-04 15:42:55 UTC (rev 105726)
+++ trunk/tools/maven/LICENSE.txt 2010-06-04 15:57:28 UTC (rev 105727)
@@ -176,58 +176,27 @@
END OF TERMS AND CONDITIONS
-License for JSch
+ APPENDIX: How to apply the Apache License to your work.
-------------------------------------------------------------------------------
-Copyright (c) 2002,2003,2004,2005,2006,2007,2008 Atsuhiko Yamanaka, JCraft,Inc.
-All rights reserved.
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+ Copyright [yyyy] [name of copyright owner]
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the distribution.
+ http://www.apache.org/licenses/LICENSE-2.0
- 3. The names of the authors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License for SLF4J
-
-Copyright (c) 2004-2008 QOS.ch
- All rights reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Modified: trunk/tools/maven/NOTICE.txt
===================================================================
--- trunk/tools/maven/NOTICE.txt 2010-06-04 15:42:55 UTC (rev 105726)
+++ trunk/tools/maven/NOTICE.txt 2010-06-04 15:57:28 UTC (rev 105727)
@@ -11,10 +11,10 @@
The Codehaus Foundation (http://www.codehaus.org/).
This product includes software (JSCH) developed by
-JCraft Inc. (http://www.jcraft.com/jsch/).
+JCraft Inc. (http://www.jcraft.com/).
-This product includes software (JTidy) developed at
-SourceForge (http://sourceforge.net/projects/jtidy).
+This product includes software (JTidy) developed by
+SourceForge (http://www.sourceforge.net/).
-This product includes software (NekoHTML) developed at
-SourceForge (http://sourceforge.net/projects/nekohtml).
+This product includes software (AspectJ) developed by
+The Eclipse Foundation (http://www.eclipse.org/aspectj/).
Modified: trunk/tools/maven/README.txt
===================================================================
--- trunk/tools/maven/README.txt 2010-06-04 15:42:55 UTC (rev 105726)
+++ trunk/tools/maven/README.txt 2010-06-04 15:57:28 UTC (rev 105727)
@@ -11,8 +11,6 @@
Documentation
-------------
- The documentation available as of the date of this release is included in
- HTML format in the docs/ directory.
The most up-to-date documentation can be found at http://maven.apache.org/.
Release Notes
@@ -24,7 +22,7 @@
-------------------
JDK:
- 1.4 or above (this is to execute Maven - it still allows you to build against 1.3
+ 1.5 or above (this is to execute Maven - it still allows you to build against 1.3
and prior JDK's).
Memory:
No minimum requirement.
@@ -42,18 +40,18 @@
1) Unpack the archive where you would like to store the binaries, eg:
Unix-based Operating Systems (Linux, Solaris and Mac OS X)
- tar zxvf apache-maven-2.1.x.tar.gz
+ tar zxvf apache-maven-3.0.x.tar.gz
Windows 2000/XP
- unzip apache-maven-2.1.x.zip
+ unzip apache-maven-3.0.x.zip
- 2) A directory called "apache-maven-2.1.x" will be created.
+ 2) A directory called "apache-maven-3.0.x" will be created.
3) Add the bin directory to your PATH, eg:
Unix-based Operating Systems (Linux, Solaris and Mac OS X)
- export PATH=/usr/local/apache-maven-2.1.x/bin:$PATH
+ export PATH=/usr/local/apache-maven-3.0.x/bin:$PATH
Windows 2000/XP
- set PATH="c:\program files\apache-maven-2.1.x\bin";%PATH%
+ set PATH="c:\program files\apache-maven-3.0.x\bin";%PATH%
4) Make sure JAVA_HOME is set to the location of your JDK
@@ -70,7 +68,8 @@
----------
Home Page: http://maven.apache.org/
- Downloads: http://maven.apache.org/downloads.html
+ Downloads: http://maven.apache.org/download.html
+ Release Notes: http://maven.apache.org/release-notes.html
Mailing Lists: http://maven.apache.org/mail-lists.html
Source Code: http://svn.apache.org/repos/asf/maven/
Issue Tracking: http://jira.codehaus.org/browse/MNG
Modified: trunk/tools/maven/bin/m2.conf
===================================================================
--- trunk/tools/maven/bin/m2.conf 2010-06-04 15:42:55 UTC (rev 105726)
+++ trunk/tools/maven/bin/m2.conf 2010-06-04 15:57:28 UTC (rev 105727)
@@ -1,4 +1,4 @@
-main is org.apache.maven.cli.compat.CompatibleMain from plexus.core
+main is org.apache.maven.cli.MavenCli from plexus.core
set maven.home default ${user.home}/m2
Modified: trunk/tools/maven/bin/mvn
===================================================================
--- trunk/tools/maven/bin/mvn 2010-06-04 15:42:55 UTC (rev 105726)
+++ trunk/tools/maven/bin/mvn 2010-06-04 15:57:28 UTC (rev 105727)
@@ -142,7 +142,7 @@
echo "Warning: JAVA_HOME environment variable is not set."
fi
-CLASSWORLDS_LAUNCHER=org.codehaus.classworlds.Launcher
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
@@ -154,10 +154,11 @@
HOME=`cygpath --path --windows "$HOME"`
fi
-exec "$JAVACMD" \
+maven_exec_cmd="\"$JAVACMD\" \
$MAVEN_OPTS \
- -classpath "${M2_HOME}"/boot/classworlds-*.jar \
- "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
- "-Dmaven.home=${M2_HOME}" \
- ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
+ -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"
Modified: trunk/tools/maven/bin/mvn.bat
===================================================================
--- trunk/tools/maven/bin/mvn.bat 2010-06-04 15:42:55 UTC (rev 105726)
+++ trunk/tools/maven/bin/mvn.bat 2010-06-04 15:57:28 UTC (rev 105727)
@@ -144,17 +144,18 @@
if "%@eval[2+2]" == "4" goto 4NTCWJars
@REM -- Regular WinNT shell
-for %%i in ("%M2_HOME%"\boot\classworlds-*) do set CLASSWORLDS_JAR="%%i"
+for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i"
goto runm2
@REM The 4NT Shell from jp software
:4NTCWJars
-for %%i in ("%M2_HOME%\boot\classworlds-*") do set CLASSWORLDS_JAR="%%i"
+for %%i in ("%M2_HOME%\boot\plexus-classworlds-*") do set CLASSWORLDS_JAR="%%i"
goto runm2
@REM Start MAVEN2
:runm2
-%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
+set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
@@ -186,3 +187,4 @@
cmd /C exit /B %ERROR_CODE%
+
Modified: trunk/tools/maven/bin/mvnDebug
===================================================================
--- trunk/tools/maven/bin/mvnDebug 2010-06-04 15:42:55 UTC (rev 105726)
+++ trunk/tools/maven/bin/mvnDebug 2010-06-04 15:57:28 UTC (rev 105727)
@@ -132,7 +132,7 @@
JAVACMD="$JAVA_HOME/bin/java"
fi
else
- JAVACMD=java
+ JAVACMD="`which java`"
fi
fi
@@ -146,7 +146,7 @@
echo "Warning: JAVA_HOME environment variable is not set."
fi
-CLASSWORLDS_LAUNCHER=org.codehaus.classworlds.Launcher
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
@@ -158,12 +158,12 @@
HOME=`cygpath --path --windows "$HOME"`
fi
-exec "$JAVACMD" \
+maven_exec_cmd="\"$JAVACMD\" \
$MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \
- -classpath "${M2_HOME}"/boot/classworlds-*.jar \
- "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
- "-Dmaven.home=${M2_HOME}" \
- ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
+ -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"
Modified: trunk/tools/maven/bin/mvnDebug.bat
===================================================================
--- trunk/tools/maven/bin/mvnDebug.bat 2010-06-04 15:42:55 UTC (rev 105726)
+++ trunk/tools/maven/bin/mvnDebug.bat 2010-06-04 15:57:28 UTC (rev 105727)
@@ -37,7 +37,6 @@
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
-set MAVEN_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@echo Preparing to Execute Maven in Debug Mode
@REM set %HOME% to equivalent of $HOME
@@ -52,6 +51,8 @@
if "%OS%"=="Windows_NT" @setlocal
if "%OS%"=="WINNT" @setlocal
+set MAVEN_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+
@REM ==== START VALIDATION ====
if not "%JAVA_HOME%" == "" goto OkJHome
@@ -147,17 +148,18 @@
if "%@eval[2+2]" == "4" goto 4NTCWJars
@REM -- Regular WinNT shell
-for %%i in ("%M2_HOME%"\boot\classworlds-*) do set CLASSWORLDS_JAR="%%i"
+for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i"
goto runm2
@REM The 4NT Shell from jp software
:4NTCWJars
-for %%i in ("%M2_HOME%\boot\classworlds-*") do set CLASSWORLDS_JAR="%%i"
+for %%i in ("%M2_HOME%\boot\plexus-classworlds-*") do set CLASSWORLDS_JAR="%%i"
goto runm2
@REM Start MAVEN2
:runm2
-%MAVEN_JAVA_EXE% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
+set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+%MAVEN_JAVA_EXE% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
Added: trunk/tools/maven/bin/mvnyjp
===================================================================
--- trunk/tools/maven/bin/mvnyjp (rev 0)
+++ trunk/tools/maven/bin/mvnyjp 2010-06-04 15:57:28 UTC (rev 105727)
@@ -0,0 +1,168 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# 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
+
+ QUOTED_ARGS="$QUOTED_ARGS \"$1\""
+ shift
+
+done
+
+if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+fi
+
+if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ 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
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$HOME" ] &&
+ HOME=`cygpath --path --windows "$HOME"`
+fi
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
+ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+ "-Dmaven.home=${M2_HOME}" \
+ ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
+
+
Property changes on: trunk/tools/maven/bin/mvnyjp
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/tools/maven/boot/classworlds-1.1.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/boot/plexus-classworlds-2.2.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/boot/plexus-classworlds-2.2.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/tools/maven/conf/settings.xml
===================================================================
--- trunk/tools/maven/conf/settings.xml 2010-06-04 15:42:55 UTC (rev 105726)
+++ trunk/tools/maven/conf/settings.xml 2010-06-04 15:57:28 UTC (rev 105727)
@@ -22,7 +22,7 @@
<!--
| This is the configuration file for Maven. It can be specified at two levels:
|
- | 1. User Level. This settings.xml file provides configuration for a single user,
+ | 1. User Level. This settings.xml file provides configuration for a single user,
| and is normally provided in ${user.home}/.m2/settings.xml.
|
| NOTE: This location can be overridden with the CLI option:
@@ -31,7 +31,7 @@
|
| 2. Global Level. This settings.xml file provides configuration for all Maven
| users on a machine (assuming they're all using the same Maven
- | installation). It's normally provided in
+ | installation). It's normally provided in
| ${maven.home}/conf/settings.xml.
|
| NOTE: This location can be overridden with the CLI option:
@@ -43,8 +43,8 @@
| values (values used when the setting is not specified) are provided.
|
|-->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<settings xmlns="http://maven.apache.org/settings/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<!-- localRepository
| The path to the local repository maven will use to store artifacts.
@@ -112,8 +112,8 @@
<!-- server
| Specifies the authentication information to use when connecting to a particular server, identified by
| a unique name within the system (referred to by the 'id' attribute below).
- |
- | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
+ |
+ | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
| used together.
|
<server>
@@ -122,7 +122,7 @@
<password>repopwd</password>
</server>
-->
-
+
<!-- Another sample, using keys to authenticate.
<server>
<id>siteServer</id>
@@ -134,13 +134,13 @@
<!-- mirrors
| This is a list of mirrors to be used in downloading artifacts from remote repositories.
- |
+ |
| It works like this: a POM may declare a repository to use in resolving certain artifacts.
| However, this repository may have problems with heavy traffic at times, so people have mirrored
| it to several places.
|
| That repository definition will have a unique id, so we can create a mirror reference for that
- | repository, to be used as an alternate download site. The mirror site will be the preferred
+ | repository, to be used as an alternate download site. The mirror site will be the preferred
| server for that repository.
|-->
<mirrors>
@@ -157,20 +157,20 @@
</mirror>
-->
</mirrors>
-
+
<!-- profiles
| This is a list of profiles which can be activated in a variety of ways, and which can modify
| the build process. Profiles provided in the settings.xml are intended to provide local machine-
| specific paths and repository locations which allow the build to work in the local environment.
|
| For example, if you have an integration testing plugin - like cactus - that needs to know where
- | your Tomcat instance is installed, you can provide a variable here such that the variable is
+ | your Tomcat instance is installed, you can provide a variable here such that the variable is
| dereferenced during the build process to configure the cactus plugin.
|
| As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
| section of this document (settings.xml) - will be discussed later. Another way essentially
| relies on the detection of a system property, either matching a particular value for the property,
- | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
+ | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
| value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
| Finally, the list of active profiles can be specified directly from the command line.
|
@@ -219,7 +219,7 @@
| <plugin>
| <groupId>org.myco.myplugins</groupId>
| <artifactId>myplugin</artifactId>
- |
+ |
| <configuration>
| <tomcatLocation>${tomcatPath}</tomcatLocation>
| </configuration>
@@ -244,49 +244,14 @@
</properties>
</profile>
-->
-
- <profile>
- <id>jboss-public-repository</id>
- <repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
</profiles>
<!-- activeProfiles
| List of profiles that are active for all builds.
- |-->
+ |
<activeProfiles>
- <activeProfile>jboss-public-repository</activeProfile>
+ <activeProfile>alwaysActiveProfile</activeProfile>
+ <activeProfile>anotherAlwaysActiveProfile</activeProfile>
</activeProfiles>
-
+ -->
</settings>
Added: trunk/tools/maven/lib/commons-cli-1.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/commons-cli-1.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/google-collections-1.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/google-collections-1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/tools/maven/lib/maven-2.2.1-uber.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/maven-artifact-3.0-beta-1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-artifact-3.0-beta-1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/maven-compat-3.0-beta-1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-compat-3.0-beta-1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/maven-core-3.0-beta-1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-core-3.0-beta-1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/maven-embedder-3.0-beta-1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-embedder-3.0-beta-1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/maven-model-3.0-beta-1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-model-3.0-beta-1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/maven-model-builder-3.0-beta-1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-model-builder-3.0-beta-1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/maven-plugin-api-3.0-beta-1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-plugin-api-3.0-beta-1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/maven-settings-3.0-beta-1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-settings-3.0-beta-1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/nekohtml-1.9.6.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/nekohtml-1.9.6.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/plexus-cipher-1.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/plexus-cipher-1.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/plexus-component-annotations-1.5.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/plexus-component-annotations-1.5.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/plexus-container-default-1.5.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/plexus-container-default-1.5.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/plexus-interpolation-1.11.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/plexus-interpolation-1.11.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/plexus-sec-dispatcher-1.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/plexus-sec-dispatcher-1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/plexus-utils-2.0.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/plexus-utils-2.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/wagon-file-1.0-beta-6.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/wagon-file-1.0-beta-6.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/wagon-http-lightweight-1.0-beta-6.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/wagon-http-lightweight-1.0-beta-6.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/wagon-http-shared-1.0-beta-6.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/wagon-http-shared-1.0-beta-6.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/wagon-provider-api-1.0-beta-6.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/wagon-provider-api-1.0-beta-6.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/xbean-reflect-3.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/xbean-reflect-3.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/tools/maven/lib/xercesMinimal-1.9.6.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/xercesMinimal-1.9.6.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-cvs-commits
mailing list