geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r424485 - /geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml
Date Fri, 21 Jul 2006 22:40:55 GMT
Author: jdillon
Date: Fri Jul 21 15:40:55 2006
New Revision: 424485

URL: http://svn.apache.org/viewvc?rev=424485&view=rev
Log:
Only define one antrun... else the pain will come

Modified:
    geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml?rev=424485&r1=424484&r2=424485&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml Fri Jul 21 15:40:55
2006
@@ -120,6 +120,15 @@
 
         <plugins>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <configuration>
+                    <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
@@ -134,25 +143,12 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
-                </configuration>
-            </plugin>
-            
-            <!--
-            HACK: Copy the generated XmlBeans bits for clover
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
+                    
+                    <!--
+                    HACK: Copy the generated XmlBeans bits for clover
+                    -->
                     <execution>
+                        <id>generate-resources</id>
                         <phase>generate-resources</phase>
                         <goals>
                             <goal>run</goal>
@@ -185,9 +181,9 @@
                         <exclude>**/Abstract*.java</exclude>
                         
                         <!--
-                           | FIXME: This test was disabled because it is failing in non-obvious
ways
-                           |        and requires someone with more insight to resolve
-                         -->
+                        FIXME: This test was disabled because it is failing in non-obvious
ways
+                               and requires someone with more insight to resolve
+                        -->
                         <exclude>**/Connector15DCBTest.java</exclude>
                     </excludes>
                 </configuration>



Mime
View raw message