From 373183554ddd4c39223c8d3716fd14a710341877 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 10 Sep 2014 15:09:00 +1000
Subject: [PATCH] spring 4.1.0

---
 .../scanner/RepositoryContentConsumersTest.java          | 9 ++++++++-
 .../org/apache/archiva/web/rss/RssFeedServletTest.java   | 8 +++++++-
 .../webdav/AbstractRepositoryServletTestCase.java        | 7 +++++++
 pom.xml                                                  | 2 +-
 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 );
@@ -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
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;
@@ -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
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
@@ -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
diff --git a/pom.xml b/pom.xml
index d42bb0b4c..2cfd0d739 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>
-- 
2.39.5