continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ken...@apache.org
Subject svn commit: r430604 - in /maven/continuum/trunk/continuum-webapp: pom.xml src/main/plexus/ src/main/resources/META-INF/ src/main/resources/META-INF/plexus/ src/main/webapp/WEB-INF/plexus.xml
Date Fri, 11 Aug 2006 00:34:46 GMT
Author: kenney
Date: Thu Aug 10 17:34:45 2006
New Revision: 430604

URL: http://svn.apache.org/viewvc?rev=430604&view=rev
Log:
Generated descriptor is now default: components.xml.
Moved plexus/plexus.xml to resources/META-INF/plexus since it's
no longer modified.

Added:
    maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/
    maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/
      - copied from r430434, maven/continuum/trunk/continuum-webapp/src/main/plexus/
Removed:
    maven/continuum/trunk/continuum-webapp/src/main/plexus/
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/plexus.xml
Modified:
    maven/continuum/trunk/continuum-webapp/pom.xml

Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?rev=430604&r1=430603&r2=430604&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Thu Aug 10 17:34:45 2006
@@ -34,7 +34,6 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-maven-plugin</artifactId>
         <configuration>
-          <fileName>plexus.xml</fileName>
           <containerDescriptor>true</containerDescriptor>
           <roleDefaults>
             <roleDefault>
@@ -48,19 +47,6 @@
             <id>generate</id>
             <goals>
               <goal>descriptor</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>merge</id>
-            <configuration>
-              <output>${project.build.outputDirectory}/META-INF/plexus/plexus.xml</output>
-              <descriptors>
-                <descriptor>${project.build.directory}/generated-resources/plexus/plexus.xml</descriptor>
-                <descriptor>src/main/plexus/plexus.xml</descriptor>
-              </descriptors>
-            </configuration>
-            <goals>
-              <goal>merge-descriptors</goal>
             </goals>
           </execution>
         </executions>



Mime
View raw message