From f443a28550cd051f75e5195b771d1333bb18c34e Mon Sep 17 00:00:00 2001
From: "Maria Odea B. Ching" <oching@apache.org>
Date: Mon, 14 Apr 2008 02:49:38 +0000
Subject: [PATCH] -update to PlexusInSpringTestCase

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@647649 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-modules/archiva-base/archiva-indexer/pom.xml      | 6 ++++++
 .../indexer/search/DefaultCrossRepositorySearchTest.java  | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml
index c94fcb642..de0be6b6f 100644
--- a/archiva-modules/archiva-base/archiva-indexer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml
@@ -52,6 +52,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>commons-lang</groupId>
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
index 099376533..a503d6f8b 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
@@ -32,7 +32,7 @@ import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory;
 import org.apache.maven.archiva.indexer.bytecode.BytecodeRecord;
 import org.apache.maven.archiva.indexer.filecontent.FileContentRecord;
 import org.apache.maven.archiva.indexer.hashcodes.HashcodesRecord;
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -46,8 +46,8 @@ import java.util.Map;
  * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
  * @version $Id$
  */
-public class DefaultCrossRepositorySearchTest
-    extends PlexusTestCase
+public class DefaultCrossRepositorySearchTest    
+    extends PlexusInSpringTestCase
 {
     private static final String TEST_DEFAULT_REPOSITORY_NAME = "Test Default Repository";
 
@@ -61,7 +61,7 @@ public class DefaultCrossRepositorySearchTest
 
         RepositoryContentIndexFactory indexFactory =
             (RepositoryContentIndexFactory) lookup( RepositoryContentIndexFactory.class
-                .getName(), "lucene" );
+               .getName(), "lucene" );
 
         File repoDir = new File( getBasedir(), "src/test/managed-repository" );
 
-- 
2.39.5