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 2006/11/27 00:37:13 UTC
svn commit: r479457 - in /maven/components/branches/maven.new/maven-cli:
pom.xml src/assemble/bin.xml src/bin/mvn src/bin/mvn.bat
Author: jvanzyl
Date: Sun Nov 26 15:37:13 2006
New Revision: 479457
URL: http://svn.apache.org/viewvc?view=rev&rev=479457
Log:
o committing more patches by andy
Modified:
maven/components/branches/maven.new/maven-cli/pom.xml
maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml
maven/components/branches/maven.new/maven-cli/src/bin/mvn
maven/components/branches/maven.new/maven-cli/src/bin/mvn.bat
Modified: maven/components/branches/maven.new/maven-cli/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-cli/pom.xml?view=diff&rev=479457&r1=479456&r2=479457
==============================================================================
--- maven/components/branches/maven.new/maven-cli/pom.xml (original)
+++ maven/components/branches/maven.new/maven-cli/pom.xml Sun Nov 26 15:37:13 2006
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml?view=diff&rev=479457&r1=479456&r2=479457
==============================================================================
--- maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml (original)
+++ maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml Sun Nov 26 15:37:13 2006
@@ -66,7 +66,8 @@
<outputDirectory>lib</outputDirectory>
<excludes>
<exclude>org.codehaus.plexus:plexus-container-default</exclude>
- <exclude>org.codehaus.plexus:plexus-classworlds</exclude>
+ <exclude>org.codehaus.plexus:plexus-component-api</exclude>
+ <exclude>org.codehaus.plexus.plexus:plexus-classworlds</exclude>
<exclude>org.codehaus.plexus:plexus-utils</exclude>
<!-- transitively picked up via default container - not needed -->
<exclude>plexus:plexus-utils</exclude>
Modified: maven/components/branches/maven.new/maven-cli/src/bin/mvn
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-cli/src/bin/mvn?view=diff&rev=479457&r1=479456&r2=479457
==============================================================================
--- maven/components/branches/maven.new/maven-cli/src/bin/mvn (original)
+++ maven/components/branches/maven.new/maven-cli/src/bin/mvn Sun Nov 26 15:37:13 2006
@@ -143,7 +143,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
Modified: maven/components/branches/maven.new/maven-cli/src/bin/mvn.bat
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-cli/src/bin/mvn.bat?view=diff&rev=479457&r1=479456&r2=479457
==============================================================================
--- maven/components/branches/maven.new/maven-cli/src/bin/mvn.bat (original)
+++ maven/components/branches/maven.new/maven-cli/src/bin/mvn.bat Sun Nov 26 15:37:13 2006
@@ -123,7 +123,7 @@
@REM Start MAVEN2
for %%i in ("%M2_HOME%"\core\boot\classworlds-*) do set CLASSWORLDS_JAR="%%i"
-%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%
+%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.plexus.classworlds.launcher.Launcher %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end