[archiva] branch master updated: Reverting change and fixing test case

[martin_s]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git


The following commit(s) were added to refs/heads/master by this push:
     new ca18ec3  Reverting change and fixing test case
ca18ec3 is described below

commit ca18ec34d706efa6fdc6ecde6277ba6004e8eb4e
Author: Martin Stockhammer <marti...@apache.org>
AuthorDate: Sun May 30 23:50:43 2021 +0200

    Reverting change and fixing test case
---
 archiva-modules/archiva-web/archiva-webdav/pom.xml           |  4 ----
 .../archiva/webdav/AbstractRepositoryServletTestCase.java    | 12 ++++++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml 
b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 9a788e2..dcfacf7 100644
--- 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 6c564a5..56b8445 100644
--- 
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
@@ -364,6 +364,18 @@ public abstract class AbstractRepositoryServletTestCase
         }
 
         @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 )
         {
             return applicationContext.getBeanNamesForType( aClass );