You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/09/10 07:09:12 UTC
git commit: spring 4.1.0
Repository: archiva
Updated Branches:
refs/heads/master d79a630e0 -> 373183554
spring 4.1.0
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/37318355
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/37318355
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/37318355
Branch: refs/heads/master
Commit: 373183554ddd4c39223c8d3716fd14a710341877
Parents: d79a630
Author: Olivier Lamy <ol...@apache.org>
Authored: Wed Sep 10 15:09:00 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Wed Sep 10 15:09:00 2014 +1000
----------------------------------------------------------------------
.../repository/scanner/RepositoryContentConsumersTest.java | 9 ++++++++-
.../java/org/apache/archiva/web/rss/RssFeedServletTest.java | 8 +++++++-
.../archiva/webdav/AbstractRepositoryServletTestCase.java | 7 +++++++
pom.xml | 2 +-
4 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/37318355/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
----------------------------------------------------------------------
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 a20d468..07176cd 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/37318355/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
----------------------------------------------------------------------
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 9641483..f11620a 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/37318355/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
----------------------------------------------------------------------
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 58f51b1..86d291d 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/37318355/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d42bb0b..2cfd0d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>