You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2008/04/15 04:14:27 UTC
svn commit: r648097 - in /archiva/trunk: archiva-cli/
archiva-modules/archiva-base/archiva-artifact-converter/
archiva-modules/archiva-base/archiva-configuration/
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/
archiva-modules/ar...
Author: oching
Date: Mon Apr 14 19:14:25 2008
New Revision: 648097
URL: http://svn.apache.org/viewvc?rev=648097&view=rev
Log:
-reverted exclusions of plexus-container in plexus-spring dependency
Modified:
archiva/trunk/archiva-cli/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
archiva/trunk/archiva-modules/archiva-scheduled/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
Modified: archiva/trunk/archiva-cli/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-cli/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-cli/pom.xml (original)
+++ archiva/trunk/archiva-cli/pom.xml Mon Apr 14 19:14:25 2008
@@ -66,12 +66,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-spring</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<build>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml Mon Apr 14 19:14:25 2008
@@ -36,12 +36,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>commons-io</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml Mon Apr 14 19:14:25 2008
@@ -32,12 +32,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>org.codehaus.plexus.registry</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml Mon Apr 14 19:14:25 2008
@@ -62,12 +62,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>
<!-- test dependencies -->
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml Mon Apr 14 19:14:25 2008
@@ -53,22 +53,10 @@
<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>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>hsqldb</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml Mon Apr 14 19:14:25 2008
@@ -17,12 +17,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>dom4j</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml Mon Apr 14 19:14:25 2008
@@ -49,12 +49,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>
</dependencies>
</project>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml Mon Apr 14 19:14:25 2008
@@ -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>
</dependencies>
</project>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml Mon Apr 14 19:14:25 2008
@@ -32,12 +32,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>commons-collections</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml Mon Apr 14 19:14:25 2008
@@ -44,12 +44,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>org.codehaus.plexus</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml Mon Apr 14 19:14:25 2008
@@ -44,12 +44,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>javax.jdo</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml Mon Apr 14 19:14:25 2008
@@ -36,12 +36,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>commons-lang</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml Mon Apr 14 19:14:25 2008
@@ -32,12 +32,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>org.apache.archiva</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml Mon Apr 14 19:14:25 2008
@@ -65,12 +65,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>
</dependencies>
<build>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml Mon Apr 14 19:14:25 2008
@@ -47,12 +47,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>org.codehaus.plexus</groupId>
Modified: archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml Mon Apr 14 19:14:25 2008
@@ -53,12 +53,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>hsqldb</groupId>
Modified: archiva/trunk/archiva-modules/archiva-scheduled/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/pom.xml Mon Apr 14 19:14:25 2008
@@ -59,12 +59,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>org.codehaus.plexus</groupId>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml Mon Apr 14 19:14:25 2008
@@ -13,12 +13,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>org.apache.archiva</groupId>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml Mon Apr 14 19:14:25 2008
@@ -36,12 +36,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>org.codehaus.plexus.redback</groupId>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=648097&r1=648096&r2=648097&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Mon Apr 14 19:14:25 2008
@@ -45,12 +45,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-spring</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>