geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r700230 - in /geronimo/gshell/trunk: gshell-buildsupport/javacc-maven-plugin/ gshell-buildsupport/pom.xml gshell-parser/pom.xml pom.xml
Date Mon, 29 Sep 2008 20:05:32 GMT
Author: jdillon
Date: Mon Sep 29 13:05:32 2008
New Revision: 700230

URL: http://svn.apache.org/viewvc?rev=700230&view=rev
Log:
Use the latest javacc-maven-plugin from the mojo project which works for our build.  Drop
our custom plugin.

Removed:
    geronimo/gshell/trunk/gshell-buildsupport/javacc-maven-plugin/
Modified:
    geronimo/gshell/trunk/gshell-buildsupport/pom.xml
    geronimo/gshell/trunk/gshell-parser/pom.xml
    geronimo/gshell/trunk/pom.xml

Modified: geronimo/gshell/trunk/gshell-buildsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-buildsupport/pom.xml?rev=700230&r1=700229&r2=700230&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-buildsupport/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-buildsupport/pom.xml Mon Sep 29 13:05:32 2008
@@ -38,10 +38,22 @@
     <description>
         Provides build support for GShell.
     </description>
-    
+
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-mojo</artifactId>
+                <version>1.0-rc-4-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.codehaus.groovy.maven.runtime</groupId>
+                <artifactId>gmaven-runtime-1.5</artifactId>
+                <version>1.0-rc-4-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-project</artifactId>
                 <version>2.0.5</version>
@@ -66,15 +78,21 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    
-    <modules>
-        <module>javacc-maven-plugin</module>
-    </modules>
-    
+
+    <!--
+    NOTE: Keeping this around for now, even though there are no children modules, as we might
need to add a plugin for some custom build magic soon.
+    -->
+
     <build>
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.codehaus.groovy.maven</groupId>
+                    <artifactId>gmaven-plugin</artifactId>
+                    <version>1.0-rc-4-SNAPSHOT</version>
+                </plugin>
+                
+                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
                     <executions>

Modified: geronimo/gshell/trunk/gshell-parser/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-parser/pom.xml?rev=700230&r1=700229&r2=700230&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-parser/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-parser/pom.xml Mon Sep 29 13:05:32 2008
@@ -57,38 +57,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.gshell.buildsupport</groupId>
+                <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>jjtree</id>
-                        <phase>generate-sources</phase>
                         <goals>
-                            <goal>jjtree</goal>
+                            <goal>jjtree-javacc</goal>
                         </goals>
                         <configuration>
-                            <grammars>
-                                <directory>${project.basedir}/src/main/grammar</directory>
-                                <includes>
-                                    <include>*.jjt</include>
-                                </includes>
-                            </grammars>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>javacc</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>javacc</goal>
-                        </goals>
-                        <configuration>
-                            <grammars>
-                                <directory>${project.build.directory}/generated-sources/jjtree</directory>
-                                <includes>
-                                    <include>*.jj</include>
-                                </includes>
-                            </grammars>
+                            <sourceDirectory>${project.basedir}/src/main/grammar</sourceDirectory>
                         </configuration>
                     </execution>
                 </executions>

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=700230&r1=700229&r2=700230&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Mon Sep 29 13:05:32 2008
@@ -276,24 +276,6 @@
             </dependency>
             
             <dependency>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-mojo</artifactId>
-                <version>1.0-rc-4-SNAPSHOT</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.codehaus.groovy.maven.runtime</groupId>
-                <artifactId>gmaven-runtime-1.5</artifactId>
-                <version>1.0-rc-4-SNAPSHOT</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.apache.maven.shared</groupId>
-                <artifactId>file-management</artifactId>
-                <version>1.1</version>
-            </dependency>
-            
-            <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
                 <version>2.5.5</version>
@@ -690,23 +672,9 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.codehaus.groovy.maven</groupId>
-                    <artifactId>gmaven-plugin</artifactId>
-                    <version>1.0-rc-4-SNAPSHOT</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-maven-plugin</artifactId>
-                    <version>1.3.6</version>
-                </plugin>
-                
-                <!-- INTERNAL -->
-                
-                <plugin>
-                    <groupId>org.apache.geronimo.gshell.buildsupport</groupId>
+                    <groupId>org.codehaus.mojo</groupId>
                     <artifactId>javacc-maven-plugin</artifactId>
-                    <version>1.0-alpha-2-SNAPSHOT</version>
+                    <version>2.5-SNAPSHOT</version>
                 </plugin>
             </plugins>
         </pluginManagement>



Mime
View raw message