From db51c1b5909b8aebd63e1d7c26271687826c3036 Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Mon, 14 Apr 2008 04:58:17 +0000
Subject: remove all traces of the Plexus container

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@647663 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-modules/archiva-base/archiva-common/pom.xml          | 12 ++++++++++++
 .../org/apache/maven/archiva/common/utils/ChecksumsTest.java |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'archiva-modules/archiva-base/archiva-common')

diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml
index ba19641c0..5498bd36e 100644
--- a/archiva-modules/archiva-base/archiva-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-common/pom.xml
@@ -49,6 +49,12 @@
     <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>
@@ -58,6 +64,12 @@
       <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-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java
index aaad6b4d4..5cbe361aa 100644
--- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java
+++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java
@@ -20,7 +20,7 @@ package org.apache.maven.archiva.common.utils;
  */
 
 import org.apache.commons.io.FileUtils;
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -33,7 +33,7 @@ import java.io.FileReader;
  * @version $Id$
  */
 public class ChecksumsTest
-    extends PlexusTestCase
+    extends PlexusInSpringTestCase
 {
     private static final String GOOD = "good";
 
-- 
cgit v1.2.3