Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spring 4.1.0

This commit is contained in:
Olivier Lamy 2014-09-10 15:09:00 +10:00
parent d79a630e09
commit 373183554d
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
View File

@ -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 );
@ -435,6 +435,13 @@ public class RepositoryContentConsumersTest
throw new UnsupportedOperationException( "Not supported yet." );
}
@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

8
archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
View File

@ -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;
@ -237,6 +236,13 @@ public class RssFeedServletTest
return applicationContext.getBeansOfType( tClass );
}
@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

7
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
View File

@ -328,6 +328,13 @@ public abstract class AbstractRepositoryServletTestCase
return applicationContext.findAnnotationOnBean( s, aClass );
}
@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

2
pom.xml
View File

@ -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>