This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 42b2481f670f63835ad28d23c5138c8ccd1ab251 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Thu Dec 17 14:57:26 2020 +0000 Revert "Update to hsqldb 2.5.1 (#687)" This reverts commit b79b5a44528bdb67141461589343a34cda7858f3. (cherry picked from commit 0f30442f3acb82e9936d4b486e07f5c341c142d2) # Conflicts: # parent/pom.xml --- parent/pom.xml | 6 +++--- .../org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java | 3 --- .../rs-security/src/test/resources/META-INF/persistence.xml | 10 +++++----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 666d203..5b1bdaf 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.validator.version>6.1.4.Final</cxf.hibernate.validator.version> - <cxf.hsqldb.version>2.5.1</cxf.hsqldb.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.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=""/>
