maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r430605 - in /maven/repository-manager/trunk/maven-repository-webapp: pom.xml src/main/plexus/plexus.xml src/main/resources/META-INF/ src/main/resources/META-INF/plexus/ src/main/resources/META-INF/plexus/plexus.xml
Date Fri, 11 Aug 2006 00:39:51 GMT
Author: brett
Date: Thu Aug 10 17:39:51 2006
New Revision: 430605

URL: http://svn.apache.org/viewvc?rev=430605&view=rev
Log:
simplify (correct) how descriptors are created and used

Added:
    maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/META-INF/
    maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/META-INF/plexus/
    maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/META-INF/plexus/plexus.xml
      - copied unchanged from r427857, maven/repository-manager/trunk/maven-repository-webapp/src/main/plexus/plexus.xml
Removed:
    maven/repository-manager/trunk/maven-repository-webapp/src/main/plexus/plexus.xml
Modified:
    maven/repository-manager/trunk/maven-repository-webapp/pom.xml

Modified: maven/repository-manager/trunk/maven-repository-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/pom.xml?rev=430605&r1=430604&r2=430605&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-webapp/pom.xml (original)
+++ maven/repository-manager/trunk/maven-repository-webapp/pom.xml Thu Aug 10 17:39:51 2006
@@ -163,8 +163,6 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-maven-plugin</artifactId>
         <configuration>
-          <fileName>plexus.xml</fileName>
-          <containerDescriptor>true</containerDescriptor>
           <roleDefaults>
             <roleDefault>
               <role>com.opensymphony.xwork.Action</role>
@@ -172,21 +170,6 @@
             </roleDefault>
           </roleDefaults>
         </configuration>
-        <executions>
-          <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>
       </plugin>
     </plugins>
   </build>



Mime
View raw message