You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/03/25 05:34:36 UTC
[tomee] branch TOMEE-3872 created (now 60e1d7a)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch TOMEE-3872
in repository https://gitbox.apache.org/repos/asf/tomee.git.
at 60e1d7a TOMEE-3872 - Update Hibernate Integration to 5.6.7
This branch includes the following new commits:
new 60e1d7a TOMEE-3872 - Update Hibernate Integration to 5.6.7
The 1 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.
[tomee] 01/01: TOMEE-3872 - Update Hibernate Integration to 5.6.7
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch TOMEE-3872
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 60e1d7a67bb946a300038854d4597f31229c9697
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Fri Mar 25 06:34:25 2022 +0100
TOMEE-3872 - Update Hibernate Integration to 5.6.7
---
container/openejb-jpa-integration/pom.xml | 14 +++++++++++++-
examples/jpa-hibernate-arquillian/README.adoc | 13 +++++--------
.../src/test/resources/arquillian.xml | 14 +++++---------
pom.xml | 4 ++--
utils/openejb-core-hibernate/pom.xml | 12 ++++++++----
5 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml
index c4e6f9e..2eee5c2 100644
--- a/container/openejb-jpa-integration/pom.xml
+++ b/container/openejb-jpa-integration/pom.xml
@@ -40,9 +40,21 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
+ <artifactId>hibernate-core</artifactId>
<exclusions>
<exclusion>
+ <groupId>javax.persistence</groupId>
+ <artifactId>javax.persistence-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+ </exclusion>
+ <exclusion>
<artifactId>jboss-logging</artifactId>
<groupId>org.jboss.logging</groupId>
</exclusion>
diff --git a/examples/jpa-hibernate-arquillian/README.adoc b/examples/jpa-hibernate-arquillian/README.adoc
index 0c7ae97..e34d96a 100644
--- a/examples/jpa-hibernate-arquillian/README.adoc
+++ b/examples/jpa-hibernate-arquillian/README.adoc
@@ -192,16 +192,13 @@ The property `additionalLibs` provide to the server the jar files required for H
<property name="cleanOnStartUp">true</property>
<property name="additionalLibs">
<!-- add hibernate 5 need it jars to the server-->
- mvn:org.hibernate:hibernate-entitymanager:5.4.10.Final
- mvn:org.hibernate:hibernate-core:5.4.10.Final
- mvn:org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
+ mvn:org.hibernate:hibernate-core:5.6.7.Final
+ mvn:org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
mvn:antlr:antlr:2.7.7
- mvn:org.jboss:jandex:1.1.0.Final
+ mvn:org.jboss:jandex:2.4.2.Final
mvn:org.jboss.logging:jboss-logging:3.3.2.Final
- mvn:dom4j:dom4j:1.6.1
- mvn:org.javassist:javassist:3.18.1-GA
- mvn:net.bytebuddy:byte-buddy:1.10.2
- mvn:com.fasterxml:classmate:1.0.0
+ mvn:net.bytebuddy:byte-buddy:1.12.8
+ mvn:com.fasterxml:classmate:1.5.1
</property>
</configuration>
diff --git a/examples/jpa-hibernate-arquillian/src/test/resources/arquillian.xml b/examples/jpa-hibernate-arquillian/src/test/resources/arquillian.xml
index e55b693..90740e3 100644
--- a/examples/jpa-hibernate-arquillian/src/test/resources/arquillian.xml
+++ b/examples/jpa-hibernate-arquillian/src/test/resources/arquillian.xml
@@ -29,18 +29,14 @@
<property name="cleanOnStartUp">true</property>
<property name="additionalLibs">
<!-- add hibernate 5 need it jars to the server-->
- mvn:org.hibernate:hibernate-entitymanager:5.4.10.Final
- mvn:org.hibernate:hibernate-core:5.4.10.Final
- mvn:org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
+ mvn:org.hibernate:hibernate-core:5.6.7.Final
+ mvn:org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
mvn:antlr:antlr:2.7.7
- mvn:org.jboss:jandex:1.1.0.Final
+ mvn:org.jboss:jandex:2.4.2.Final
mvn:org.jboss.logging:jboss-logging:3.3.2.Final
- mvn:dom4j:dom4j:1.6.1
- mvn:org.javassist:javassist:3.18.1-GA
- mvn:net.bytebuddy:byte-buddy:1.10.2
- mvn:com.fasterxml:classmate:1.0.0
+ mvn:net.bytebuddy:byte-buddy:1.12.8
+ mvn:com.fasterxml:classmate:1.5.1
</property>
-
</configuration>
</container>
</arquillian>
diff --git a/pom.xml b/pom.xml
index 1fc5e72..691c075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
<version.hsqldb>2.3.4</version.hsqldb>
<version.axiom>1.3.0</version.axiom>
<version.xalan>2.7.2</version.xalan>
- <version.hibernate>5.4.10.Final</version.hibernate>
+ <version.hibernate>5.6.7.Final</version.hibernate>
<version.eclipselink>2.7.9</version.eclipselink>
<version.groovy>2.4.12</version.groovy>
<version.ecj>4.6.1</version.ecj>
@@ -1970,7 +1970,7 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
+ <artifactId>hibernate-core</artifactId>
<version>${version.hibernate}</version>
<exclusions>
<exclusion>
diff --git a/utils/openejb-core-hibernate/pom.xml b/utils/openejb-core-hibernate/pom.xml
index cb73694..e537f3f 100644
--- a/utils/openejb-core-hibernate/pom.xml
+++ b/utils/openejb-core-hibernate/pom.xml
@@ -55,15 +55,19 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
+ <artifactId>hibernate-core</artifactId>
<exclusions>
<exclusion>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <groupId>javax.persistence</groupId>
+ <artifactId>javax.persistence-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <artifactId>jboss-transaction-api_1.2_spec</artifactId>
</exclusion>
<exclusion>
<artifactId>jboss-logging</artifactId>