From: Martin Stockhammer Date: Sun, 30 May 2021 21:50:43 +0000 (+0200) Subject: Reverting change and fixing test case X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ca18ec34d706efa6fdc6ecde6277ba6004e8eb4e;p=archiva.git 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 9a788e224..dcfacf75c 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -157,10 +157,6 @@ org.apache.archiva metadata-repository-api - - org.apache.archiva - archiva-web-common - org.apache.archiva.redback 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 6c564a5e3..56b8445da 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 @@ -363,6 +363,18 @@ public abstract class AbstractRepositoryServletTestCase return applicationContext.getBeanDefinitionNames(); } + @Override + public ObjectProvider getBeanProvider( Class aClass, boolean b ) + { + return null; + } + + @Override + public ObjectProvider getBeanProvider( ResolvableType resolvableType, boolean b ) + { + return null; + } + @Override public String[] getBeanNamesForType( Class aClass ) {