You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/08/07 10:27:44 UTC
svn commit: r429271 -
/maven/repository-manager/trunk/maven-repository-webapp/pom.xml
Author: brett
Date: Mon Aug 7 01:27:44 2006
New Revision: 429271
URL: http://svn.apache.org/viewvc?rev=429271&view=rev
Log:
xwork integration was moved to trunk
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=429271&r1=429270&r2=429271&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-webapp/pom.xml (original)
+++ maven/repository-manager/trunk/maven-repository-webapp/pom.xml Mon Aug 7 01:27:44 2006
@@ -49,16 +49,9 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-xwork-integration-single</artifactId>
+ <artifactId>plexus-xwork-integration</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
- <!-- TODO: remove if using the new xwork permanently
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-xwork-integration</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </dependency>
- -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-log4j-logging</artifactId>
@@ -158,31 +151,6 @@
</instrumentation>
</configuration>
</plugin>
- <!-- TODO: remove if we use the new xwork integration
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <configuration>
- <fileName>plexus-application.xml</fileName>
- <containerDescriptor>true</containerDescriptor>
- </configuration>
- <executions>
- <execution>
- <id>merge</id>
- <configuration>
- <output>${project.build.outputDirectory}/META-INF/plexus/plexus-application.xml</output>
- <descriptors>
- <descriptor>${project.build.directory}/generated-resources/plexus/plexus-application.xml</descriptor>
- <descriptor>src/main/plexus/plexus.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>merge-descriptors</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>