This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new ec0ecb7 Switch to spring 5.2
ec0ecb7 is described below
commit ec0ecb744bc0da37731a3d82c01c93af49c8e088
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sat Jun 27 20:53:27 2020 +0200
Switch to spring 5.2
---
.../spring-context-cleanup-released-snapshots.xml | 4 +---
.../spring-context-purge-consumer-test.xml | 4 +---
.../src/test/resources/spring-context.xml | 4 +---
.../src/test/resources/spring-context.xml | 4 +---
.../scanner/RepositoryContentConsumersTest.java | 25 ++++++++++++++++++++++
.../src/test/resources/spring-context.xml | 4 +---
.../src/test/resources/META-INF/spring-context.xml | 4 +---
.../src/test/resources/spring-context.xml | 4 +---
.../resources/META-INF/spring-context-test.xml | 4 +---
.../src/test/resources/spring-context.xml | 4 +---
.../apache/archiva/web/rss/RssFeedServletTest.java | 25 ++++++++++++++++++++++
.../test/resources/spring-context-test-common.xml | 4 +---
.../test/resources/spring-context-test-upload.xml | 4 +---
.../src/test/resources/spring-context-with-jcr.xml | 4 +---
.../src/main/resources/META-INF/spring-context.xml | 4 +---
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +---
.../webdav/AbstractRepositoryServletTestCase.java | 25 ++++++++++++++++++++++
.../spring-context-servlet-security-test.xml | 4 +---
.../src/test/resources/spring-context.xml | 4 +---
19 files changed, 91 insertions(+), 48 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 5af1434..2f64658 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 ad3e765..2f1521a 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 1ce2a8f..5fccfc7 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 aaef0ac..5c201e5 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 ae39199..ab245e4 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
{
diff --git
a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/spring-context.xml
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/spring-context.xml
index f4568d1..c734bbc 100644
---
a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-maven/archiva-maven-indexer/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-maven/archiva-maven-proxy/src/test/resources/META-INF/spring-context.xml
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/META-INF/spring-context.xml
index f900a93..798a69e 100644
---
a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/META-INF/spring-context.xml
+++
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/META-INF/spring-context.xml
@@ -37,9 +37,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-maven/archiva-maven-proxy/src/test/resources/spring-context.xml
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/spring-context.xml
index a97bfe5..d9cc2c9 100755
---
a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/spring-context.xml
@@ -90,9 +90,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-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
index 079c80c..bec39de 100644
---
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
+++
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
@@ -111,9 +111,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-security/src/test/resources/spring-context.xml
b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
index c155700..c94f9c6 100644
---
a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
@@ -125,9 +125,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-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 e0079bb..daae4c7 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
@@ -38,6 +38,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;
@@ -256,6 +257,18 @@ public class RssFeedServletTest
}
@Override
+ public <T> ObjectProvider<T> getBeanProvider( Class<T> aClass )
+ {
+ return null;
+ }
+
+ @Override
+ public <T> ObjectProvider<T> getBeanProvider( ResolvableType
resolvableType )
+ {
+ return null;
+ }
+
+ @Override
public <T> Map<String, T> getBeansOfType( Class<T> tClass, boolean b,
boolean b2 )
throws BeansException
{
@@ -345,6 +358,12 @@ public class RssFeedServletTest
}
@Override
+ public Class<?> getType( String s, boolean b ) throws
NoSuchBeanDefinitionException
+ {
+ return null;
+ }
+
+ @Override
public String[] getAliases( String s )
{
return applicationContext.getAliases( s );
@@ -402,6 +421,12 @@ public class RssFeedServletTest
}
@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-web-common/src/test/resources/spring-context-test-common.xml
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
index 97c30ca..5bbaa7f 100644
---
a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
+++
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
@@ -91,9 +91,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-web-common/src/test/resources/spring-context-test-upload.xml
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
index 8bfa44d..f1c60f9 100644
---
a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
+++
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
@@ -90,9 +90,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-web-common/src/test/resources/spring-context-with-jcr.xml
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
index 0b483ff..79622a7 100644
---
a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
+++
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
@@ -64,9 +64,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-webapp/src/main/resources/META-INF/spring-context.xml
b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
index a66c925..c002992 100755
---
a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
+++
b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
@@ -53,9 +53,7 @@
<jee:jndi-lookup id="dataSource" jndi-name="java:/comp/env/jdbc/users" />
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="dataSource" />
- <property name="jpaVendorAdapter" >
- <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter" />
- </property>
+
</bean>
diff --git
a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 62bb387..a26cc72 100644
---
a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++
b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -273,9 +273,7 @@
<!-- END SNIPPET: jcr-location -->
<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.xml" />
<property name="jpaPropertyMap">
<map>
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 a712697..6c564a5 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 dbe40f9..9714ece 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 795b56c..c54f379 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>
