Author: brett
Date: Mon May 23 21:52:39 2005
New Revision: 178075
URL: http://svn.apache.org/viewcvs?rev=178075&view=rev
Log:
fold the jelly tags back in
Added:
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/BaseTagLibrary.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/BaseTagLibrary.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/BaseTagSupport.java
- copied unchanged from r171208,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/BaseTagSupport.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/
- copied from r171208,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/AddPathTag.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/AddPathTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ConcatTag.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/ConcatTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/CopyResources.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/CopyResources.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/DependencyResolver.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/DependencyResolver.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/DependencyResolverException.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/DependencyResolverException.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/DependencyResolverInterface.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/DependencyResolverInterface.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/GrabClassLoaderTag.java
- copied unchanged from r171223,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/GrabClassLoaderTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/GraphDependencyResolver.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/GraphDependencyResolver.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/InputTag.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/InputTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/InstallPluginTag.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/InstallPluginTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/MavenTag.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/MavenTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/MavenTagLibrary.java
- copied unchanged from r171223,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/MavenTagLibrary.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/PomTag.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/PomTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/ReactorTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/RootRelativePathTag.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/RootRelativePathTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/SnapshotSignature.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/SnapshotSignature.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/UnGrabClassLoaderTag.java
- copied unchanged from r171223,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/UnGrabClassLoaderTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/UninstallPluginTag.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/maven/UninstallPluginTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/package.html
- copied unchanged from r171208,
maven/maven-1/jelly-tags/trunk/src/main/java/org/apache/maven/jelly/tags/package.html
maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/
- copied from r171208,
maven/maven-1/jelly-tags/trunk/src/test/java/org/apache/maven/jelly/
maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java
maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTestData.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTestData.java
maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/RootRelativePathTagTest.java
- copied unchanged from r171209,
maven/maven-1/jelly-tags/trunk/src/test/java/org/apache/maven/jelly/tags/maven/RootRelativePathTagTest.java
Modified:
maven/maven-1/core/trunk/project.xml
maven/maven-1/core/trunk/src/java/org/apache/maven/cli/CLIManager.java
Modified: maven/maven-1/core/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/project.xml?rev=178075&r1=178074&r2=178075&view=diff
==============================================================================
--- maven/maven-1/core/trunk/project.xml (original)
+++ maven/maven-1/core/trunk/project.xml Mon May 23 21:52:39 2005
@@ -588,11 +588,6 @@
</dependency>
<dependency>
<groupId>maven</groupId>
- <artifactId>maven-jelly-tags</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>maven</groupId>
<artifactId>maven-model</artifactId>
<version>3.0.0-SNAPSHOT</version>
</dependency>
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/cli/CLIManager.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/cli/CLIManager.java?rev=178075&r1=178074&r2=178075&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/cli/CLIManager.java
(original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/cli/CLIManager.java Mon
May 23 21:52:39 2005
@@ -68,8 +68,7 @@
options.addOption( OptionBuilder
.withLongOpt( "define" )
- .hasArgs()
- .withArgName( "property=value" )
+ .hasArg()
.withDescription( "Define a system property" )
.create( 'D' ) );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
