Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Brett Porter 2006-08-07 08:27:44 +00:00
parent 01e4a3c3e1
commit a00066e0d6
1 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
maven-repository-webapp/pom.xml
View File

@ -49,16 +49,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xwork-integration-single</artifactId> <artifactId>plexus-xwork-integration</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version> <version>1.0-alpha-2-SNAPSHOT</version>
</dependency> </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> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-log4j-logging</artifactId> <artifactId>plexus-log4j-logging</artifactId>
@ -158,31 +151,6 @@
</instrumentation> </instrumentation>
</configuration> </configuration>
</plugin> </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> <plugin>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId> <artifactId>plexus-maven-plugin</artifactId>