geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r926911 - in /geronimo/server/branches/2.1: ./ framework/modules/geronimo-service-builder/ plugins/client/geronimo-client-builder/ plugins/connector/geronimo-connector-builder/ plugins/corba/geronimo-corba-builder/ plugins/j2ee/geronimo-nam...
Date Wed, 24 Mar 2010 03:14:02 GMT
Author: rwonly
Date: Wed Mar 24 03:14:01 2010
New Revision: 926911

URL: http://svn.apache.org/viewvc?rev=926911&view=rev
Log:
GERONIMO-4616 Update xmlbeans plugin to 2.3.3 and remove all the hack codes in pom

Modified:
    geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/pom.xml
    geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/pom.xml
    geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml
    geronimo/server/branches/2.1/plugins/corba/geronimo-corba-builder/pom.xml
    geronimo/server/branches/2.1/plugins/j2ee/geronimo-naming-builder/pom.xml
    geronimo/server/branches/2.1/plugins/j2ee/geronimo-security-builder/pom.xml
    geronimo/server/branches/2.1/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
    geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/pom.xml
    geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/pom.xml
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
    geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices-builder/pom.xml
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/pom.xml Wed Mar
24 03:14:01 2010
@@ -60,21 +60,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/pom.xml Wed Mar 24
03:14:01 2010
@@ -58,21 +58,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml Wed
Mar 24 03:14:01 2010
@@ -84,21 +84,6 @@
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
             
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>

Modified: geronimo/server/branches/2.1/plugins/corba/geronimo-corba-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/corba/geronimo-corba-builder/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/corba/geronimo-corba-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/corba/geronimo-corba-builder/pom.xml Wed Mar 24 03:14:01
2010
@@ -53,21 +53,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.1/plugins/j2ee/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/geronimo-naming-builder/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/j2ee/geronimo-naming-builder/pom.xml Wed Mar 24 03:14:01
2010
@@ -55,21 +55,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.1/plugins/j2ee/geronimo-security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/geronimo-security-builder/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/j2ee/geronimo-security-builder/pom.xml Wed Mar 24
03:14:01 2010
@@ -62,21 +62,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.1/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/geronimo-web-2.5-builder/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/j2ee/geronimo-web-2.5-builder/pom.xml Wed Mar 24
03:14:01 2010
@@ -64,21 +64,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/pom.xml Wed Mar 24
03:14:01 2010
@@ -72,21 +72,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
(original)
+++ geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
Wed Mar 24 03:14:01 2010
@@ -53,21 +53,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/pom.xml Wed Mar
24 03:14:01 2010
@@ -83,21 +83,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Wed Mar 24
03:14:01 2010
@@ -145,21 +145,6 @@
                 </executions>
             </plugin>
             
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
(original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
Wed Mar 24 03:14:01 2010
@@ -67,21 +67,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices-builder/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices-builder/pom.xml
(original)
+++ geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices-builder/pom.xml
Wed Mar 24 03:14:01 2010
@@ -73,21 +73,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=926911&r1=926910&r2=926911&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Wed Mar 24 03:14:01 2010
@@ -2122,6 +2122,8 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>xmlbeans-maven-plugin</artifactId>
+                    <!-- genesis 2.0 used 2.3.1 has a problem when copy XmlBeans generated
schemas -->
+                    <version>2.3.3</version>
                     <executions>
                         <execution>
                             <goals>



Mime
View raw message