You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2020/01/29 15:28:20 UTC

[tomee] 02/02: TOMEE-2768 Updating hibernate versions in Arquillian tests

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 7c73c55d7636091240217e21be60d20934d807f8
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Jan 29 15:26:08 2020 +0000

    TOMEE-2768 Updating hibernate versions in Arquillian tests
---
 .../tests/cmp/sample/CustomOrmXmlHibernateEarTest.java        | 11 ++++++-----
 .../openejb/arquillian/tests/hibernate/HibernateTest.java     |  2 +-
 .../src/test/resources/hibernate-pom.xml                      |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlHibernateEarTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlHibernateEarTest.java
index c6a4b2b..b14c1b6 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlHibernateEarTest.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlHibernateEarTest.java
@@ -63,15 +63,16 @@ public class CustomOrmXmlHibernateEarTest {
                 .addAsWebInfResource(new ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/web.xml"), "web.xml");
 
         final File[] hibernateDependencies = Maven.resolver().resolve(
-    "org.hibernate:hibernate-entitymanager:4.3.9.Final",
-            "org.hibernate:hibernate-core:4.3.9.Final",
-            "org.hibernate.common:hibernate-commons-annotations:4.0.5.Final",
+    "org.hibernate:hibernate-entitymanager:5.4.10.Final",
+            "org.hibernate:hibernate-core:5.4.10.Final",
+            "org.hibernate.common:hibernate-commons-annotations:5.1.0.Final",
             "antlr:antlr:2.7.7",
             "org.jboss:jandex:1.1.0.Final",
-            "org.jboss.logging:jboss-logging:3.1.3.GA",
-            "org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1",
+            "org.jboss.logging:jboss-logging:3.3.2.Final",
             "dom4j:dom4j:1.6.1",
             "org.javassist:javassist:3.18.1-GA",
+            "net.bytebuddy:byte-buddy:1.10.2",
+            "com.fasterxml:classmate:1.0.0",
             "mysql:mysql-connector-java:5.1.13"
         ).withoutTransitivity().asFile();
         
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java
index 10416f7..07f964f 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java
@@ -74,7 +74,7 @@ public class HibernateTest {
                         "    xsi:schemaLocation=\"http://java.sun.com/xml/ns/persistence" +
                         "                         http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd\">\n" +
                         "  <persistence-unit name=\"hibernate\">\n" +
-                        "    <provider>org.hibernate.ejb.HibernatePersistence</provider>\n" +
+                        "    <provider>org.hibernate.jpa.HibernatePersistence</provider>\n" +
                         "    <exclude-unlisted-classes>true</exclude-unlisted-classes>\n" +
                         "    <properties>\n" +
                         "      <property name=\"hibernate.hbm2ddl.auto\" value=\"create-drop\" />\n" +
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 71c32c6..8eca9ef 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
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
-      <version>4.1.12.Final</version>
+      <version>5.4.10.Final</version>
       <exclusions>
         <exclusion>
           <groupId>org.hibernate.javax.persistence</groupId>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-validator</artifactId>
-      <version>5.1.2.Final</version>
+      <version>5.1.3.Final</version>
       <exclusions>
         <exclusion>
           <groupId>javax.validation</groupId>