You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/04/21 21:02:25 UTC
[tomee] 01/02: Attempt to update Hibernate
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 88f681aa70bd23546c8e91b347a684c1236abeea
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Thu Apr 21 21:51:09 2022 +0200
Attempt to update Hibernate
---
.../tests/jaxrs/client/OverridedClientTest.java | 7 ++--
.../src/test/resources/hibernate-pom.xml | 38 +++++++++++++---------
arquillian/arquillian-tomee-tests/pom.xml | 6 ++--
container/openejb-jpa-integration/pom.xml | 4 +--
examples/mvc-cxf-hibernate/pom.xml | 10 +-----
pom.xml | 20 +++++++-----
utils/openejb-core-hibernate/pom.xml | 20 +++++++-----
7 files changed, 55 insertions(+), 50 deletions(-)
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/client/OverridedClientTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/client/OverridedClientTest.java
index dbc0367392..032d94bbe8 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/client/OverridedClientTest.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/client/OverridedClientTest.java
@@ -35,15 +35,14 @@ public class OverridedClientTest {
@Deployment
public static Archive<?> war() {
final MavenResolverSystem resolver = Maven.resolver();
- final String jerseyVersion = "2.17";
- final String hkApi = "2.4.0-b16";
+ final String jerseyVersion = "3.0.4";
+ final String hkApi = "3.0.3";
return ShrinkWrap.create(WebArchive.class, "OverridedClientTest.war")
.addAsServiceProvider(ClientBuilder.class.getName(), "org.glassfish.jersey.client.JerseyClientBuilder") // missing in jersey
.addAsLibraries(resolver.resolve("org.glassfish.jersey.core:jersey-common:" + jerseyVersion).withoutTransitivity().asFile())
.addAsLibraries(resolver.resolve("org.glassfish.jersey.core:jersey-client:" + jerseyVersion).withoutTransitivity().asFile())
.addAsLibraries(resolver.resolve("org.glassfish.hk2:hk2-api:" + hkApi).withoutTransitivity().asFile())
- .addAsLibraries(resolver.resolve("org.glassfish.hk2:hk2-core:" + hkApi).withoutTransitivity().asFile())
- .addAsLibraries(resolver.resolve("org.glassfish.jersey.bundles.repackaged:jersey-guava:" + jerseyVersion).withoutTransitivity().asFile());
+ .addAsLibraries(resolver.resolve("org.glassfish.hk2:hk2-core:" + hkApi).withoutTransitivity().asFile());
}
@Test
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/hibernate-pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/hibernate-pom.xml
index b3c648bae2..cce8859c9d 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/hibernate-pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/hibernate-pom.xml
@@ -21,34 +21,40 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openejb.arquillian.tests</groupId>
<version>1.0.0</version>
- <artifactId>codi-deps</artifactId>
+ <artifactId>hibernate-deps</artifactId>
<dependencies>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>5.4.10.Final</version>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>6.0.0.Final</version>
<exclusions>
<exclusion>
- <groupId>org.hibernate.jakarta.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.spec.jakarta.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>5.1.3.Final</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- </exclusions>
+ <version>7.0.4.Final</version>
</dependency>
</dependencies>
</project>
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index a089fac858..0d8571c168 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -144,9 +144,9 @@
<!-- for tests with Hibernate -->
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-jakarta</artifactId>
- <version>5.6.7.Final</version>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>6.0.0.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml
index 4bccb65c6d..654a2e429a 100644
--- a/container/openejb-jpa-integration/pom.xml
+++ b/container/openejb-jpa-integration/pom.xml
@@ -39,8 +39,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-jakarta</artifactId>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.persistence</groupId>
diff --git a/examples/mvc-cxf-hibernate/pom.xml b/examples/mvc-cxf-hibernate/pom.xml
index ec0268ae4c..71f196603a 100644
--- a/examples/mvc-cxf-hibernate/pom.xml
+++ b/examples/mvc-cxf-hibernate/pom.xml
@@ -61,15 +61,7 @@
<args>-Xmx512m -XX:PermSize=256m</args>
<libs>
<!-- add hibernate -->
- <lib>org.hibernate:hibernate-entitymanager:4.3.9.Final</lib>
- <lib>org.hibernate:hibernate-core:4.3.9.Final</lib>
- <lib>org.hibernate.common:hibernate-commons-annotations:4.0.5.Final</lib>
- <lib>antlr:antlr:2.7.7</lib>
- <lib>org.jboss:jandex:1.1.0.Final</lib>
- <lib>org.jboss.logging:jboss-logging:3.1.3.GA</lib>
- <lib>org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1</lib>
- <lib>dom4j:dom4j:1.6.1</lib>
- <lib>org.javassist:javassist:3.18.1-GA</lib>
+ <lib>org.hibernate.orm:hibernate-core:6.0.0.Final</lib>
<lib>remove:openjpa</lib>
</libs>
</configuration>
diff --git a/pom.xml b/pom.xml
index 7d701d62e3..24016c87ca 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.6.7.Final</version.hibernate>
+ <version.hibernate>6.0.0.Final</version.hibernate>
<version.eclipselink>3.0.2</version.eclipselink>
<version.groovy>2.4.12</version.groovy>
<version.ecj>4.6.1</version.ecj>
@@ -1885,25 +1885,29 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-jakarta</artifactId>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
<version>${version.hibernate}</version>
<exclusions>
<exclusion>
<groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.transaction</groupId>
- <artifactId>jakarta.transaction-api</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
- <artifactId>jboss-logging</artifactId>
- <groupId>org.jboss.logging</groupId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/utils/openejb-core-hibernate/pom.xml b/utils/openejb-core-hibernate/pom.xml
index fc47f1c31b..8aee4cc921 100644
--- a/utils/openejb-core-hibernate/pom.xml
+++ b/utils/openejb-core-hibernate/pom.xml
@@ -46,24 +46,28 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-jakarta</artifactId>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.transaction</groupId>
- <artifactId>jakarta.transaction-api</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
- <artifactId>jboss-logging</artifactId>
- <groupId>org.jboss.logging</groupId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -87,7 +91,7 @@
<version>${version.hibernate}</version>
<exclusions>
<exclusion>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
</exclusion>
<exclusion>