Merge pull request #1290 from sbeigel/hibernate-5.4

hibernate 5.4 update
playframework · Jan 25, 2019 · 7ea47aa · 7ea47aa
2 parents bf22d43 + 81b4fe6
commit 7ea47aa
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 13 deletions.
diff --git a/framework/dependencies.yml b/framework/dependencies.yml
@@ -35,7 +35,7 @@ require:    &allDependencies
     - junit 4.12
     - jregex 1.2_01
     - log4j 1.2.17
-    - net.sf.ehcache -> ehcache-core 2.6.11
+    - net.sf.ehcache -> ehcache 2.10.6
     - net.sf.ezmorph -> ezmorph 1.0.6
     - net.sf.jsr107cache -> jsr107cache 1.1
     - net.sf.oval -> oval 1.86
@@ -48,18 +48,19 @@ require:    &allDependencies
     - org.codehaus.groovy -> groovy 2.5.3
     - org.codehaus.groovy -> groovy-xml 2.5.3
     - org.eclipse.jdt -> org.eclipse.jdt.core 3.14.0
-    - org.hibernate -> hibernate-core 5.3.6.Final.patched
-    - net.bytebuddy -> byte-buddy 1.8.17
+    - org.hibernate -> hibernate-core 5.4.1.Final.patched
+    - net.bytebuddy -> byte-buddy 1.9.5
     - javax.persistence -> javax.persistence-api 2.2
     - org.hibernate.common -> hibernate-commons-annotations 5.0.1.Final
     - org.hibernate -> hibernate-validator 5.4.1.Final
     - org.jboss.logging -> jboss-logging 3.3.0.Final 
     - org.jboss.spec.javax.transaction -> jboss-transaction-api_1.2_spec 1.0.1.Final
     - javax.persistence -> javax.persistence-api 2.2 
-    - com.fasterxml -> classmate 1.3.3
-    - org.hibernate -> hibernate-c3p0 5.3.6.Final
-    - org.hibernate -> hibernate-entitymanager 5.3.6.Final
-    - org.hibernate -> hibernate-ehcache 5.3.6.Final
+    - javax.xml.bind -> jaxb-api 2.3.1
+    - org.glassfish.jaxb -> jaxb-runtime 2.3.1
+    - com.fasterxml -> classmate 1.3.4
+    - org.hibernate -> hibernate-c3p0 5.4.1.Final
+    - org.hibernate -> hibernate-ehcache 5.4.1.Final
     - com.mchange -> mchange-commons-java 0.2.12
     - org.javassist -> javassist 3.24.0-GA
     - io.netty -> netty 3.10.6.Final

diff --git a/framework/lib/byte-buddy-1.8.17.jar b/framework/lib/byte-buddy-1.8.17.jar
diff --git a/framework/lib/byte-buddy-1.9.5.jar b/framework/lib/byte-buddy-1.9.5.jar
diff --git a/framework/lib/classmate-1.3.3.jar → framework/lib/classmate-1.3.4.jar b/framework/lib/classmate-1.3.3.jar → framework/lib/classmate-1.3.4.jar
diff --git a/framework/lib/ehcache-2.10.6.jar b/framework/lib/ehcache-2.10.6.jar
diff --git a/framework/lib/hibernate-c3p0-5.3.6.Final.jar b/framework/lib/hibernate-c3p0-5.3.6.Final.jar
diff --git a/framework/lib/hibernate-c3p0-5.4.1.Final.jar b/framework/lib/hibernate-c3p0-5.4.1.Final.jar
diff --git a/...ib/hibernate-core-5.3.6.Final.patched.jar → ...ib/hibernate-core-5.4.1.Final.patched.jar b/...ib/hibernate-core-5.3.6.Final.patched.jar → ...ib/hibernate-core-5.4.1.Final.patched.jar
diff --git a/framework/lib/hibernate-ehcache-5.3.6.Final.jar b/framework/lib/hibernate-ehcache-5.3.6.Final.jar
diff --git a/framework/lib/hibernate-ehcache-5.4.1.Final.jar b/framework/lib/hibernate-ehcache-5.4.1.Final.jar
diff --git a/framework/lib/hibernate-entitymanager-5.3.6.Final.jar b/framework/lib/hibernate-entitymanager-5.3.6.Final.jar
diff --git a/framework/lib/jaxb-api-2.3.1.jar b/framework/lib/jaxb-api-2.3.1.jar
diff --git a/framework/lib/jaxb-runtime-2.3.1.jar b/framework/lib/jaxb-runtime-2.3.1.jar
diff --git a/framework/patches/hibernate-5.3.6-patch-play.README b/framework/patches/hibernate-5.3.6-patch-play.README
diff --git a/framework/patches/hibernate-5.4.1-patch-play.README b/framework/patches/hibernate-5.4.1-patch-play.README
@@ -0,0 +1,6 @@
+----
+Download Hibernate 5.4.0.Final source code, apply the patch, and build with gradle (tip use export GRADLE_OPTS=-Xmx1G -XX:MaxPermSize=512m)
+----
+
+DRY RUN -> patch --dry-run -p1 -i hibernate-5.4.1-patch-play.patch
+APPLY -> patch -p1 -i hibernate-5.4.1-patch-play.patch
diff --git a/.../patches/hibernate-5.3.6-patch-play.patch → .../patches/hibernate-5.4.1-patch-play.patch b/.../patches/hibernate-5.3.6-patch-play.patch → .../patches/hibernate-5.4.1-patch-play.patch