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

POM clean up 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@667751 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2008-06-14 06:27:11 +00:00
parent c6a1a4915f
commit 6d84f3a0a5
25 changed files with 281 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiva-cli/pom.xml
View File

@ -26,7 +26,6 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>archiva-cli</artifactId> <artifactId>archiva-cli</artifactId>
<version>1.1-SNAPSHOT</version>
<name>Archiva Command Line Client</name> <name>Archiva Command Line Client</name>
<dependencies> <dependencies>
<dependency> <dependency>
@ -50,7 +49,6 @@
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId> <artifactId>wagon-file</artifactId>
<version>1.0-beta-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.cli-parser</groupId> <groupId>com.google.code.cli-parser</groupId>
@ -60,7 +58,6 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.5.0</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>

1
archiva-docs/pom.xml
View File

@ -25,7 +25,6 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>archiva-docs</artifactId> <artifactId>archiva-docs</artifactId>
<version>1.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Archiva Documentation</name> <name>Archiva Documentation</name>
<url>http://archiva.apache.org/docs/${project.version}/</url> <url>http://archiva.apache.org/docs/${project.version}/</url>

13
archiva-jetty/pom.xml
View File

@ -14,12 +14,11 @@
<dependency> <dependency>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId> <artifactId>jetty</artifactId>
<version>6.1.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>start</artifactId> <artifactId>start</artifactId>
<version>6.1.6</version> <version>${jetty.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>
@ -36,25 +35,25 @@
<dependency> <dependency>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-naming</artifactId> <artifactId>jetty-naming</artifactId>
<version>6.1.6</version> <version>${jetty.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId> <artifactId>servlet-api-2.5</artifactId>
<version>6.1.6</version> <version>${jetty.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.0</artifactId> <artifactId>jsp-api-2.0</artifactId>
<version>6.1.6</version> <version>${jetty.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-plus</artifactId> <artifactId>jetty-plus</artifactId>
<version>6.1.6</version> <version>${jetty.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -114,13 +113,11 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId> <artifactId>jcl104-over-slf4j</artifactId>
<version>1.0.1</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>1.0.1</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>

13
archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
View File

@ -44,12 +44,6 @@
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId> <artifactId>maven-artifact-manager</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>
@ -58,13 +52,6 @@
<dependency> <dependency>
<groupId>org.apache.maven.shared</groupId> <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-model-converter</artifactId> <artifactId>maven-model-converter</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

6
archiva-modules/archiva-base/archiva-common/pom.xml
View File

@ -54,12 +54,6 @@
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-spring</artifactId> <artifactId>plexus-spring</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xalan</groupId> <groupId>xalan</groupId>

12
archiva-modules/archiva-base/archiva-configuration/pom.xml
View File

@ -36,12 +36,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus.registry</groupId> <groupId>org.codehaus.plexus.registry</groupId>
<artifactId>plexus-registry-api</artifactId> <artifactId>plexus-registry-api</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.registry</groupId> <groupId>org.codehaus.plexus.registry</groupId>
@ -50,12 +44,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-expression-evaluator</artifactId> <artifactId>plexus-expression-evaluator</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>

6
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
View File

@ -51,12 +51,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-digest</artifactId> <artifactId>plexus-digest</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>

3
archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
View File

@ -21,7 +21,6 @@
<dependency> <dependency>
<groupId>dom4j</groupId> <groupId>dom4j</groupId>
<artifactId>dom4j</artifactId> <artifactId>dom4j</artifactId>
<version>1.6.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.shared</groupId> <groupId>org.apache.maven.shared</groupId>
@ -37,7 +36,7 @@
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId> <artifactId>wagon-http-lightweight</artifactId>
<version>1.0-beta-2</version> <version>${wagon.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>

5
archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
View File

@ -26,9 +26,4 @@
<artifactId>archiva-signature-consumers</artifactId> <artifactId>archiva-signature-consumers</artifactId>
<name>Archiva Consumers :: GPG Signature Consumers</name> <name>Archiva Consumers :: GPG Signature Consumers</name>
<packaging>jar</packaging>
<dependencies>
</dependencies>
</project> </project>

6
archiva-modules/archiva-base/archiva-converter/pom.xml
View File

@ -43,12 +43,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId> <artifactId>plexus-i18n</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>

6
archiva-modules/archiva-base/archiva-indexer/pom.xml
View File

@ -52,12 +52,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-digest</artifactId> <artifactId>plexus-digest</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>

6
archiva-modules/archiva-base/archiva-policies/pom.xml
View File

@ -48,12 +48,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus.cache</groupId> <groupId>org.codehaus.plexus.cache</groupId>
<artifactId>plexus-cache-ehcache</artifactId> <artifactId>plexus-cache-ehcache</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

7
archiva-modules/archiva-base/archiva-proxy/pom.xml
View File

@ -57,12 +57,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-digest</artifactId> <artifactId>plexus-digest</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
@ -85,7 +79,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.2</version>
<configuration> <configuration>
<excludes> <excludes>
<exclude>**/Abstract*</exclude> <exclude>**/Abstract*</exclude>

7
archiva-modules/archiva-base/archiva-transaction/pom.xml
View File

@ -35,13 +35,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-digest</artifactId> <artifactId>plexus-digest</artifactId>
<version>1.0</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>

16
archiva-modules/archiva-base/archiva-xml-tools/pom.xml
View File

@ -43,26 +43,10 @@
<dependency> <dependency>
<groupId>dom4j</groupId> <groupId>dom4j</groupId>
<artifactId>dom4j</artifactId> <artifactId>dom4j</artifactId>
<exclusions>
<exclusion>
<groupId>xom</groupId>
<artifactId>xom</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jaxen</groupId> <groupId>jaxen</groupId>
<artifactId>jaxen</artifactId> <artifactId>jaxen</artifactId>
<exclusions>
<exclusion>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</exclusion>
<exclusion>
<groupId>xom</groupId>
<artifactId>xom</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>

1
archiva-modules/archiva-base/pom.xml
View File

@ -24,7 +24,6 @@
</parent> </parent>
<artifactId>archiva-base</artifactId> <artifactId>archiva-base</artifactId>
<version>1.1-SNAPSHOT</version>
<name>Archiva Base</name> <name>Archiva Base</name>
<packaging>pom</packaging> <packaging>pom</packaging>

22
archiva-modules/archiva-database/pom.xml
View File

@ -26,7 +26,6 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>archiva-database</artifactId> <artifactId>archiva-database</artifactId>
<version>1.1-SNAPSHOT</version>
<name>Archiva Database</name> <name>Archiva Database</name>
<dependencies> <dependencies>
<dependency> <dependency>
@ -57,32 +56,11 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-jdo2</artifactId> <artifactId>plexus-jdo2</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jpox</groupId> <groupId>jpox</groupId>
<artifactId>jpox</artifactId> <artifactId>jpox</artifactId>
<scope>compile</scope> <scope>compile</scope>
<exclusions>
<!-- targeting JDK 1.4 we don't need this -->
<exclusion>
<groupId>javax.sql</groupId>
<artifactId>jdbc-stdext</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>

1
archiva-modules/archiva-reporting/pom.xml
View File

@ -25,7 +25,6 @@
</parent> </parent>
<artifactId>archiva-reporting</artifactId> <artifactId>archiva-reporting</artifactId>
<version>1.1-SNAPSHOT</version>
<name>Archiva Reporting</name> <name>Archiva Reporting</name>
<packaging>pom</packaging> <packaging>pom</packaging>

13
archiva-modules/archiva-scheduled/pom.xml
View File

@ -26,7 +26,6 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>archiva-scheduled</artifactId> <artifactId>archiva-scheduled</artifactId>
<version>1.1-SNAPSHOT</version>
<name>Archiva Base :: Scheduled Tasks</name> <name>Archiva Base :: Scheduled Tasks</name>
<dependencies> <dependencies>
<dependency> <dependency>
@ -48,12 +47,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-quartz</artifactId> <artifactId>plexus-quartz</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
@ -71,12 +64,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus.registry</groupId> <groupId>org.codehaus.plexus.registry</groupId>
<artifactId>plexus-registry-api</artifactId> <artifactId>plexus-registry-api</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- Test Dependencies --> <!-- Test Dependencies -->
<dependency> <dependency>

6
archiva-modules/archiva-web/archiva-rss/pom.xml
View File

@ -40,11 +40,5 @@
<artifactId>xmlunit</artifactId> <artifactId>xmlunit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

42
archiva-modules/archiva-web/archiva-security/pom.xml
View File

@ -45,77 +45,35 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-system</artifactId> <artifactId>redback-system</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-rbac-model</artifactId> <artifactId>redback-rbac-model</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-rbac-role-manager</artifactId> <artifactId>redback-rbac-role-manager</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- Test Scoped --> <!-- Test Scoped -->
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-authorization-rbac</artifactId> <artifactId>redback-authorization-rbac</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-keys-memory</artifactId> <artifactId>redback-keys-memory</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-users-memory</artifactId> <artifactId>redback-users-memory</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-rbac-memory</artifactId> <artifactId>redback-rbac-memory</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

47
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -113,28 +113,15 @@
<dependency> <dependency>
<groupId>org.apache.maven.shared</groupId> <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-app-configuration-web</artifactId> <artifactId>maven-app-configuration-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-slf4j-logging</artifactId> <artifactId>plexus-slf4j-logging</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.4.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
@ -147,12 +134,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus.registry</groupId> <groupId>org.codehaus.plexus.registry</groupId>
<artifactId>plexus-registry-api</artifactId> <artifactId>plexus-registry-api</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.registry</groupId> <groupId>org.codehaus.plexus.registry</groupId>
@ -161,12 +142,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus.cache</groupId> <groupId>org.codehaus.plexus.cache</groupId>
<artifactId>plexus-cache-api</artifactId> <artifactId>plexus-cache-api</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.cache</groupId> <groupId>org.codehaus.plexus.cache</groupId>
@ -186,22 +161,10 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-xwork-integration</artifactId> <artifactId>redback-xwork-integration</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-taglib</artifactId> <artifactId>redback-taglib</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- Other dependencies --> <!-- Other dependencies -->
<dependency> <dependency>
@ -215,7 +178,6 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>2.5.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
@ -235,12 +197,6 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-quartz</artifactId> <artifactId>plexus-quartz</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
@ -253,12 +209,10 @@
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>stax</groupId> <groupId>stax</groupId>
<artifactId>stax</artifactId> <artifactId>stax</artifactId>
<version>1.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
@ -277,7 +231,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.2</version>
<configuration> <configuration>
<argLine>-agentlib:yjpagent</argLine> <argLine>-agentlib:yjpagent</argLine>
<excludes> <excludes>

36
archiva-modules/archiva-web/archiva-webdav/pom.xml
View File

@ -57,7 +57,6 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>2.5.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
@ -66,7 +65,6 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
@ -84,48 +82,21 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-xwork-integration</artifactId> <artifactId>redback-xwork-integration</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-keys-memory</artifactId> <artifactId>redback-keys-memory</artifactId>
<version>${redback.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-rbac-memory</artifactId> <artifactId>redback-rbac-memory</artifactId>
<version>${redback.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-users-memory</artifactId> <artifactId>redback-users-memory</artifactId>
<version>${redback.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xmlunit</groupId> <groupId>xmlunit</groupId>
@ -135,19 +106,12 @@
<dependency> <dependency>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId> <artifactId>jetty</artifactId>
<version>6.1.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-slf4j-logging</artifactId> <artifactId>plexus-slf4j-logging</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>

1
archiva-modules/archiva-web/pom.xml
View File

@ -23,7 +23,6 @@
</parent> </parent>
<artifactId>archiva-web</artifactId> <artifactId>archiva-web</artifactId>
<version>1.1-SNAPSHOT</version>
<name>Archiva Web</name> <name>Archiva Web</name>
<packaging>pom</packaging> <packaging>pom</packaging>

354
pom.xml
View File

@ -62,7 +62,9 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>1.0-alpha-3</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -73,6 +75,17 @@
<bannedDependencies> <bannedDependencies>
<excludes> <excludes>
<exclude>org.codehaus.plexus:plexus-container-default</exclude> <exclude>org.codehaus.plexus:plexus-container-default</exclude>
<exclude>commons-logging:commons-logging-api</exclude>
<exclude>commons-logging:commons-logging</exclude>
<exclude>velocity:velocity-dep</exclude>
<exclude>classworlds:classworlds</exclude>
<exclude>javax.transaction:jta</exclude>
<exclude>xerces:xercesImpl</exclude>
<exclude>xerces:xmlParserAPIs</exclude>
<exclude>javax.sql:jdbc-stdext</exclude>
<exclude>ant:ant-optional</exclude>
<!-- exclude>org.apache.maven.wagon:wagon-http-lightweight</exclude -->
<exclude>xom:xom</exclude>
</excludes> </excludes>
</bannedDependencies> </bannedDependencies>
</rules> </rules>
@ -166,11 +179,6 @@
<jdkLevel>1.5</jdkLevel> <jdkLevel>1.5</jdkLevel>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.0-alpha-3</version>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
@ -199,6 +207,11 @@
<version>1.2_Java1.3</version> <version>1.2_Java1.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
@ -211,6 +224,16 @@
<groupId>org.apache.jackrabbit</groupId> <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId> <artifactId>jackrabbit-webdav</artifactId>
<version>1.4</version> <version>1.4</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.activation</groupId> <groupId>javax.activation</groupId>
@ -369,16 +392,22 @@
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-spring</artifactId> <artifactId>plexus-spring</artifactId>
<version>1.0</version> <version>1.0</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>stax</groupId>
<artifactId>spring-context</artifactId> <artifactId>stax</artifactId>
<version>2.5.1</version> <version>1.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>commons-codec</groupId>
<artifactId>spring-web</artifactId> <artifactId>commons-codec</artifactId>
<version>2.5.1</version> <version>1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
@ -400,11 +429,6 @@
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>
<version>2.2</version> <version>2.2</version>
</dependency> </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
<version>1.0.4</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
@ -424,12 +448,21 @@
<groupId>hsqldb</groupId> <groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId> <artifactId>hsqldb</artifactId>
<version>1.8.0.7</version> <version>1.8.0.7</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jaxen</groupId> <groupId>jaxen</groupId>
<artifactId>jaxen</artifactId> <artifactId>jaxen</artifactId>
<version>1.1</version> <version>1.1</version>
<exclusions> <exclusions>
<exclusion>
<groupId>xom</groupId>
<artifactId>xom</artifactId>
</exclusion>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
@ -441,11 +474,6 @@
<artifactId>jdo2-api</artifactId> <artifactId>jdo2-api</artifactId>
<version>2.0</version> <version>2.0</version>
</dependency> </dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
</dependency>
<dependency> <dependency>
<groupId>jpox</groupId> <groupId>jpox</groupId>
<artifactId>jpox</artifactId> <artifactId>jpox</artifactId>
@ -483,26 +511,22 @@
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
<version>1.4</version> <version>1.4</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId> <artifactId>maven-artifact-manager</artifactId>
<version>${maven.version}</version> <version>${maven.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>${maven.version}</version> <version>${maven.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId> <artifactId>maven-repository-metadata</artifactId>
@ -524,32 +548,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-model-converter</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-appserver-host</artifactId>
<version>2.0-alpha-8</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-appserver-service-jetty</artifactId>
<version>2.0-alpha-8</version>
<type>plexus-service</type>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-cli</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-command-line</artifactId>
<version>1.0-alpha-2</version>
</dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId> <artifactId>plexus-component-api</artifactId>
@ -564,26 +562,49 @@
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-expression-evaluator</artifactId> <artifactId>plexus-expression-evaluator</artifactId>
<version>1.0-rc1</version> <version>1.0-rc1</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId> <artifactId>plexus-i18n</artifactId>
<version>1.0-beta-6</version> <version>1.0-beta-6</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-jdo2</artifactId> <artifactId>plexus-jdo2</artifactId>
<version>1.0-alpha-8</version> <version>1.0-alpha-8</version>
</dependency> <exclusions>
<dependency> <exclusion>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-naming</artifactId> <artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-3</version> </exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-quartz</artifactId> <artifactId>plexus-quartz</artifactId>
<version>1.0-alpha-3</version> <version>1.0-alpha-3</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
@ -594,6 +615,10 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -607,73 +632,117 @@
<version>1.4.5</version> <version>1.4.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus.cache</groupId>
<artifactId>plexus-xwork-integration</artifactId> <artifactId>plexus-cache-api</artifactId>
<version>1.0-alpha-7</version> <version>1.0-alpha-2</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>velocity</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>velocity-dep</artifactId> <artifactId>plexus-container-default</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.plexus.cache</groupId>
<artifactId>plexus-cache-api</artifactId>
<version>1.0-alpha-2</version>
</dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.cache</groupId> <groupId>org.codehaus.plexus.cache</groupId>
<artifactId>plexus-cache-ehcache</artifactId> <artifactId>plexus-cache-ehcache</artifactId>
<version>1.0-alpha-2</version> <version>1.0-alpha-2</version>
</dependency> <exclusions>
<dependency> <exclusion>
<groupId>net.sf.ehcache</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>ehcache</artifactId> <artifactId>plexus-container-default</artifactId>
<version>1.3.0</version> </exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-rbac-memory</artifactId> <artifactId>redback-rbac-memory</artifactId>
<version>${redback.version}</version> <version>${redback.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-users-memory</artifactId> <artifactId>redback-users-memory</artifactId>
<version>${redback.version}</version> <version>${redback.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-keys-memory</artifactId> <artifactId>redback-keys-memory</artifactId>
<version>${redback.version}</version> <version>${redback.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-rbac-model</artifactId> <artifactId>redback-rbac-model</artifactId>
<version>${redback.version}</version> <version>${redback.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-authorization-rbac</artifactId> <artifactId>redback-authorization-rbac</artifactId>
<version>${redback.version}</version> <version>${redback.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-rbac-role-manager</artifactId> <artifactId>redback-rbac-role-manager</artifactId>
<version>${redback.version}</version> <version>${redback.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-system</artifactId> <artifactId>redback-system</artifactId>
<version>${redback.version}</version> <version>${redback.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-taglib</artifactId> <artifactId>redback-taglib</artifactId>
<version>${redback.version}</version> <version>${redback.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
@ -691,11 +760,35 @@
<groupId>org.codehaus.plexus.redback</groupId> <groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-xwork-integration</artifactId> <artifactId>redback-xwork-integration</artifactId>
<version>${redback.version}</version> <version>${redback.version}</version>
<exclusions>
<exclusion>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
</exclusion>
<exclusion>
<groupId>velocity</groupId>
<artifactId>velocity-dep</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.registry</groupId> <groupId>org.codehaus.plexus.registry</groupId>
<artifactId>plexus-registry-api</artifactId> <artifactId>plexus-registry-api</artifactId>
<version>1.0-alpha-2</version> <version>1.0-alpha-2</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus.registry</groupId> <groupId>org.codehaus.plexus.registry</groupId>
@ -714,6 +807,10 @@
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId> <artifactId>commons-logging-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -726,11 +823,21 @@
<artifactId>sitemesh</artifactId> <artifactId>sitemesh</artifactId>
<version>2.2.1</version> <version>2.2.1</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
<version>1.5.0</version>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.5.0</version> <version>1.5.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.5.0</version>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
@ -756,15 +863,16 @@
<artifactId>wagon-provider-api</artifactId> <artifactId>wagon-provider-api</artifactId>
<version>${wagon.version}</version> <version>${wagon.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>${wagon.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.opensymphony</groupId> <groupId>com.opensymphony</groupId>
<artifactId>webwork</artifactId> <artifactId>webwork</artifactId>
<version>2.2.6</version> <version>2.2.6</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xmlunit</groupId> <groupId>xmlunit</groupId>
@ -776,12 +884,96 @@
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
<version>1.5.2</version> <version>1.5.2</version>
</dependency> </dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty.version}</version>
</dependency>
<!-- Transitive versions to manage -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>2.5.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>2.5.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>${maven.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-model-converter</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xwork-integration</artifactId>
<version>1.0-alpha-7</version>
<exclusions>
<exclusion>
<groupId>velocity</groupId>
<artifactId>velocity-dep</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>1.3.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<properties> <properties>
<maven.version>2.0.8</maven.version> <maven.version>2.0.8</maven.version>
<wagon.version>1.0-beta-3</wagon.version> <wagon.version>1.0-beta-3</wagon.version>
<redback.version>1.0.2-SNAPSHOT</redback.version> <redback.version>1.0.2-SNAPSHOT</redback.version>
<jetty.version>6.1.6</jetty.version>
</properties> </properties>
<profiles> <profiles>
<profile> <profile>