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/21 10:04:55 UTC
svn commit: r658581 - in /geronimo/gshell/trunk: ./ gshell-buildsupport/
gshell-buildsupport/gshell-maven-plugin/
gshell-buildsupport/javacc-maven-plugin/ gshell-commands/
gshell-maven-plugin/ gshell-parser/ gshell-remote/gshell-remote-client/
gshell-r...
Author: jdillon
Date: Wed May 21 01:04:55 2008
New Revision: 658581
URL: http://svn.apache.org/viewvc?rev=658581&view=rev
Log:
Move plugins to gshell-buildsupport module
Added:
geronimo/gshell/trunk/gshell-buildsupport/
geronimo/gshell/trunk/gshell-buildsupport/gshell-maven-plugin/
- copied from r658577, geronimo/gshell/trunk/gshell-maven-plugin/
geronimo/gshell/trunk/gshell-buildsupport/javacc-maven-plugin/
- copied from r658577, geronimo/gshell/trunk/javacc-maven-plugin/
geronimo/gshell/trunk/gshell-buildsupport/pom.xml (with props)
Removed:
geronimo/gshell/trunk/gshell-maven-plugin/
geronimo/gshell/trunk/javacc-maven-plugin/
Modified:
geronimo/gshell/trunk/gshell-buildsupport/gshell-maven-plugin/pom.xml
geronimo/gshell/trunk/gshell-buildsupport/javacc-maven-plugin/pom.xml
geronimo/gshell/trunk/gshell-commands/pom.xml
geronimo/gshell/trunk/gshell-parser/pom.xml
geronimo/gshell/trunk/gshell-remote/gshell-remote-client/pom.xml
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/pom.xml
geronimo/gshell/trunk/pom.xml
Modified: geronimo/gshell/trunk/gshell-buildsupport/gshell-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-buildsupport/gshell-maven-plugin/pom.xml?rev=658581&r1=658577&r2=658581&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-buildsupport/gshell-maven-plugin/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-buildsupport/gshell-maven-plugin/pom.xml Wed May 21 01:04:55 2008
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell</artifactId>
+ <groupId>org.apache.geronimo.gshell.buildsupport</groupId>
+ <artifactId>gshell-buildsupport</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
</parent>
@@ -36,34 +36,6 @@
Provides build integration with GShell.
</description>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0.5</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.gshell</groupId>
@@ -105,95 +77,5 @@
<artifactId>slf4j-simple</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>descriptor</goal>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <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/j2ee/1.4/docs/api</link>
- <!--
- <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>
</project>
Modified: geronimo/gshell/trunk/gshell-buildsupport/javacc-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-buildsupport/javacc-maven-plugin/pom.xml?rev=658581&r1=658577&r2=658581&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-buildsupport/javacc-maven-plugin/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-buildsupport/javacc-maven-plugin/pom.xml Wed May 21 01:04:55 2008
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell</artifactId>
+ <groupId>org.apache.geronimo.gshell.buildsupport</groupId>
+ <artifactId>gshell-buildsupport</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
</parent>
@@ -35,34 +35,6 @@
<description>
Provides integration with JavaCC.
</description>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0.5</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
@@ -125,30 +97,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.4</jdkName>
- <jdkLevel>1.4</jdkLevel>
- <linkModules>true</linkModules>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
@@ -173,102 +121,7 @@
<target>1.4</target>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>descriptor</goal>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.4</jdkName>
- <jdkLevel>1.4</jdkLevel>
- </configuration>
- </plugin>
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <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/j2ee/1.4/docs/api</link>
- <!--
- <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>
-
</project>
Added: geronimo/gshell/trunk/gshell-buildsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-buildsupport/pom.xml?rev=658581&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-buildsupport/pom.xml (added)
+++ geronimo/gshell/trunk/gshell-buildsupport/pom.xml Wed May 21 01:04:55 2008
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.gshell.buildsupport</groupId>
+ <artifactId>gshell-buildsupport</artifactId>
+ <name>GShell Build Support</name>
+ <packaging>pom</packaging>
+
+ <description>
+ Provides build support for GShell.
+ </description>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <modules>
+ <module>javacc-maven-plugin</module>
+ <module>gshell-maven-plugin</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ <goal>helpmojo</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <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>
+
+</project>
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-buildsupport/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-buildsupport/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-buildsupport/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/gshell/trunk/gshell-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/pom.xml?rev=658581&r1=658580&r2=658581&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/pom.xml Wed May 21 01:04:55 2008
@@ -57,7 +57,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.geronimo.gshell</groupId>
+ <groupId>org.apache.geronimo.gshell.buildsupport</groupId>
<artifactId>gshell-maven-plugin</artifactId>
<executions>
<execution>
Modified: geronimo/gshell/trunk/gshell-parser/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-parser/pom.xml?rev=658581&r1=658580&r2=658581&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-parser/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-parser/pom.xml Wed May 21 01:04:55 2008
@@ -73,7 +73,7 @@
-->
<plugin>
- <groupId>org.apache.geronimo.gshell</groupId>
+ <groupId>org.apache.geronimo.gshell.buildsupport</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<executions>
<execution>
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-client/pom.xml?rev=658581&r1=658580&r2=658581&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-client/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-client/pom.xml Wed May 21 01:04:55 2008
@@ -52,7 +52,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.geronimo.gshell</groupId>
+ <groupId>org.apache.geronimo.gshell.buildsupport</groupId>
<artifactId>gshell-maven-plugin</artifactId>
<executions>
<execution>
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/pom.xml?rev=658581&r1=658580&r2=658581&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/pom.xml Wed May 21 01:04:55 2008
@@ -52,7 +52,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.geronimo.gshell</groupId>
+ <groupId>org.apache.geronimo.gshell.buildsupport</groupId>
<artifactId>gshell-maven-plugin</artifactId>
<executions>
<execution>
Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=658581&r1=658580&r2=658581&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Wed May 21 01:04:55 2008
@@ -257,37 +257,6 @@
<version>1.0-rc-1</version>
</dependency>
- <!--
- FIXME: Have to move this to each plugin, cause these conflict with the
- bits we need from Maven 2.1
-
- Need to create a gshell-buildsupport module to hold this Maven specific crapksi
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0.5</version>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>file-management</artifactId>
@@ -469,15 +438,14 @@
</dependencies>
<modules>
+ <module>gshell-buildsupport</module>
<module>gshell-diet</module>
<module>gshell-support</module>
<module>gshell-bootstrap</module>
<module>gshell-model</module>
<module>gshell-command-api</module>
- <module>javacc-maven-plugin</module>
<module>gshell-parser</module>
<module>gshell-core</module>
- <module>gshell-maven-plugin</module>
<module>gshell-cli</module>
<module>gshell-whisper</module>
<module>gshell-commands</module>
@@ -634,13 +602,13 @@
<!-- INTERNAL -->
<plugin>
- <groupId>org.apache.geronimo.gshell</groupId>
+ <groupId>org.apache.geronimo.gshell.buildsupport</groupId>
<artifactId>gshell-maven-plugin</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
</plugin>
<plugin>
- <groupId>org.apache.geronimo.gshell</groupId>
+ <groupId>org.apache.geronimo.gshell.buildsupport</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
</plugin>