Reverting change and fixing test case

diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 9a788e22473d70f2da3df40fe665fc6d8421fb96..dcfacf75c7459a5f8a6c4c419f22ab03b861e06a 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -157,10 +157,6 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-repository-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-web-common</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.archiva.redback</groupId>

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
index 6c564a5e37745a8bf5e40d5fe96ee47bc4a40a69..56b8445da6190e48a1023c457b2f154fc0564486 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
@@ -363,6 +363,18 @@ public abstract class AbstractRepositoryServletTestCase
             return applicationContext.getBeanDefinitionNames();
         }
 
+        @Override
+        public <T> ObjectProvider<T> getBeanProvider( Class<T> aClass, boolean b )
+        {
+            return null;
+        }
+
+        @Override
+        public <T> ObjectProvider<T> getBeanProvider( ResolvableType resolvableType, boolean b )
+        {
+            return null;
+        }
+
         @Override
         public String[] getBeanNamesForType( Class<?> aClass )
         {