maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: maven-components/maven-plugins pom.xml
Date Sat, 23 Oct 2004 17:31:57 GMT
jvanzyl     2004/10/23 10:31:57

  Modified:    maven-plugin-tools pom.xml
               maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator
                        AbstractGenerator.java BeanGenerator.java
                        PluginDescriptorGenerator.java
                        PluginXdocGenerator.java
               maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/jelly
                        JellyHarnessGenerator.java
               maven-plugins pom.xml
  Log:
  o use xml utils from plexus-utils
  
  Revision  Changes    Path
  1.3       +0 -5      maven-components/maven-plugin-tools/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugin-tools/pom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pom.xml	23 Oct 2004 13:39:41 -0000	1.2
  +++ pom.xml	23 Oct 2004 17:31:56 -0000	1.3
  @@ -23,11 +23,6 @@
         <version>1.2</version>
       </dependency>
       <dependency>
  -      <groupId>xstream</groupId>
  -      <artifactId>xstream</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  -    </dependency>    
  -    <dependency>
         <groupId>modello</groupId>
         <artifactId>modello</artifactId>
         <version>1.0-SNAPSHOT</version>
  
  
  
  1.3       +2 -2      maven-components/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/AbstractGenerator.java
  
  Index: AbstractGenerator.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/AbstractGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractGenerator.java	30 Sep 2004 16:10:30 -0000	1.2
  +++ AbstractGenerator.java	23 Oct 2004 17:31:56 -0000	1.3
  @@ -20,10 +20,10 @@
   import com.thoughtworks.qdox.model.DocletTag;
   import com.thoughtworks.qdox.model.JavaClass;
   import com.thoughtworks.qdox.model.JavaSource;
  -import com.thoughtworks.xstream.xml.xpp3.Xpp3Dom;
  -import com.thoughtworks.xstream.xml.xpp3.Xpp3DomBuilder;
   import org.apache.maven.plugin.descriptor.MojoDescriptor;
   import org.apache.maven.plugin.descriptor.Parameter;
  +import org.codehaus.plexus.util.xml.Xpp3Dom;
  +import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
   
   import java.io.File;
   import java.io.FileReader;
  
  
  
  1.2       +2 -2      maven-components/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/BeanGenerator.java
  
  Index: BeanGenerator.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/BeanGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BeanGenerator.java	9 Aug 2004 18:43:09 -0000	1.1
  +++ BeanGenerator.java	23 Oct 2004 17:31:56 -0000	1.2
  @@ -16,15 +16,15 @@
    * limitations under the License.
    */
   
  -import com.thoughtworks.xstream.xml.xpp3.Xpp3Dom;
  -import org.apache.maven.plugin.descriptor.Parameter;
   import org.apache.maven.plugin.descriptor.MojoDescriptor;
  +import org.apache.maven.plugin.descriptor.Parameter;
   import org.codehaus.modello.generator.java.javasource.JClass;
   import org.codehaus.modello.generator.java.javasource.JConstructor;
   import org.codehaus.modello.generator.java.javasource.JMethod;
   import org.codehaus.modello.generator.java.javasource.JParameter;
   import org.codehaus.modello.generator.java.javasource.JSourceWriter;
   import org.codehaus.modello.generator.java.javasource.JType;
  +import org.codehaus.plexus.util.xml.Xpp3Dom;
   
   import java.io.File;
   import java.io.FileWriter;
  
  
  
  1.2       +3 -3      maven-components/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginDescriptorGenerator.java
  
  Index: PluginDescriptorGenerator.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginDescriptorGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PluginDescriptorGenerator.java	9 Aug 2004 18:43:10 -0000	1.1
  +++ PluginDescriptorGenerator.java	23 Oct 2004 17:31:56 -0000	1.2
  @@ -16,11 +16,11 @@
    * limitations under the License.
    */
   
  -import com.thoughtworks.xstream.xml.XMLWriter;
  -import com.thoughtworks.xstream.xml.text.PrettyPrintXMLWriter;
  -import com.thoughtworks.xstream.xml.xpp3.Xpp3Dom;
   import org.apache.maven.plugin.descriptor.Parameter;
   import org.apache.maven.plugin.descriptor.MojoDescriptor;
  +import org.codehaus.plexus.util.xml.Xpp3Dom;
  +import org.codehaus.plexus.util.xml.XMLWriter;
  +import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
   
   import java.io.File;
   import java.io.FileWriter;
  
  
  
  1.2       +3 -3      maven-components/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginXdocGenerator.java
  
  Index: PluginXdocGenerator.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginXdocGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PluginXdocGenerator.java	9 Aug 2004 18:43:10 -0000	1.1
  +++ PluginXdocGenerator.java	23 Oct 2004 17:31:56 -0000	1.2
  @@ -16,11 +16,11 @@
    * limitations under the License.
    */
   
  -import com.thoughtworks.xstream.xml.XMLWriter;
  -import com.thoughtworks.xstream.xml.xpp3.Xpp3Dom;
  -import com.thoughtworks.xstream.xml.text.PrettyPrintXMLWriter;
   import org.apache.maven.plugin.descriptor.Parameter;
   import org.apache.maven.plugin.descriptor.MojoDescriptor;
  +import org.codehaus.plexus.util.xml.Xpp3Dom;
  +import org.codehaus.plexus.util.xml.XMLWriter;
  +import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
   
   import java.io.File;
   import java.io.FileWriter;
  
  
  
  1.2       +3 -3      maven-components/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/jelly/JellyHarnessGenerator.java
  
  Index: JellyHarnessGenerator.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/jelly/JellyHarnessGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JellyHarnessGenerator.java	9 Aug 2004 18:43:10 -0000	1.1
  +++ JellyHarnessGenerator.java	23 Oct 2004 17:31:56 -0000	1.2
  @@ -16,12 +16,12 @@
    * limitations under the License.
    */
   
  -import com.thoughtworks.xstream.xml.text.PrettyPrintXMLWriter;
  -import com.thoughtworks.xstream.xml.XMLWriter;
  -import com.thoughtworks.xstream.xml.xpp3.Xpp3Dom;
   import org.apache.maven.plugin.descriptor.Parameter;
   import org.apache.maven.plugin.descriptor.MojoDescriptor;
   import org.apache.maven.plugin.generator.AbstractGenerator;
  +import org.codehaus.plexus.util.xml.Xpp3Dom;
  +import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
  +import org.codehaus.plexus.util.xml.XMLWriter;
   
   import java.io.File;
   import java.io.FileWriter;
  
  
  
  1.12      +3 -5      maven-components/maven-plugins/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugins/pom.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- pom.xml	18 Sep 2004 01:59:21 -0000	1.11
  +++ pom.xml	23 Oct 2004 17:31:56 -0000	1.12
  @@ -51,12 +51,10 @@
         <artifactId>maven-plugin</artifactId>
         <version>2.0-SNAPSHOT</version>
       </dependency>
  -    <!-- Replace plexus dependency by plexus-util when Plexus will be split -->
       <dependency>
         <groupId>plexus</groupId>
  -      <artifactId>plexus</artifactId>
  -      <version>0.17-SNAPSHOT</version>
  -    </dependency>
  +      <artifactId>plexus-utils</artifactId>
  +      <version>1.0-alpha-1-SNAPSHOT</version>
  +    </dependency>    
     </dependencies>
  -
   </project>
  
  
  

Mime
View raw message