geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r650102 - in /geronimo/server/trunk: ./ assemblies/geronimo-boilerplate-minimal/ assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/ buildsupport/buildsupport-maven-plugin/ buildsupport/buildsupport-maven-plugin/src/main/groovy/o...
Date Mon, 21 Apr 2008 11:16:38 GMT
Author: jdillon
Date: Mon Apr 21 04:16:31 2008
New Revision: 650102

URL: http://svn.apache.org/viewvc?rev=650102&view=rev
Log:
(GERONIMO-3961) Upgrade to GMaven for Maven+Groovy integration, which uses Groovy 1.5.4

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
    geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml
    geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
    geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy
    geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=650102&r1=650101&r2=650102&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Mon Apr 21 04:16:31
2008
@@ -105,9 +105,9 @@
 
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy-all-minimal</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf?rev=650102&r1=650101&r2=650102&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
Mon Apr 21 04:16:31 2008
@@ -36,7 +36,7 @@
     load ${gshell.home}/repository/org/apache/geronimo/gshell/gshell-whisper/1.0-alpha-1/gshell-whisper-*.jar
     load ${gshell.home}/repository/org/apache/mina/mina-core/1.1.5/mina-core-*.jar
     load ${gshell.home}/repository/org/apache/mina/mina-filter-ssl/1.1.5/mina-filter-ssl-*.jar
-    load ${gshell.home}/repository/org/codehaus/groovy/groovy-all/1.1-rc-1/groovy-all-*.jar
+    load ${gshell.home}/repository/org/codehaus/groovy/groovy-all-minimal/1.5.4/groovy-all-minimal-*.jar
     load ${gshell.home}/repository/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-*.jar
     load ${gshell.home}/repository/org/slf4j/jcl104-over-slf4j/1.4.3/jcl104-over-slf4j-*.jar
 

Modified: geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml?rev=650102&r1=650101&r2=650102&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml Mon Apr 21 04:16:31
2008
@@ -38,8 +38,8 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.codehaus.mojo.groovy</groupId>
-            <artifactId>groovy-mojo-support</artifactId>
+            <groupId>org.codehaus.groovy.maven</groupId>
+            <artifactId>gmaven-mojo</artifactId>
         </dependency>
         
         <dependency>
@@ -51,12 +51,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo.groovy</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
                 <executions>
                     <execution>
                         <goals>
+                            <goal>generateStubs</goal>
                             <goal>compile</goal>
+                            <goal>generateTestStubs</goal>
+                            <goal>testCompile</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -65,6 +68,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>helpmojo</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
@@ -72,8 +82,69 @@
     <reporting>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo.groovy</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <version>2.4.1</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <quiet>true</quiet>
+                    <links>
+                        <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+                    </links>
+                    <tags>
+                        <tag>
+                            <name>goal</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>phase</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>execute</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>requiresDependencyResolution</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>parameter</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>required</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>readonly</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>component</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>plexus.component</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>plexus.requirement</name>
+                            <placement>Xf</placement>
+                        </tag>
+                    </tags>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.2</version>
             </plugin>
         </plugins>
     </reporting>

Modified: geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy?rev=650102&r1=650101&r2=650102&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
(original)
+++ geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
Mon Apr 21 04:16:31 2008
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.buildsupport
 
-import org.codehaus.mojo.groovy.GroovyMojoSupport
+import org.codehaus.groovy.maven.mojo.GroovyMojo
 
 import org.apache.maven.project.MavenProject
 
@@ -32,7 +32,7 @@
  * @version $Rev$ $Date$
  */
 class CopyXmlBeansSchemasMojo
-    extends GroovyMojoSupport
+    extends GroovyMojo
 {
     /**
      * @parameter expression="${project}"

Modified: geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy?rev=650102&r1=650101&r2=650102&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy
(original)
+++ geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy
Mon Apr 21 04:16:31 2008
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.buildsupport
 
-import org.codehaus.mojo.groovy.GroovyMojoSupport
+import org.codehaus.groovy.maven.mojo.GroovyMojo
 
 import org.apache.maven.project.MavenProject
 
@@ -32,7 +32,7 @@
  * @version $Rev$ $Date$
  */
 class FixEclipseProjectsMojo
-    extends GroovyMojoSupport
+    extends GroovyMojo
 {
     /**
      * @parameter expression="${project}"

Modified: geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml?rev=650102&r1=650101&r2=650102&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml Mon Apr 21 04:16:31
2008
@@ -68,7 +68,12 @@
         
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy-all-minimal</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
         </dependency>
         
         <dependency>
@@ -97,8 +102,6 @@
     </dependencies>
 
     <build>
-        <sourceDirectory>${pom.basedir}/src/main/groovy</sourceDirectory>
-        
         <resources>
             <resource>
                 <directory>${pom.basedir}/src/main/resources</directory>
@@ -116,24 +119,16 @@
             </resource>
         </resources>
         
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-maven-plugin</artifactId>
-                    <version>1.3.6</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo.groovy</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
                 <executions>
                     <execution>
                         <goals>
+                            <goal>generateStubs</goal>
                             <goal>compile</goal>
+                            <goal>generateTestStubs</goal>
                             <goal>testCompile</goal>
                         </goals>
                     </execution>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=650102&r1=650101&r2=650102&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Apr 21 04:16:31 2008
@@ -1664,19 +1664,25 @@
                 <artifactId>mina-filter-ssl</artifactId>
                 <version>1.1.5</version>
             </dependency>
-
+            
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-                <version>1.1-rc-1</version>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-mojo</artifactId>
+                <version>1.0-beta-4-SNAPSHOT</version>
             </dependency>
             
             <dependency>
-                <groupId>org.codehaus.mojo.groovy</groupId>
-                <artifactId>groovy-mojo-support</artifactId>
-                <version>1.0-beta-2</version>
+                <groupId>org.codehaus.groovy.maven.runtime</groupId>
+                <artifactId>gmaven-runtime-default</artifactId>
+                <version>1.0-beta-4-SNAPSHOT</version>
             </dependency>
-
+            
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all-minimal</artifactId>
+                <version>1.5.4</version>
+            </dependency>
+            
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant</artifactId>
@@ -1853,12 +1859,6 @@
                     <version>${version}</version>
                     <extensions>true</extensions>
                 </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-alpha-3</version>
-                </plugin>
                 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1869,25 +1869,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.4</version>
                     <configuration>
                         <source>1.5</source>
                     </configuration>
                 </plugin>
                 
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0-alpha-4</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-remote-resources-plugin</artifactId>
-                    <version>1.0-alpha-5</version>
-                </plugin>
-
-                <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>selenium-maven-plugin</artifactId>
                     <version>1.0-beta-2</version>
@@ -1911,15 +1899,15 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.codehaus.mojo.groovy</groupId>
-                    <artifactId>groovy-maven-plugin</artifactId>
-                    <version>1.0-beta-2</version>
+                    <groupId>org.codehaus.groovy.maven</groupId>
+                    <artifactId>gmaven-plugin</artifactId>
+                    <version>1.0-beta-4-SNAPSHOT</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.4.1</version>
                 </plugin>
 
                 <plugin>
@@ -2041,7 +2029,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.4.2</version>
                     <configuration>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     </configuration>
@@ -2131,7 +2119,7 @@
                 <plugin>
                     <groupId>org.apache.geronimo.gshell</groupId>
                     <artifactId>gshell-maven-plugin</artifactId>
-                    <version>1.0-alpha-1</version> 
+                    <version>1.0-alpha-1</version>
                 </plugin>
 
                 <plugin>
@@ -2166,6 +2154,30 @@
                     <artifactId>maven-release-plugin</artifactId>
                     <version>2.0-beta-6</version>
                 </plugin>
+                
+                <plugin>
+                    <groupId>org.codehaus.plexus</groupId>
+                    <artifactId>plexus-maven-plugin</artifactId>
+                    <version>1.3.6</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>1.0-alpha-3</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.0-alpha-4</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
+                    <version>1.0-alpha-5</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -2256,24 +2268,6 @@
                     <tagBase>https://svn.apache.org/repos/asf/geronimo/server/tags</tagBase>
                 </configuration>
             </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.mojo.groovy</groupId>
-                        <artifactId>groovy-mojo-tools</artifactId>
-                        <version>1.0-beta-2</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <extractors>
-                        <extractor>java</extractor>
-                        <extractor>groovy</extractor>
-                    </extractors>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -2282,7 +2276,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.3</version>
+                <version>2.4</version>
                 <configuration>
                     <breakiterator>true</breakiterator>
                     <quiet>true</quiet>



Mime
View raw message