From a00066e0d671a5441a5d55983f0e4f792b669630 Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Mon, 7 Aug 2006 08:27:44 +0000
Subject: [PATCH] xwork integration was moved to trunk

git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@429271 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-repository-webapp/pom.xml | 34 +--------------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/maven-repository-webapp/pom.xml b/maven-repository-webapp/pom.xml
index e2d3da487..f6f700a2f 100644
--- a/maven-repository-webapp/pom.xml
+++ b/maven-repository-webapp/pom.xml
@@ -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>