-update to PlexusInSpringTestCase

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@647649 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml
index c94fcb642d644ff49bd3c8c6aa1d9ad7047ef301..de0be6b6f9a2287b44003a6925febda89f410070 100644 (file)
--- 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 09937653385b9af344cac36a46341debc69f7e26..a503d6f8b9d39a8cfe7ebaca15e64694e56a1145 100644 (file)
--- 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" );