diff options
25 files changed, 281 insertions, 356 deletions
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 8ac5d7f0e..03512a1a5 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-cli</artifactId> - <version>1.1-SNAPSHOT</version> <name>Archiva Command Line Client</name> <dependencies> <dependency> @@ -50,7 +49,6 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-file</artifactId> - <version>1.0-beta-2</version> </dependency> <dependency> <groupId>com.google.code.cli-parser</groupId> @@ -60,7 +58,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.5.0</version> <scope>runtime</scope> </dependency> <dependency> diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index 084d462f0..22b67a059 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -25,7 +25,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-docs</artifactId> - <version>1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Archiva Documentation</name> <url>http://archiva.apache.org/docs/${project.version}/</url> diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index b73cc4d2b..deb0d0aff 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -14,12 +14,11 @@ <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> - <version>6.1.6</version> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>start</artifactId> - <version>6.1.6</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -36,25 +35,25 @@ <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-naming</artifactId> - <version>6.1.6</version> + <version>${jetty.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> - <version>6.1.6</version> + <version>${jetty.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-api-2.0</artifactId> - <version>6.1.6</version> + <version>${jetty.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-plus</artifactId> - <version>6.1.6</version> + <version>${jetty.version}</version> <scope>runtime</scope> </dependency> <dependency> @@ -114,13 +113,11 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl104-over-slf4j</artifactId> - <version>1.0.1</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.0.1</version> <scope>runtime</scope> </dependency> <dependency> diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 083f08773..d5abcb843 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -44,12 +44,6 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact-manager</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -58,13 +52,6 @@ <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> </dependencies> <build> diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index 810f568d1..a6e140249 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -54,12 +54,6 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-spring</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>xalan</groupId> diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 3833eddf0..5946c8225 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -36,12 +36,6 @@ <dependency> <groupId>org.codehaus.plexus.registry</groupId> <artifactId>plexus-registry-api</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.registry</groupId> @@ -50,12 +44,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-expression-evaluator</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 6669b06d0..bde81f60f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -51,12 +51,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index fc67729e2..3ef60354e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -21,7 +21,6 @@ <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <version>1.6.1</version> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http-lightweight</artifactId> - <version>1.0-beta-2</version> + <version>${wagon.version}</version> <scope>runtime</scope> </dependency> </dependencies> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index e240916aa..abd12bac9 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -26,9 +26,4 @@ <artifactId>archiva-signature-consumers</artifactId> <name>Archiva Consumers :: GPG Signature Consumers</name> - <packaging>jar</packaging> - - <dependencies> - - </dependencies> </project> diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 62b97c766..c4fb15f6d 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -43,12 +43,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index de0be6b6f..c94fcb642 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -52,12 +52,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>commons-lang</groupId> diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 6ec016d73..3d286459f 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -48,12 +48,6 @@ <dependency> <groupId>org.codehaus.plexus.cache</groupId> <artifactId>plexus-cache-ehcache</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> <build> diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index b9a86bf10..610cad29d 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -57,12 +57,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -85,7 +79,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.2</version> <configuration> <excludes> <exclude>**/Abstract*</exclude> diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index b09373a60..c1f6ca8c6 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -35,13 +35,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> - <version>1.0</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index a2264a1f0..a9a4010fb 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -43,26 +43,10 @@ <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <exclusions> - <exclusion> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> - <exclusions> - <exclusion> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - </exclusion> - <exclusion> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index 124a2eefb..bb1fa7864 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -24,7 +24,6 @@ </parent> <artifactId>archiva-base</artifactId> - <version>1.1-SNAPSHOT</version> <name>Archiva Base</name> <packaging>pom</packaging> diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 251893594..ecbf50c58 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-database</artifactId> - <version>1.1-SNAPSHOT</version> <name>Archiva Database</name> <dependencies> <dependency> @@ -57,32 +56,11 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <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> <groupId>jpox</groupId> <artifactId>jpox</artifactId> <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> <groupId>commons-lang</groupId> diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index d5979b9f8..1c7b78993 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -25,7 +25,6 @@ </parent> <artifactId>archiva-reporting</artifactId> - <version>1.1-SNAPSHOT</version> <name>Archiva Reporting</name> <packaging>pom</packaging> diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index 00a85ebbe..53ec59051 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-scheduled</artifactId> - <version>1.1-SNAPSHOT</version> <name>Archiva Base :: Scheduled Tasks</name> <dependencies> <dependency> @@ -48,12 +47,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-quartz</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -71,12 +64,6 @@ <dependency> <groupId>org.codehaus.plexus.registry</groupId> <artifactId>plexus-registry-api</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <!-- Test Dependencies --> <dependency> diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 240b8ce45..50ed9b91d 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -40,11 +40,5 @@ <artifactId>xmlunit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index ff409d8ef..4b7eca7fc 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -45,77 +45,35 @@ <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-system</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-rbac-model</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-rbac-role-manager</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <!-- Test Scoped --> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-authorization-rbac</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-keys-memory</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-users-memory</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-rbac-memory</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 295a709a9..a7ca1eb3c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -113,28 +113,15 @@ <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-app-configuration-web</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-slf4j-logging</artifactId> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.4.3</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -147,12 +134,6 @@ <dependency> <groupId>org.codehaus.plexus.registry</groupId> <artifactId>plexus-registry-api</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.registry</groupId> @@ -161,12 +142,6 @@ <dependency> <groupId>org.codehaus.plexus.cache</groupId> <artifactId>plexus-cache-api</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.cache</groupId> @@ -186,22 +161,10 @@ <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-xwork-integration</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-taglib</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <!-- Other dependencies --> <dependency> @@ -215,7 +178,6 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>2.5.1</version> </dependency> <dependency> <groupId>org.apache.derby</groupId> @@ -235,12 +197,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-quartz</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -253,12 +209,10 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.3</version> </dependency> <dependency> <groupId>stax</groupId> <artifactId>stax</artifactId> - <version>1.2.0</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> @@ -277,7 +231,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.2</version> <configuration> <argLine>-agentlib:yjpagent</argLine> <excludes> diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index a91582b48..e9f0956c4 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -57,7 +57,6 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>2.5.1</version> </dependency> <dependency> <groupId>commons-io</groupId> @@ -66,7 +65,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.5.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -84,48 +82,21 @@ <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-xwork-integration</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-keys-memory</artifactId> - <version>${redback.version}</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-rbac-memory</artifactId> - <version>${redback.version}</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-users-memory</artifactId> - <version>${redback.version}</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>xmlunit</groupId> @@ -135,19 +106,12 @@ <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> - <version>6.1.5</version> <scope>test</scope> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-slf4j-logging</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index e1ee19300..67334f8f7 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -23,7 +23,6 @@ </parent> <artifactId>archiva-web</artifactId> - <version>1.1-SNAPSHOT</version> <name>Archiva Web</name> <packaging>pom</packaging> @@ -43,4 +42,4 @@ </modules> </profile> </profiles> -</project>
\ No newline at end of file +</project> @@ -62,7 +62,9 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0-alpha-3</version> <executions> <execution> <goals> @@ -73,6 +75,17 @@ <bannedDependencies> <excludes> <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> </bannedDependencies> </rules> @@ -166,11 +179,6 @@ <jdkLevel>1.5</jdkLevel> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> </plugins> </pluginManagement> </build> @@ -201,6 +209,11 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>jcl104-over-slf4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> @@ -211,6 +224,16 @@ <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-webdav</artifactId> <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> <groupId>javax.activation</groupId> @@ -369,16 +392,22 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-spring</artifactId> <version>1.0</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>2.5.1</version> + <groupId>stax</groupId> + <artifactId>stax</artifactId> + <version>1.2.0</version> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>2.5.1</version> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> </dependency> <dependency> <groupId>commons-collections</groupId> @@ -401,11 +430,6 @@ <version>2.2</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <version>10.1.3.1</version> @@ -424,6 +448,7 @@ <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>1.8.0.7</version> + <scope>test</scope> </dependency> <dependency> <groupId>jaxen</groupId> @@ -431,6 +456,14 @@ <version>1.1</version> <exclusions> <exclusion> + <groupId>xom</groupId> + <artifactId>xom</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </exclusion> + <exclusion> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> @@ -442,11 +475,6 @@ <version>2.0</version> </dependency> <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - </dependency> - <dependency> <groupId>jpox</groupId> <artifactId>jpox</artifactId> <version>1.1.9</version> @@ -485,13 +513,14 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>${maven.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> <artifactId>maven-artifact-manager</artifactId> <version>${maven.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -500,11 +529,6 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>${maven.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> <artifactId>maven-repository-metadata</artifactId> <version>${maven.version}</version> </dependency> @@ -525,32 +549,6 @@ </exclusions> </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> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-api</artifactId> <version>1.0-alpha-22</version> @@ -564,26 +562,49 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-expression-evaluator</artifactId> <version>1.0-rc1</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> <version>1.0-beta-6</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-jdo2</artifactId> <version>1.0-alpha-8</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-naming</artifactId> - <version>1.0-alpha-3</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-quartz</artifactId> <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> <groupId>org.codehaus.plexus</groupId> @@ -594,6 +615,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -607,73 +632,117 @@ <version>1.4.5</version> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-xwork-integration</artifactId> - <version>1.0-alpha-7</version> + <groupId>org.codehaus.plexus.cache</groupId> + <artifactId>plexus-cache-api</artifactId> + <version>1.0-alpha-2</version> <exclusions> <exclusion> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.cache</groupId> - <artifactId>plexus-cache-api</artifactId> - <version>1.0-alpha-2</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus.cache</groupId> <artifactId>plexus-cache-ehcache</artifactId> <version>1.0-alpha-2</version> - </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - <version>1.3.0</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-rbac-memory</artifactId> <version>${redback.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-users-memory</artifactId> <version>${redback.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-keys-memory</artifactId> <version>${redback.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-rbac-model</artifactId> <version>${redback.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-authorization-rbac</artifactId> <version>${redback.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-rbac-role-manager</artifactId> <version>${redback.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-system</artifactId> <version>${redback.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-taglib</artifactId> <version>${redback.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> @@ -691,11 +760,35 @@ <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-xwork-integration</artifactId> <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> <groupId>org.codehaus.plexus.registry</groupId> <artifactId>plexus-registry-api</artifactId> <version>1.0-alpha-2</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.registry</groupId> @@ -714,6 +807,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging-api</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -728,11 +825,21 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>jcl104-over-slf4j</artifactId> + <version>1.5.0</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>1.5.0</version> </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.0</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>1.5.0</version> </dependency> @@ -757,14 +864,15 @@ <version>${wagon.version}</version> </dependency> <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh</artifactId> - <version>${wagon.version}</version> - </dependency> - <dependency> <groupId>com.opensymphony</groupId> <artifactId>webwork</artifactId> <version>2.2.6</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>xmlunit</groupId> @@ -776,12 +884,96 @@ <artifactId>joda-time</artifactId> <version>1.5.2</version> </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> </dependencyManagement> <properties> <maven.version>2.0.8</maven.version> <wagon.version>1.0-beta-3</wagon.version> <redback.version>1.0.2-SNAPSHOT</redback.version> + <jetty.version>6.1.6</jetty.version> </properties> <profiles> <profile> |