geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r512096 - in /geronimo/genesis/trunk/plugins: ./ maven-maven-plugin/ maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/ tools-maven-plugin/ tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/
Date Tue, 27 Feb 2007 00:58:05 GMT
Author: jdillon
Date: Mon Feb 26 16:58:04 2007
New Revision: 512096

URL: http://svn.apache.org/viewvc?view=rev&rev=512096
Log:
Use new plugin-support, drop old modules and uneeded config

Modified:
    geronimo/genesis/trunk/plugins/maven-maven-plugin/pom.xml
    geronimo/genesis/trunk/plugins/maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/InvokeMavenMojo.java
    geronimo/genesis/trunk/plugins/pom.xml
    geronimo/genesis/trunk/plugins/tools-maven-plugin/pom.xml
    geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/CopyLegalFilesMojo.java
    geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/RequireJavaVersionMojo.java
    geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/RequireMavenVersionMojo.java
    geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/SetProjectFileMojo.java
    geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/ShowDependenciesMojo.java
    geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/ShowPropertiesMojo.java
    geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/VerifyLegalFilesMojo.java

Modified: geronimo/genesis/trunk/plugins/maven-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/maven-maven-plugin/pom.xml?view=diff&rev=512096&r1=512095&r2=512096
==============================================================================
--- geronimo/genesis/trunk/plugins/maven-maven-plugin/pom.xml (original)
+++ geronimo/genesis/trunk/plugins/maven-maven-plugin/pom.xml Mon Feb 26 16:58:04 2007
@@ -38,25 +38,6 @@
     <description>
         Goals to invoke Maven in a sub-process.
     </description>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.genesis.plugins</groupId>
-            <artifactId>plugin-support</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <configuration>
-                    <goalPrefix>maven</goalPrefix>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
 </project>
 

Modified: geronimo/genesis/trunk/plugins/maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/InvokeMavenMojo.java
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/InvokeMavenMojo.java?view=diff&rev=512096&r1=512095&r2=512096
==============================================================================
--- geronimo/genesis/trunk/plugins/maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/InvokeMavenMojo.java
(original)
+++ geronimo/genesis/trunk/plugins/maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/InvokeMavenMojo.java
Mon Feb 26 16:58:04 2007
@@ -25,8 +25,8 @@
 import java.util.Map;
 import java.util.Iterator;
 
-import org.apache.geronimo.genesis.MojoSupport;
-import org.apache.geronimo.genesis.ant.AntHelper;
+import org.codehaus.mojo.pluginsupport.MojoSupport;
+import org.codehaus.mojo.pluginsupport.ant.AntHelper;
 
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.plugin.MojoExecutionException;

Modified: geronimo/genesis/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/pom.xml?view=diff&rev=512096&r1=512095&r2=512096
==============================================================================
--- geronimo/genesis/trunk/plugins/pom.xml (original)
+++ geronimo/genesis/trunk/plugins/pom.xml Mon Feb 26 16:58:04 2007
@@ -47,82 +47,10 @@
                 <artifactId>commons-lang</artifactId>
                 <version>2.2</version>
             </dependency>
-            
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.2</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>commons-jexl</groupId>
-                <artifactId>commons-jexl</artifactId>
-                <version>1.1</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>ant</groupId>
-                <artifactId>ant</artifactId>
-                <version>1.6.5</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>ant</groupId>
-                <artifactId>ant-nodeps</artifactId>
-                <version>1.6.5</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>ant</groupId>
-                <artifactId>ant-launcher</artifactId>
-                <version>1.6.5</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>ant</groupId>
-                <artifactId>ant-apache-oro</artifactId>
-                <version>1.6.5</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>oro</groupId>
-                <artifactId>oro</artifactId>
-                <version>2.0.8</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>plugin-support</artifactId>
-                <version>1.2-SNAPSHOT</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     
     <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>2.0.4</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-project</artifactId>
-            <version>2.0.4</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-artifact</artifactId>
-            <version>2.0.4</version>
-        </dependency>
-        
         <!--
         NOTE: Include newer plexus-utils to gain access to a richer CommandLine API
         -->
@@ -131,6 +59,12 @@
             <artifactId>plexus-utils</artifactId>
             <version>1.2</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>plugin-support</artifactId>
+            <version>1.0-alpha-1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     
     <build>
@@ -169,9 +103,7 @@
     </build>
     
     <modules>
-        <module>plugin-support</module>
         <module>tools-maven-plugin</module>
-        <module>script-maven-plugin</module>
         <module>maven-maven-plugin</module>
     </modules>
     

Modified: geronimo/genesis/trunk/plugins/tools-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/tools-maven-plugin/pom.xml?view=diff&rev=512096&r1=512095&r2=512096
==============================================================================
--- geronimo/genesis/trunk/plugins/tools-maven-plugin/pom.xml (original)
+++ geronimo/genesis/trunk/plugins/tools-maven-plugin/pom.xml Mon Feb 26 16:58:04 2007
@@ -41,27 +41,10 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.genesis.plugins</groupId>
-            <artifactId>plugin-support</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <configuration>
-                    <goalPrefix>tools</goalPrefix>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
 </project>
 

Modified: geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/CopyLegalFilesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/CopyLegalFilesMojo.java?view=diff&rev=512096&r1=512095&r2=512096
==============================================================================
--- geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/CopyLegalFilesMojo.java
(original)
+++ geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/CopyLegalFilesMojo.java
Mon Feb 26 16:58:04 2007
@@ -29,8 +29,8 @@
 import org.apache.tools.ant.taskdefs.Copy;
 import org.apache.tools.ant.types.FileSet;
 
-import org.apache.geronimo.genesis.MojoSupport;
-import org.apache.geronimo.genesis.ant.AntHelper;
+import org.codehaus.mojo.pluginsupport.MojoSupport;
+import org.codehaus.mojo.pluginsupport.ant.AntHelper;
 
 /**
  * Copy legal files for inclusion into generated jars.

Modified: geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/RequireJavaVersionMojo.java
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/RequireJavaVersionMojo.java?view=diff&rev=512096&r1=512095&r2=512096
==============================================================================
--- geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/RequireJavaVersionMojo.java
(original)
+++ geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/RequireJavaVersionMojo.java
Mon Feb 26 16:58:04 2007
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.genesis.plugins.tools;
 
-import org.apache.geronimo.genesis.MojoSupport;
+import org.codehaus.mojo.pluginsupport.MojoSupport;
 
 import org.apache.commons.lang.SystemUtils;
 

Modified: geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/RequireMavenVersionMojo.java
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/RequireMavenVersionMojo.java?view=diff&rev=512096&r1=512095&r2=512096
==============================================================================
--- geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/RequireMavenVersionMojo.java
(original)
+++ geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/RequireMavenVersionMojo.java
Mon Feb 26 16:58:04 2007
@@ -22,7 +22,8 @@
 import java.util.Properties;
 import java.io.InputStream;
 
-import org.apache.geronimo.genesis.MojoSupport;
+import org.codehaus.mojo.pluginsupport.MojoSupport;
+
 import org.apache.maven.plugin.MojoFailureException;
 
 /**

Modified: geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/SetProjectFileMojo.java
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/SetProjectFileMojo.java?view=diff&rev=512096&r1=512095&r2=512096
==============================================================================
--- geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/SetProjectFileMojo.java
(original)
+++ geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/SetProjectFileMojo.java
Mon Feb 26 16:58:04 2007
@@ -19,7 +19,8 @@
 
 package org.apache.geronimo.genesis.plugins.tools;
 
-import org.apache.geronimo.genesis.MojoSupport;
+import org.codehaus.mojo.pluginsupport.MojoSupport;
+
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.artifact.Artifact;
 

Modified: geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/ShowDependenciesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/ShowDependenciesMojo.java?view=diff&rev=512096&r1=512095&r2=512096
==============================================================================
--- geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/ShowDependenciesMojo.java
(original)
+++ geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/ShowDependenciesMojo.java
Mon Feb 26 16:58:04 2007
@@ -27,10 +27,10 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 
-import org.apache.geronimo.genesis.dependency.DependencyHelper;
-import org.apache.geronimo.genesis.dependency.DependencyTree;
-import org.apache.geronimo.genesis.dependency.DependencyTree.Node;
-import org.apache.geronimo.genesis.MojoSupport;
+import org.codehaus.mojo.pluginsupport.dependency.DependencyHelper;
+import org.codehaus.mojo.pluginsupport.dependency.DependencyTree;
+import org.codehaus.mojo.pluginsupport.dependency.DependencyTree.Node;
+import org.codehaus.mojo.pluginsupport.MojoSupport;
 
 /**
  * Helper to show a projects dependencies.

Modified: geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/ShowPropertiesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/ShowPropertiesMojo.java?view=diff&rev=512096&r1=512095&r2=512096
==============================================================================
--- geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/ShowPropertiesMojo.java
(original)
+++ geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/ShowPropertiesMojo.java
Mon Feb 26 16:58:04 2007
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.genesis.plugins.tools;
 
-import org.apache.geronimo.genesis.MojoSupport;
+import org.codehaus.mojo.pluginsupport.MojoSupport;
 
 import org.apache.maven.project.MavenProject;
 

Modified: geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/VerifyLegalFilesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/VerifyLegalFilesMojo.java?view=diff&rev=512096&r1=512095&r2=512096
==============================================================================
--- geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/VerifyLegalFilesMojo.java
(original)
+++ geronimo/genesis/trunk/plugins/tools-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/tools/VerifyLegalFilesMojo.java
Mon Feb 26 16:58:04 2007
@@ -32,7 +32,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.artifact.Artifact;
 
-import org.apache.geronimo.genesis.MojoSupport;
+import org.codehaus.mojo.pluginsupport.MojoSupport;
 
 /**
  * Verify (kinda) that legal files are in all attached zip-encoded artifacts.



Mime
View raw message