geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r942433 - in /geronimo/server/trunk: ./ framework/buildsupport/buildsupport-maven-plugin/ framework/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/ framework/modules/geronimo-config-groovy-transformer/
Date Sat, 08 May 2010 18:16:44 GMT
Author: djencks
Date: Sat May  8 18:16:44 2010
New Revision: 942433

URL: http://svn.apache.org/viewvc?rev=942433&view=rev
Log:
GERONIMO-5290 upgrade gmaven to most recent version that builds maven plugins

Modified:
    geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/pom.xml
    geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
    geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy
    geronimo/server/trunk/framework/modules/geronimo-config-groovy-transformer/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/pom.xml?rev=942433&r1=942432&r2=942433&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/pom.xml Sat May
 8 18:16:44 2010
@@ -38,11 +38,25 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.codehaus.groovy.maven</groupId>
+            <groupId>org.codehaus.gmaven</groupId>
             <artifactId>gmaven-mojo</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.gmaven.runtime</groupId>
+            <artifactId>gmaven-runtime-1.6</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.sonatype.gossip</groupId>
+            <artifactId>gossip</artifactId>
+        </dependency>
         
         <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
         </dependency>
@@ -51,18 +65,18 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
+                <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generateStubs</goal>
-                            <goal>compile</goal>
-                            <goal>generateTestStubs</goal>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<goals>-->
+                            <!--<goal>generateStubs</goal>-->
+                            <!--<goal>compile</goal>-->
+                            <!--<goal>generateTestStubs</goal>-->
+                            <!--<goal>testCompile</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
             </plugin>
 
             <plugin>

Modified: geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy?rev=942433&r1=942432&r2=942433&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
(original)
+++ geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
Sat May  8 18:16:44 2010
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.buildsupport
 
-import org.codehaus.groovy.maven.mojo.GroovyMojo
+import org.codehaus.gmaven.mojo.GroovyMojo
 
 import org.apache.maven.project.MavenProject
 

Modified: geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy?rev=942433&r1=942432&r2=942433&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy
(original)
+++ geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy
Sat May  8 18:16:44 2010
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.buildsupport
 
-import org.codehaus.groovy.maven.mojo.GroovyMojo
+import org.codehaus.gmaven.mojo.GroovyMojo
 
 import org.apache.maven.project.MavenProject
 

Modified: geronimo/server/trunk/framework/modules/geronimo-config-groovy-transformer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-config-groovy-transformer/pom.xml?rev=942433&r1=942432&r2=942433&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-config-groovy-transformer/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-config-groovy-transformer/pom.xml Sat
May  8 18:16:44 2010
@@ -36,17 +36,17 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all-minimal</artifactId>
+            <artifactId>groovy-all</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
             <artifactId>testsupport-common</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -54,18 +54,18 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
+                <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generateStubs</goal>
-                            <goal>compile</goal>
-                            <goal>generateTestStubs</goal>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<goals>-->
+                            <!--<goal>generateStubs</goal>-->
+                            <!--<goal>compile</goal>-->
+                            <!--<goal>generateTestStubs</goal>-->
+                            <!--<goal>testCompile</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
             </plugin>
         </plugins>
     </build>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=942433&r1=942432&r2=942433&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat May  8 18:16:44 2010
@@ -56,7 +56,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>${version}</geronimoVersion>
+        <geronimoVersion>${project.version}</geronimoVersion>
 
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
         <warnOnDependencyChange>true</warnOnDependencyChange>
@@ -82,25 +82,25 @@
 
         <txmanagerVersion>3.0</txmanagerVersion>
 
-        <monitoringConsoleVersion>${version}</monitoringConsoleVersion>
+        <monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
         <pax.logging.version>1.5.0</pax.logging.version>
 
         <!-- Deployers -->
-        <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car
+        <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${project.version}/car
         </gbeanDeployerBootstrap>
-        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${version}/car</j2eeDeployer>
-        <clientDeployer>org.apache.geronimo.configs/client-deployer/${version}/car</clientDeployer>
-        <connectorDeployer>org.apache.geronimo.configs/connector-deployer-1_6/${version}/car</connectorDeployer>
-        <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${version}/car</openejbDeployer>
-        <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</openejbcorbaDeployer>
-        <axisDeployer>org.apache.geronimo.configs/axis-deployer/${version}/car</axisDeployer>
-        <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${version}/car</cxfDeployer>
-        <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${version}/car</axis2Deployer>
-        <tomcatDeployer>org.apache.geronimo.configs/tomcat7-deployer/${version}/car</tomcatDeployer>
-        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${version}/car</jettyDeployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${version}/car</jasperDeployer>
-        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</jpaDeployer>
+        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${project.version}/car</gbeanDeployer>
+        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${project.version}/car</j2eeDeployer>
+        <clientDeployer>org.apache.geronimo.configs/client-deployer/${project.version}/car</clientDeployer>
+        <connectorDeployer>org.apache.geronimo.configs/connector-deployer-1_6/${project.version}/car</connectorDeployer>
+        <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${project.version}/car</openejbDeployer>
+        <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${project.version}/car</openejbcorbaDeployer>
+        <axisDeployer>org.apache.geronimo.configs/axis-deployer/${project.version}/car</axisDeployer>
+        <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${project.version}/car</cxfDeployer>
+        <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${project.version}/car</axis2Deployer>
+        <tomcatDeployer>org.apache.geronimo.configs/tomcat7-deployer/${project.version}/car</tomcatDeployer>
+        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${project.version}/car</jettyDeployer>
+        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${project.version}/car</jasperDeployer>
+        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${project.version}/car</jpaDeployer>
 
         <!-- Common plan properties -->
         <planServerHostname>0.0.0.0</planServerHostname>
@@ -1612,29 +1612,39 @@
             </dependency>
 
             <dependency>
-                <groupId>org.codehaus.groovy.maven</groupId>
+                <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>gmaven-mojo</artifactId>
-                <version>1.0-rc-2</version>
+                <version>1.2</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.codehaus.gmaven.runtime</groupId>
+                        <artifactId>gmaven-runtime-1.5</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.codehaus.groovy</groupId>
+                        <artifactId>groovy-all-minimal</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>org.codehaus.groovy.maven.runtime</groupId>
-                <artifactId>gmaven-runtime-default</artifactId>
-                <version>1.0-rc-2</version>
+                <groupId>org.codehaus.gmaven.runtime</groupId>
+                <artifactId>gmaven-runtime-1.6</artifactId>
+                <version>1.2</version>
             </dependency>
 
             <dependency>
-                <groupId>org.codehaus.groovy.maven.support</groupId>
-                <artifactId>slf4j-gossip</artifactId>
-                <version>1.0-rc-2</version>
+                <groupId>org.sonatype.gossip</groupId>
+                <artifactId>gossip</artifactId>
+                <version>1.2</version>
             </dependency>
 
             <dependency>
                 <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all-minimal</artifactId>
-                <version>1.5.6</version>
+                <artifactId>groovy-all</artifactId>
+                <version>1.6.0</version>
             </dependency>
-
+            
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant</artifactId>
@@ -1986,6 +1996,24 @@ only found in cxf
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.codehaus.gmaven</groupId>
+                    <artifactId>gmaven-plugin</artifactId>
+                    <version>1.2</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>generateStubs</goal>
+                                <goal>compile</goal>
+                                <goal>generateTestStubs</goal>
+                                <goal>testCompile</goal>
+                            </goals>
+                            <configuration>
+                                <providerSelection>1.6</providerSelection>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
 
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -2141,26 +2169,26 @@ only found in cxf
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>buildsupport-maven-plugin</artifactId>
-                    <version>${version}</version>
+                    <version>${project.version}</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>car-maven-plugin</artifactId>
-                    <version>${version}</version>
+                    <version>${project.version}</version>
                     <extensions>true</extensions>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>testsuite-maven-plugin</artifactId>
-                    <version>${version}</version>
+                    <version>${project.version}</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>geronimo-maven-plugin</artifactId>
-                    <version>${version}</version>
+                    <version>${project.version}</version>
 
                     <configuration>
                         <assemblies>
@@ -2168,7 +2196,7 @@ only found in cxf
                                 <id>jetty</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-jetty8-javaee6</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
                             </assembly>
@@ -2177,7 +2205,7 @@ only found in cxf
                                 <id>jetty-minimal</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-jetty8-minimal</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
                             </assembly>
@@ -2186,7 +2214,7 @@ only found in cxf
                                 <id>tomcat</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-tomcat7-javaee6</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
                             </assembly>
@@ -2195,7 +2223,7 @@ only found in cxf
                                 <id>tomcat-minimal</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-tomcat7-minimal</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
                             </assembly>
@@ -2204,7 +2232,7 @@ only found in cxf
                                 <id>framework</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-framework</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
                             </assembly>



Mime
View raw message