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:18 UTC
[tomee] branch master updated (9151672 -> 7c73c55)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 9151672 TOMEE-2765 ShrinkWrap Maven Resolver 3.1.4 Upgrade ShrinkWrap Resolver to leverage https://repo1.maven.org/maven2 url
new d521c8e TOMEE-2768 Update to Hibernate 5.4.10
new 7c73c55 TOMEE-2768 Updating hibernate versions in Arquillian tests
The 2 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.
Summary of changes:
.../tests/cmp/sample/CustomOrmXmlHibernateEarTest.java | 11 ++++++-----
.../openejb/arquillian/tests/hibernate/HibernateTest.java | 2 +-
.../src/test/resources/hibernate-pom.xml | 4 ++--
.../jpa-hibernate/src/main/resources/META-INF/persistence.xml | 2 +-
.../test/java/org/superbiz/injection/h3jpa/MoviesTest.java | 1 +
pom.xml | 2 +-
6 files changed, 12 insertions(+), 10 deletions(-)
[tomee] 02/02: TOMEE-2768 Updating hibernate versions in Arquillian
tests
Posted by jg...@apache.org.
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>
[tomee] 01/02: TOMEE-2768 Update to Hibernate 5.4.10
Posted by jg...@apache.org.
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 d521c8e72d897dcbf85b69cfb5ce506623c249d6
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Jan 29 14:29:19 2020 +0000
TOMEE-2768 Update to Hibernate 5.4.10
---
examples/jpa-hibernate/src/main/resources/META-INF/persistence.xml | 2 +-
.../src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java | 1 +
pom.xml | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/examples/jpa-hibernate/src/main/resources/META-INF/persistence.xml b/examples/jpa-hibernate/src/main/resources/META-INF/persistence.xml
index 77aba69..79d2e33 100644
--- a/examples/jpa-hibernate/src/main/resources/META-INF/persistence.xml
+++ b/examples/jpa-hibernate/src/main/resources/META-INF/persistence.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
<persistence-unit name="movie-unit">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<jta-data-source>movieDatabase</jta-data-source>
<non-jta-data-source>movieDatabaseUnmanaged</non-jta-data-source>
<properties>
diff --git a/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java b/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java
index e2e6067..85ac2bc 100644
--- a/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java
+++ b/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java
@@ -30,6 +30,7 @@ public class MoviesTest extends TestCase {
public void test() throws Exception {
System.setProperty("hsqldb.reconfig_logging", "false");
+ System.setProperty("tomee.jpa.factory.lazy", "true");
final Properties p = new Properties();
p.put("movieDatabase", "new://Resource?type=DataSource");
diff --git a/pom.xml b/pom.xml
index aa36aef..0728bb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,7 +202,7 @@
<version.hsqldb>2.3.2</version.hsqldb>
<version.axiom>1.2.20</version.axiom>
<version.xalan>2.7.2</version.xalan>
- <version.hibernate>4.2.18.Final</version.hibernate>
+ <version.hibernate>5.4.10.Final</version.hibernate>
<version.eclipselink>2.7.4</version.eclipselink>
<version.groovy>2.4.12</version.groovy>