You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/12/17 15:52:59 UTC
[cxf] branch master updated (8100e4d -> eded3ad)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 8100e4d Fixing some outdated comments
new 0f30442 Revert "Update to hsqldb 2.5.1 (#687)"
new eded3ad Updating Hibernate to 5.4.19.Final
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
parent/pom.xml | 2 +-
.../org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java | 3 ---
.../rs-security/src/test/resources/META-INF/persistence.xml | 10 +++++-----
3 files changed, 6 insertions(+), 9 deletions(-)
[cxf] 01/02: Revert "Update to hsqldb 2.5.1 (#687)"
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0f30442f3acb82e9936d4b486e07f5c341c142d2
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Dec 17 14:57:26 2020 +0000
Revert "Update to hsqldb 2.5.1 (#687)"
This reverts commit b79b5a44528bdb67141461589343a34cda7858f3.
---
parent/pom.xml | 4 ++--
.../org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java | 3 ---
.../rs-security/src/test/resources/META-INF/persistence.xml | 10 +++++-----
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index bde9901..3831271 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -119,9 +119,9 @@
<cxf.guava.version>29.0-jre</cxf.guava.version>
<cxf.hamcrest.version>2.2</cxf.hamcrest.version>
<cxf.hazelcast.version>3.12.9</cxf.hazelcast.version>
- <cxf.hibernate.em.version>5.4.19.Final</cxf.hibernate.em.version>
+ <cxf.hibernate.em.version>5.4.18.Final</cxf.hibernate.em.version>
<cxf.hibernate.validator.version>6.1.6.Final</cxf.hibernate.validator.version>
- <cxf.hsqldb.version>2.5.1</cxf.hsqldb.version>
+ <cxf.hsqldb.version>2.5.0</cxf.hsqldb.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
<cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java
index 19dcb7b..c0c4b97 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java
@@ -19,7 +19,6 @@
package org.apache.cxf.rs.security.oidc.idp;
import javax.persistence.Basic;
-import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Lob;
@@ -55,7 +54,6 @@ public class OidcUserSubject extends UserSubject {
@Lob
@Basic(fetch = FetchType.EAGER)
- @Column(columnDefinition = "blob")
public IdToken getIdToken() {
return idToken;
}
@@ -66,7 +64,6 @@ public class OidcUserSubject extends UserSubject {
@Lob
@Basic(fetch = FetchType.EAGER)
- @Column(columnDefinition = "blob")
public UserInfo getUserInfo() {
return userInfo;
}
diff --git a/systests/rs-security/src/test/resources/META-INF/persistence.xml b/systests/rs-security/src/test/resources/META-INF/persistence.xml
index 5da7fe0..ddab4c4 100644
--- a/systests/rs-security/src/test/resources/META-INF/persistence.xml
+++ b/systests/rs-security/src/test/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
-<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd"
- version="2.2">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
<persistence-unit name="test-hibernate-cxf-systests-rs-security" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
@@ -18,9 +18,9 @@
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<shared-cache-mode>ENABLE_SELECTIVE</shared-cache-mode>
<properties>
- <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:oauth-jpa;sql.syntax_pgs=true"/>
+ <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:oauth-jpa"/>
<property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
- <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQL10Dialect"/>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.connection.username" value="sa"/>
<property name="hibernate.connection.password" value=""/>
[cxf] 02/02: Updating Hibernate to 5.4.19.Final
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit eded3ad6d5f716f08709f1cc57cfe339d9b61c33
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Dec 17 14:57:48 2020 +0000
Updating Hibernate to 5.4.19.Final
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 3831271..c224ec2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -119,7 +119,7 @@
<cxf.guava.version>29.0-jre</cxf.guava.version>
<cxf.hamcrest.version>2.2</cxf.hamcrest.version>
<cxf.hazelcast.version>3.12.9</cxf.hazelcast.version>
- <cxf.hibernate.em.version>5.4.18.Final</cxf.hibernate.em.version>
+ <cxf.hibernate.em.version>5.4.19.Final</cxf.hibernate.em.version>
<cxf.hibernate.validator.version>6.1.6.Final</cxf.hibernate.validator.version>
<cxf.hsqldb.version>2.5.0</cxf.hsqldb.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>