You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/04/10 05:32:25 UTC

svn commit: r646630 - in /archiva/trunk: ./ archiva-modules/archiva-base/archiva-indexer/ archiva-modules/archiva-base/archiva-proxy/ archiva-modules/archiva-base/archiva-transaction/ archiva-modules/archiva-database/ archiva-modules/archiva-reporting/...

Author: brett
Date: Wed Apr  9 20:32:24 2008
New Revision: 646630

URL: http://svn.apache.org/viewvc?rev=646630&view=rev
Log:
remove plexus container dependencies

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
    archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
    archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
    archiva/trunk/archiva-modules/archiva-database/pom.xml
    archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
    archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml
    archiva/trunk/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml
    archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml
    archiva/trunk/archiva-modules/archiva-scheduled/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java
    archiva/trunk/pom.xml

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=646630&r1=646629&r2=646630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml Wed Apr  9 20:32:24 2008
@@ -46,10 +46,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-digest</artifactId>
     </dependency>
     <dependency>

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=646630&r1=646629&r2=646630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml Wed Apr  9 20:32:24 2008
@@ -68,10 +68,6 @@
       <artifactId>plexus-component-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus.registry</groupId>
       <artifactId>plexus-registry-commons</artifactId>
       <scope>test</scope>

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=646630&r1=646629&r2=646630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml Wed Apr  9 20:32:24 2008
@@ -43,10 +43,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-component-api</artifactId>
     </dependency>
   </dependencies>

Modified: archiva/trunk/archiva-modules/archiva-database/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/pom.xml?rev=646630&r1=646629&r2=646630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-database/pom.xml Wed Apr  9 20:32:24 2008
@@ -77,10 +77,6 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>

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=646630&r1=646629&r2=646630&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 Wed Apr  9 20:32:24 2008
@@ -45,10 +45,6 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus.registry</groupId>
       <artifactId>plexus-registry-commons</artifactId>
       <scope>test</scope>

Modified: archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml?rev=646630&r1=646629&r2=646630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml Wed Apr  9 20:32:24 2008
@@ -45,10 +45,6 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>

Modified: archiva/trunk/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml?rev=646630&r1=646629&r2=646630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml Wed Apr  9 20:32:24 2008
@@ -45,10 +45,6 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>

Modified: archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml?rev=646630&r1=646629&r2=646630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml Wed Apr  9 20:32:24 2008
@@ -41,10 +41,6 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>

Modified: archiva/trunk/archiva-modules/archiva-scheduled/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/pom.xml?rev=646630&r1=646629&r2=646630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/pom.xml Wed Apr  9 20:32:24 2008
@@ -63,10 +63,6 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus.registry</groupId>
       <artifactId>plexus-registry-api</artifactId>
     </dependency>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=646630&r1=646629&r2=646630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Apr  9 20:32:24 2008
@@ -160,10 +160,6 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-component-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
     <!-- Plexus Security Dependencies -->
     <dependency>
       <groupId>org.codehaus.plexus.redback</groupId>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java?rev=646630&r1=646629&r2=646630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java Wed Apr  9 20:32:24 2008
@@ -20,7 +20,7 @@
  */
 
 import org.apache.maven.archiva.webdav.util.MimeTypes;
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 
 /**
  * ArchivaMimeTypesTest 
@@ -29,7 +29,7 @@
  * @version $Id$
  */
 public class ArchivaMimeTypeLoaderTest
-    extends PlexusTestCase
+    extends PlexusInSpringTestCase
 {
     public void testArchivaTypes()
         throws Exception

Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=646630&r1=646629&r2=646630&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Apr  9 20:32:24 2008
@@ -538,11 +538,6 @@
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-container-default</artifactId>
-        <version>1.0-alpha-22</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-digest</artifactId>
         <version>1.1</version>
       </dependency>