You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/09/19 06:04:43 UTC

svn commit: r696914 - in /geronimo/server/trunk/plugingroups: client/pom.xml clustering/pom.xml ejb/pom.xml framework/pom.xml jms/pom.xml persistence/pom.xml pom.xml web-jetty/pom.xml web-tomcat/pom.xml webservices-axis2/pom.xml webservices-cxf/pom.xml

Author: gawor
Date: Thu Sep 18 21:04:42 2008
New Revision: 696914

URL: http://svn.apache.org/viewvc?rev=696914&view=rev
Log:
clean up plugingroup poms a bit and fix so the the geronimo-plugin.xml have the right info

Modified:
    geronimo/server/trunk/plugingroups/client/pom.xml
    geronimo/server/trunk/plugingroups/clustering/pom.xml
    geronimo/server/trunk/plugingroups/ejb/pom.xml
    geronimo/server/trunk/plugingroups/framework/pom.xml
    geronimo/server/trunk/plugingroups/jms/pom.xml
    geronimo/server/trunk/plugingroups/persistence/pom.xml
    geronimo/server/trunk/plugingroups/pom.xml
    geronimo/server/trunk/plugingroups/web-jetty/pom.xml
    geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
    geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml

Modified: geronimo/server/trunk/plugingroups/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/client/pom.xml?rev=696914&r1=696913&r2=696914&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/client/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/client/pom.xml Thu Sep 18 21:04:42 2008
@@ -61,30 +61,4 @@
 
 </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-plugin-metadata</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>prepare-metadata</goal>
-                        </goals>
-                        <configuration>
-                            <useMavenDependencies>
-                                <value>true</value>
-                                <includeVersion>true</includeVersion>
-                            </useMavenDependencies>
-                            <category>Geronimo Plugin Group</category>
-                            <pluginGroup>true</pluginGroup>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: geronimo/server/trunk/plugingroups/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/clustering/pom.xml?rev=696914&r1=696913&r2=696914&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/clustering/pom.xml Thu Sep 18 21:04:42 2008
@@ -53,30 +53,4 @@
         </dependency>
 </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-plugin-metadata</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>prepare-metadata</goal>
-                        </goals>
-                        <configuration>
-                            <useMavenDependencies>
-                                <value>true</value>
-                                <includeVersion>true</includeVersion>
-                            </useMavenDependencies>
-                            <category>Geronimo Plugin Group</category>
-                            <pluginGroup>true</pluginGroup>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: geronimo/server/trunk/plugingroups/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/ejb/pom.xml?rev=696914&r1=696913&r2=696914&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/ejb/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/ejb/pom.xml Thu Sep 18 21:04:42 2008
@@ -53,30 +53,4 @@
         </dependency>
 </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-plugin-metadata</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>prepare-metadata</goal>
-                        </goals>
-                        <configuration>
-                            <useMavenDependencies>
-                                <value>true</value>
-                                <includeVersion>true</includeVersion>
-                            </useMavenDependencies>
-                            <category>Geronimo Plugin Group</category>
-                            <pluginGroup>true</pluginGroup>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: geronimo/server/trunk/plugingroups/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/framework/pom.xml?rev=696914&r1=696913&r2=696914&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/framework/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/framework/pom.xml Thu Sep 18 21:04:42 2008
@@ -120,29 +120,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-plugin-metadata</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>prepare-metadata</goal>
-                        </goals>
-                        <configuration>
-                            <useMavenDependencies>
-                                <value>true</value>
-                                <includeVersion>true</includeVersion>
-                            </useMavenDependencies>
-                            <category>Geronimo Plugin Group</category>
-                            <pluginGroup>true</pluginGroup>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
+</project>

Modified: geronimo/server/trunk/plugingroups/jms/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/jms/pom.xml?rev=696914&r1=696913&r2=696914&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/jms/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/jms/pom.xml Thu Sep 18 21:04:42 2008
@@ -46,30 +46,4 @@
         </dependency>
 </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-plugin-metadata</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>prepare-metadata</goal>
-                        </goals>
-                        <configuration>
-                            <useMavenDependencies>
-                                <value>true</value>
-                                <includeVersion>true</includeVersion>
-                            </useMavenDependencies>
-                            <category>Geronimo Plugin Group</category>
-                            <pluginGroup>true</pluginGroup>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: geronimo/server/trunk/plugingroups/persistence/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/persistence/pom.xml?rev=696914&r1=696913&r2=696914&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/persistence/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/persistence/pom.xml Thu Sep 18 21:04:42 2008
@@ -53,30 +53,4 @@
         </dependency>
 </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-plugin-metadata</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>prepare-metadata</goal>
-                        </goals>
-                        <configuration>
-                            <useMavenDependencies>
-                                <value>true</value>
-                                <includeVersion>true</includeVersion>
-                            </useMavenDependencies>
-                            <category>Geronimo Plugin Group</category>
-                            <pluginGroup>true</pluginGroup>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: geronimo/server/trunk/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/pom.xml?rev=696914&r1=696913&r2=696914&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/pom.xml Thu Sep 18 21:04:42 2008
@@ -39,7 +39,32 @@
         <module>webservices-axis2</module>
         <module>webservices-cxf</module>
         <module>client</module>
-    <module>framework</module>
+        <module>framework</module>
   </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <!-- Install as extention to allow 'car' packaging to be used. -->
+                <extensions>true</extensions>
+                <configuration>
+                    <archive>
+                        <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                        <useTransitiveDependencies>true</useTransitiveDependencies>
+                    </useMavenDependencies>
+                    <osiApproved>true</osiApproved>
+                    <category>Geronimo Plugin Group</category>
+                    <pluginGroup>true</pluginGroup>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     
-</project>
\ No newline at end of file
+</project>

Modified: geronimo/server/trunk/plugingroups/web-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-jetty/pom.xml?rev=696914&r1=696913&r2=696914&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-jetty/pom.xml Thu Sep 18 21:04:42 2008
@@ -121,30 +121,4 @@
 
 </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-plugin-metadata</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>prepare-metadata</goal>
-                        </goals>
-                        <configuration>
-                            <useMavenDependencies>
-                                <value>true</value>
-                                <includeVersion>true</includeVersion>
-                            </useMavenDependencies>
-                            <category>Geronimo Plugin Group</category>
-                            <pluginGroup>true</pluginGroup>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-tomcat/pom.xml?rev=696914&r1=696913&r2=696914&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-tomcat/pom.xml Thu Sep 18 21:04:42 2008
@@ -121,30 +121,4 @@
 
 </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-plugin-metadata</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>prepare-metadata</goal>
-                        </goals>
-                        <configuration>
-                            <useMavenDependencies>
-                                <value>true</value>
-                                <includeVersion>true</includeVersion>
-                            </useMavenDependencies>
-                            <category>Geronimo Plugin Group</category>
-                            <pluginGroup>true</pluginGroup>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml?rev=696914&r1=696913&r2=696914&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml Thu Sep 18 21:04:42 2008
@@ -67,30 +67,4 @@
         </dependency>
 </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-plugin-metadata</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>prepare-metadata</goal>
-                        </goals>
-                        <configuration>
-                            <useMavenDependencies>
-                                <value>true</value>
-                                <includeVersion>true</includeVersion>
-                            </useMavenDependencies>
-                            <category>Geronimo Plugin Group</category>
-                            <pluginGroup>true</pluginGroup>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml?rev=696914&r1=696913&r2=696914&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml Thu Sep 18 21:04:42 2008
@@ -67,30 +67,4 @@
         </dependency>
 </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-plugin-metadata</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>prepare-metadata</goal>
-                        </goals>
-                        <configuration>
-                            <useMavenDependencies>
-                                <value>true</value>
-                                <includeVersion>true</includeVersion>
-                            </useMavenDependencies>
-                            <category>Geronimo Plugin Group</category>
-                            <pluginGroup>true</pluginGroup>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>