diff options
4 files changed, 23 insertions, 3 deletions
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java index a20d4688a..07176cdf9 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java @@ -100,7 +100,7 @@ public class RepositoryContentConsumersTest RepositoryContentConsumers consumerUtil = applicationContext.getBean( "repositoryContentConsumers#test", RepositoryContentConsumers.class ); - ApplicationContext context = new MockApplicationContext( consumerUtil.getAvailableKnownConsumers( ), + ApplicationContext context = new MockApplicationContext( consumerUtil.getAvailableKnownConsumers( ), // consumerUtil.getAvailableInvalidConsumers( ) ); consumerUtilStub.setApplicationContext( context ); @@ -436,6 +436,13 @@ public class RepositoryContentConsumersTest } @Override + public <T> T getBean( Class<T> aClass, Object... objects ) + throws BeansException + { + throw new UnsupportedOperationException( "Not supported yet." ); + } + + @Override public Map getBeansOfType( Class type ) throws BeansException { diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java index 964148370..f11620ac9 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java @@ -21,7 +21,6 @@ package org.apache.archiva.web.rss; import junit.framework.TestCase; -import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.codec.Encoder; import org.apache.commons.codec.binary.Base64; @@ -238,6 +237,13 @@ public class RssFeedServletTest } @Override + public <T> T getBean( Class<T> aClass, Object... objects ) + throws BeansException + { + return applicationContext.getBean( aClass, objects ); + } + + @Override public <T> Map<String, T> getBeansOfType( Class<T> tClass, boolean b, boolean b2 ) throws BeansException { 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 58f51b1a8..86d291d26 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 @@ -329,6 +329,13 @@ public abstract class AbstractRepositoryServletTestCase } @Override + public <T> T getBean( Class<T> aClass, Object... objects ) + throws BeansException + { + return applicationContext.getBean( aClass, objects ); + } + + @Override public Object getBean( String s ) throws BeansException { @@ -75,7 +75,7 @@ <slf4j.version>1.7.7</slf4j.version> <log4j.version>2.0.2</log4j.version> - <spring.version>4.0.6.RELEASE</spring.version> + <spring.version>4.1.0.RELEASE</spring.version> <javax.jcr.version>2.0</javax.jcr.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |