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-redback-core.git
The following commit(s) were added to refs/heads/master by this push:
new b4c86e9 Switch to spring 5.2
b4c86e9 is described below
commit b4c86e98c8db607f6b0e46f8094125f80ca71e68
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sat Jun 27 20:52:48 2020 +0200
Switch to spring 5.2
---
.../src/test/resources/spring-context.xml | 4 +---
.../redback-authorization-rbac/src/test/resources/spring-context.xml | 4 +---
.../redback-common-integrations/src/test/resources/spring-context.xml | 4 +---
.../redback-rest-services/src/test/resources/spring-context.xml | 4 +---
.../redback-keys-cached/src/test/resources/spring-context.xml | 4 +---
.../redback-keys-jpa/src/test/resources/spring-context.xml | 4 +---
.../redback-rbac-cached/src/test/resources/spring-context.xml | 4 +---
.../redback-rbac-jpa/src/test/resources/spring-context.xml | 4 +---
.../redback-rbac-ldap/src/test/resources/spring-context.xml | 4 +---
.../redback-rbac-memory/src/test/resources/spring-context.xml | 4 +---
.../redback-rbac-role-manager/src/test/resources/spring-context.xml | 4 +---
redback-system/src/test/resources/spring-context.xml | 4 +---
.../redback-users-cached/src/test/resources/spring-context.xml | 4 +---
.../redback-users-jpa/src/test/resources/spring-context.xml | 3 ---
14 files changed, 13 insertions(+), 42 deletions(-)
diff --git
a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml
b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml
index d8239a5..76b3c7f 100644
---
a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml
+++
b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml
@@ -42,9 +42,7 @@
<alias name="userManager#configurable" alias="userManager#default"/>
<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/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
index 40481d3..2444586 100644
---
a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
+++
b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
@@ -59,9 +59,7 @@
***
-->
<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/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
index 505d5b3..1eb8ddc 100644
---
a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
+++
b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
@@ -49,9 +49,7 @@
***
-->
<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/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
index 935b7c3..e2b584d 100644
---
a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
+++
b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
@@ -59,9 +59,7 @@
***
-->
<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/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
index 562fccd..bae4967 100644
---
a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
+++
b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
@@ -49,9 +49,7 @@
</bean>
<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/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml
b/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml
index ff7486b..b3f05a5 100644
---
a/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml
+++
b/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml
@@ -32,9 +32,7 @@
<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/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
index 46c09b6..6fb402a 100755
---
a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
@@ -79,9 +79,7 @@
***
-->
<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/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml
index 27cacad..066b841 100644
---
a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml
@@ -41,9 +41,7 @@
<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/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
index fe791da..ddf426e 100755
---
a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
@@ -115,9 +115,7 @@
***
-->
<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/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
index 2a4d5b0..5f8aaca 100755
---
a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
@@ -46,9 +46,7 @@
***
-->
<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/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
index b452972..5954c15 100755
---
a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
+++
b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
@@ -69,9 +69,7 @@ Needed because of the dependency redback-user-cache ->
redback-user-jpa
***
-->
<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/redback-system/src/test/resources/spring-context.xml
b/redback-system/src/test/resources/spring-context.xml
index dcdba2c..8d2c868 100644
--- a/redback-system/src/test/resources/spring-context.xml
+++ b/redback-system/src/test/resources/spring-context.xml
@@ -30,9 +30,7 @@
<context:property-placeholder system-properties-mode="OVERRIDE"/>
<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/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
index 17681f2..23ba286 100644
---
a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
+++
b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
@@ -53,9 +53,7 @@
<alias name="userManager#configurable" alias="userManager#default"/>
<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/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
b/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
index f8bb79f..f94b514 100644
---
a/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
+++
b/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
@@ -52,9 +52,6 @@
<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>
