Switch to spring 5.2

5 files changed, 29 insertions, 12 deletions

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
index 5af14344f..2f646583c 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
@@ -73,9 +73,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-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
index ad3e7652f..2f1521abc 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
@@ -119,9 +119,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-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
index 1ce2a8f93..5fccfc770 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
@@ -50,9 +50,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-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
index aaef0ac3e..5c201e56f 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
@@ -66,9 +66,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-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 ae39199fa..ab245e453 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
@@ -35,6 +35,7 @@ import org.junit.runner.RunWith;
 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;
@@ -448,6 +449,18 @@ public class RepositoryContentConsumersTest
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
+        public <T> ObjectProvider<T> getBeanProvider( Class<T> aClass )
+        {
+            return null;
+        }
+
+        @Override
+        public <T> ObjectProvider<T> getBeanProvider( ResolvableType resolvableType )
+        {
+            return null;
+        }
+
         @SuppressWarnings( "unchecked" )
         @Override
         public <T> Map<String, T> getBeansOfType( Class<T> type )
@@ -513,6 +526,12 @@ public class RepositoryContentConsumersTest
         }
 
         @Override
+        public Class<?> getType( String s, boolean b ) throws NoSuchBeanDefinitionException
+        {
+            return null;
+        }
+
+        @Override
         public boolean isPrototype( String name )
             throws NoSuchBeanDefinitionException
         {
@@ -635,6 +654,12 @@ public class RepositoryContentConsumersTest
         }
 
         @Override
+        public String[] getBeanNamesForType( ResolvableType resolvableType, boolean b, boolean b1 )
+        {
+            return new String[0];
+        }
+
+        @Override
         public boolean isTypeMatch( String s, ResolvableType resolvableType )
             throws NoSuchBeanDefinitionException
         {