Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to spring 5.2

This commit is contained in:
Martin Stockhammer 2020-06-27 20:53:27 +02:00
parent b0e52ea61a
commit ec0ecb744b
19 changed files with 91 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
View File

@ -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>

25
archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
View File

@ -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 )
@ -512,6 +525,12 @@ public class RepositoryContentConsumersTest
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public Class<?> getType( String s, boolean b ) throws NoSuchBeanDefinitionException
{
return null;
}
@Override
public boolean isPrototype( String name )
throws NoSuchBeanDefinitionException
@ -634,6 +653,12 @@ public class RepositoryContentConsumersTest
return new String[0];
}
@Override
public String[] getBeanNamesForType( ResolvableType resolvableType, boolean b, boolean b1 )
{
return new String[0];
}
@Override
public boolean isTypeMatch( String s, ResolvableType resolvableType )
throws NoSuchBeanDefinitionException

4
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/spring-context.xml
View File

@ -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>

4
archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/META-INF/spring-context.xml
View File

@ -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>

4
archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/spring-context.xml
View File

@ -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>

4
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
View File

@ -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>

4
archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
View File

@ -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>

25
archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
View File

@ -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;
@ -255,6 +256,18 @@ public class RssFeedServletTest
return applicationContext.getBean( aClass, objects );
}
@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
@ -344,6 +357,12 @@ public class RssFeedServletTest
return applicationContext.getType( s );
}
@Override
public Class<?> getType( String s, boolean b ) throws NoSuchBeanDefinitionException
{
return null;
}
@Override
public String[] getAliases( String s )
{
@ -401,6 +420,12 @@ public class RssFeedServletTest
return new String[0];
}
@Override
public String[] getBeanNamesForType( ResolvableType resolvableType, boolean b, boolean b1 )
{
return new String[0];
}
@Override
public boolean isTypeMatch( String s, ResolvableType resolvableType )
throws NoSuchBeanDefinitionException

4
archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
View File

@ -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>

4
archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
View File

@ -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>

4
archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
View File

@ -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>

4
archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
View File

@ -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>

4
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
View File

@ -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>

25
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
View File

@ -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;
@ -415,6 +416,18 @@ public abstract class AbstractRepositoryServletTestCase
return applicationContext.getBean( aClass, objects );
}
@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
@ -477,6 +490,12 @@ public abstract class AbstractRepositoryServletTestCase
return applicationContext.getType( s );
}
@Override
public Class<?> getType( String s, boolean b ) throws NoSuchBeanDefinitionException
{
return null;
}
@Override
public String[] getAliases( String s )
{
@ -522,6 +541,12 @@ public abstract class AbstractRepositoryServletTestCase
return new String[0];
}
@Override
public String[] getBeanNamesForType( ResolvableType resolvableType, boolean b, boolean b1 )
{
return new String[0];
}
@Override
public boolean isTypeMatch( String s, ResolvableType resolvableType )
throws NoSuchBeanDefinitionException

4
archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
View File

@ -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>

4
archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
View File

@ -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>