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 7ddc3cc update hibernate.em to 5.4.2.Final
7ddc3cc is described below
commit 7ddc3cca73c010989f24c8ac58f2aebea9861cd0
Author: amarkevich <[email protected]>
AuthorDate: Mon Apr 15 14:47:50 2019 +0300
update hibernate.em to 5.4.2.Final
---
parent/pom.xml | 2 +-
rt/rs/extensions/search/pom.xml | 6 ++++++
rt/rs/security/oauth-parent/oauth2/pom.xml | 7 ++++++-
rt/rs/security/sso/oidc/pom.xml | 6 ++++++
systests/rs-security/pom.xml | 6 ++++++
5 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f29460d..04425df 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -94,7 +94,7 @@
<cxf.fastinfoset.bundle.version>1.2.16_1</cxf.fastinfoset.bundle.version>
<cxf.guava.version>20.0</cxf.guava.version>
<cxf.hazelcast.version>3.10.6</cxf.hazelcast.version>
- <cxf.hibernate.em.version>5.3.7.Final</cxf.hibernate.em.version>
+ <cxf.hibernate.em.version>5.4.2.Final</cxf.hibernate.em.version>
<cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
<cxf.httpcomponents.client.version>4.5.8</cxf.httpcomponents.client.version>
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index fab6d4b..d0c2aa2 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -137,6 +137,12 @@
<artifactId>hibernate-entitymanager</artifactId>
<version>${cxf.hibernate.em.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index a779177..0240618 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -122,6 +122,12 @@
<version>${cxf.hibernate.em.version}</version>
<scope>test</scope>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -184,7 +190,6 @@
<version>1.0.2.Final</version>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
<plugins>
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index 8023cd0..c94e880 100644
--- a/rt/rs/security/sso/oidc/pom.xml
+++ b/rt/rs/security/sso/oidc/pom.xml
@@ -84,6 +84,12 @@
<artifactId>hibernate-entitymanager</artifactId>
<version>${cxf.hibernate.em.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
index 7365917..d6f3bed 100644
--- a/systests/rs-security/pom.xml
+++ b/systests/rs-security/pom.xml
@@ -239,6 +239,12 @@
<artifactId>hibernate-entitymanager</artifactId>
<version>${cxf.hibernate.em.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
