Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java (original) +++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java Mon Jul 2 07:36:23 2012 @@ -31,16 +31,16 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import javax.inject.Inject; import java.io.File; import java.util.ArrayList; import java.util.List; +import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner; import static org.mockito.Mockito.*; -@RunWith( SpringJUnit4ClassRunner.class ) +@RunWith( ArchivaSpringJUnit4ClassRunner.class ) @ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } ) public class Maven2RepositoryMergerTest extends TestCase @@ -57,6 +57,7 @@ public class Maven2RepositoryMergerTest private MetadataRepository metadataRepository; @Before + @Override public void setUp() throws Exception {
Modified: archiva/trunk/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff ============================================================================== --- archiva/trunk/pom.xml (original) +++ archiva/trunk/pom.xml Mon Jul 2 07:36:23 2012 @@ -38,6 +38,7 @@ <url>http://archiva.apache.org</url> <modules> + <module>archiva-testutil</module> <module>archiva-cli</module> <module>archiva-modules</module> <module>archiva-docs</module>
