You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/05/12 09:31:40 UTC
svn commit: r655426 - in /geronimo/server/branches/2.1: ./
assemblies/geronimo-boilerplate-minimal/
assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/
buildsupport/buildsupport-maven-plugin/
buildsupport/buildsupport-maven-plugin/src/main/g...
Author: jdillon
Date: Mon May 12 00:31:40 2008
New Revision: 655426
URL: http://svn.apache.org/viewvc?rev=655426&view=rev
Log:
(GERONIMO-3858) Update to use latest GMaven and Groovy 1.5.6
Modified:
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/pom.xml
geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy
geronimo/server/branches/2.1/framework/modules/geronimo-commands/pom.xml
geronimo/server/branches/2.1/pom.xml
geronimo/server/branches/2.1/repository/pom.xml
Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=655426&r1=655425&r2=655426&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml Mon May 12 00:31:40 2008
@@ -103,9 +103,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/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf?rev=655426&r1=655425&r2=655426&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf Mon May 12 00:31:40 2008
@@ -26,6 +26,9 @@
[gshell]
load ${gshell.home}/etc
load ${gshell.home}/lib/gshell/*.jar
+ load ${gshell.home}/lib/geronimo-kernel-*.jar
+ load ${gshell.home}/lib/log4j-*.jar
+ load ${gshell.home}/lib/cglib-nodep-*.jar
load ${gshell.home}/repository/org/apache/ant/ant/1.7.0/ant-*.jar
load ${gshell.home}/repository/org/apache/ant/ant-launcher/1.7.0-G589756/ant-launcher-*.jar
load ${gshell.home}/repository/org/apache/geronimo/gshell/gshell-cli/1.0-alpha-1/gshell-cli-*.jar
@@ -36,16 +39,9 @@
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.6/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
-
- ##
- ## HACK: For now pick these up from the normal lib/*
- ##
- load ${gshell.home}/lib/geronimo-kernel-*.jar
- load ${gshell.home}/lib/log4j-*.jar
- load ${gshell.home}/lib/cglib-nodep-*.jar
load ${gshell.home}/repository/org/apache/geronimo/specs/geronimo-javaee-deployment_1.1MR3_spec/1.0/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.1.2-SNAPSHOT/geronimo-cli-*.jar
load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1.2-SNAPSHOT/geronimo-deploy-config-*.jar
Modified: geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/pom.xml?rev=655426&r1=655425&r2=655426&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/pom.xml Mon May 12 00:31:40 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>
@@ -68,14 +71,5 @@
</plugin>
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo.groovy</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy?rev=655426&r1=655425&r2=655426&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy (original)
+++ geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy Mon May 12 00:31:40 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/branches/2.1/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy?rev=655426&r1=655425&r2=655426&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy (original)
+++ geronimo/server/branches/2.1/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy Mon May 12 00:31:40 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/branches/2.1/framework/modules/geronimo-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-commands/pom.xml?rev=655426&r1=655425&r2=655426&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-commands/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-commands/pom.xml Mon May 12 00:31:40 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>
@@ -128,12 +133,14 @@
<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/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=655426&r1=655425&r2=655426&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Mon May 12 00:31:40 2008
@@ -1655,15 +1655,27 @@
</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-rc-2</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-rc-2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy.maven.support</groupId>
+ <artifactId>slf4j-gossip</artifactId>
+ <version>1.0-rc-2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all-minimal</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
@@ -1900,9 +1912,9 @@
</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-rc-2</version>
</plugin>
<plugin>
@@ -2246,24 +2258,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>
Modified: geronimo/server/branches/2.1/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/pom.xml?rev=655426&r1=655425&r2=655426&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/pom.xml (original)
+++ geronimo/server/branches/2.1/repository/pom.xml Mon May 12 00:31:40 2008
@@ -160,7 +160,6 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
</dependency>
-
</dependencies>
<repositories>