geronimo-scm mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=424473&view=rev
Log:
Only one antrun plugin is allow... using 2 makes Maven go insane

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

Modified: geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder/pom.xml?rev=424473&r1=424472&r2=424473&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder/pom.xml Fri Jul 21 15:11:42
2006
@@ -74,17 +74,40 @@
             <plugin>
                 <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>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
+                                <copy todir="${pom.basedir}/target/clover/classes">
+                                    <fileset dir="${pom.basedir}/target/classes">
+                                        <include name="schemaorg_apache_xmlbeans/**"/>
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                    
+                    <!--
+                    FIXME: WTF is this for?  Document or remove
+                    -->
                     <execution>
                         <id>process-test-resources</id>
                         <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                         <configuration>
                             <tasks>
-                                <!--
-                                
-                                FIXME: WTF is this for?  Document or remove
-                                
-                                -->
-                                <echo message="classpath=${project.compileClasspathElements}"
file="classpath.properties"/>
+                                <echo message="classpath=${project.compileClasspathElements}"
+                                      file="classpath.properties"/>
                                 <ant antfile="${basedir}/src/test/test-setup.xml">
                                     <property name="maven.compile.source" value="1.4"/>
                                     <property name="maven.compile.target" value="1.4"/>
@@ -92,45 +115,16 @@
                                 <delete file="classpath.properties" failonerror="false"/>
                             </tasks>
                         </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
                     </execution>
                 </executions>
             </plugin>
-
+            
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
                 <configuration>
                     <sourceSchemas>geronimo-application-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>
-                    <execution>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>



Mime
View raw message