Switch to spring 5.2

3 files changed, 27 insertions, 6 deletions

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 a712697ab..6c564a5e3 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
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
@@ -416,6 +417,18 @@ public abstract class AbstractRepositoryServletTestCase
         }
 
         @Override
+        public <T> ObjectProvider<T> getBeanProvider( Class<T> aClass )
+        {
+            return null;
+        }
+
+        @Override
+        public <T> ObjectProvider<T> getBeanProvider( ResolvableType resolvableType )
+        {
+            return null;
+        }
+
+        @Override
         public Object getBean( String s )
             throws BeansException
         {
@@ -478,6 +491,12 @@ public abstract class AbstractRepositoryServletTestCase
         }
 
         @Override
+        public Class<?> getType( String s, boolean b ) throws NoSuchBeanDefinitionException
+        {
+            return null;
+        }
+
+        @Override
         public String[] getAliases( String s )
         {
             return applicationContext.getAliases( s );
@@ -523,6 +542,12 @@ public abstract class AbstractRepositoryServletTestCase
         }
 
         @Override
+        public String[] getBeanNamesForType( ResolvableType resolvableType, boolean b, boolean b1 )
+        {
+            return new String[0];
+        }
+
+        @Override
         public boolean isTypeMatch( String s, ResolvableType resolvableType )
             throws NoSuchBeanDefinitionException
         {
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
index dbe40f9c1..9714ece35 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
@@ -77,9 +77,7 @@
    JPA settings
    *** -->
   <bean name="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-    <property name="jpaVendorAdapter" >
-      <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter" />
-    </property>
+
     <property name="persistenceXmlLocation" value="classpath:META-INF/persistence-hsqldb.xml" />
     <property name="jpaPropertyMap">
       <map>
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
index 795b56c88..c54f37936 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
@@ -79,9 +79,7 @@
    JPA settings
    *** -->
   <bean name="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-    <property name="jpaVendorAdapter" >
-      <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter" />
-    </property>
+
     <property name="persistenceXmlLocation" value="classpath:META-INF/persistence-hsqldb.xml" />
     <property name="jpaPropertyMap">
       <map>