This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new b79b5a4 Update to hsqldb 2.5.1 (#687)
b79b5a4 is described below
commit b79b5a44528bdb67141461589343a34cda7858f3
Author: Alexey Markevich <[email protected]>
AuthorDate: Thu Aug 13 10:07:50 2020 +0300
Update to hsqldb 2.5.1 (#687)
* Update to hsqldb 2.5.1
* change @Column configuration
---
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, 10 insertions(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f6c680e..448957a 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>1.3</cxf.hamcrest.version>
<cxf.hazelcast.version>3.12.7</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.4.Final</cxf.hibernate.validator.version>
- <cxf.hsqldb.version>2.5.0</cxf.hsqldb.version>
+ <cxf.hsqldb.version>2.5.1</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.12</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 c0c4b97..19dcb7b 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,6 +19,7 @@
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;
@@ -54,6 +55,7 @@ public class OidcUserSubject extends UserSubject {
@Lob
@Basic(fetch = FetchType.EAGER)
+ @Column(columnDefinition = "blob")
public IdToken getIdToken() {
return idToken;
}
@@ -64,6 +66,7 @@ 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 ddab4c4..5da7fe0 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://java.sun.com/xml/ns/persistence";
+<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";
- version="2.0">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd";
+ version="2.2">
<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"/>
+ <property name="hibernate.connection.url"
value="jdbc:hsqldb:mem:oauth-jpa;sql.syntax_pgs=true"/>
<property name="hibernate.connection.driver_class"
value="org.hsqldb.jdbcDriver"/>
- <property name="hibernate.dialect"
value="org.hibernate.dialect.HSQLDialect"/>
+ <property name="hibernate.dialect"
value="org.hibernate.dialect.PostgreSQL10Dialect"/>
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.connection.username" value="sa"/>
<property name="hibernate.connection.password" value=""/>
