continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r937117 - in /continuum/trunk/continuum-purge: pom.xml src/main/resources/META-INF/plexus/components-fragment.xml src/main/resources/META-INF/plexus/components.xml
Date Fri, 23 Apr 2010 00:46:16 GMT
Author: ctan
Date: Fri Apr 23 00:46:16 2010
New Revision: 937117

URL: http://svn.apache.org/viewvc?rev=937117&view=rev
Log:
fix descriptor handling so the descriptors will be merged

Added:
    continuum/trunk/continuum-purge/src/main/resources/META-INF/plexus/components-fragment.xml
      - copied unchanged from r937107, continuum/trunk/continuum-purge/src/main/resources/META-INF/plexus/components.xml
Removed:
    continuum/trunk/continuum-purge/src/main/resources/META-INF/plexus/components.xml
Modified:
    continuum/trunk/continuum-purge/pom.xml

Modified: continuum/trunk/continuum-purge/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/pom.xml?rev=937117&r1=937116&r2=937117&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/pom.xml (original)
+++ continuum/trunk/continuum-purge/pom.xml Fri Apr 23 00:46:16 2010
@@ -134,12 +134,21 @@ under the License.
         <executions>
           <execution>
             <id>generate</id>
+            <phase>generate-resources</phase>
             <goals>
               <goal>descriptor</goal>
             </goals>
           </execution>
           <execution>
             <id>merge</id>
+            <phase>process-resources</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${basedir}/src/main/resources/META-INF/plexus/components-fragment.xml</descriptor>
+                <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
+              </descriptors>
+              <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
+            </configuration>
             <goals>
               <goal>merge-descriptors</goal>
             </goals>



Mime
View raw message