diff --git a/framework/dependencies.yml b/framework/dependencies.yml index edd2728e13..674aa3d9cd 100644 --- 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 deleted file mode 100644 index 45d3a293ce..0000000000 Binary files a/framework/lib/byte-buddy-1.8.17.jar and /dev/null differ diff --git a/framework/lib/byte-buddy-1.9.5.jar b/framework/lib/byte-buddy-1.9.5.jar new file mode 100644 index 0000000000..c18b9a65b6 Binary files /dev/null and b/framework/lib/byte-buddy-1.9.5.jar differ diff --git a/framework/lib/classmate-1.3.3.jar b/framework/lib/classmate-1.3.4.jar similarity index 84% rename from framework/lib/classmate-1.3.3.jar rename to framework/lib/classmate-1.3.4.jar index d44873ea54..5be6d9961f 100644 Binary files a/framework/lib/classmate-1.3.3.jar and b/framework/lib/classmate-1.3.4.jar differ diff --git a/framework/lib/ehcache-2.10.6.jar b/framework/lib/ehcache-2.10.6.jar new file mode 100644 index 0000000000..95e2dbabf7 Binary files /dev/null and b/framework/lib/ehcache-2.10.6.jar differ diff --git a/framework/lib/hibernate-c3p0-5.3.6.Final.jar b/framework/lib/hibernate-c3p0-5.3.6.Final.jar deleted file mode 100644 index 3d7d0adcdb..0000000000 Binary files a/framework/lib/hibernate-c3p0-5.3.6.Final.jar and /dev/null differ diff --git a/framework/lib/hibernate-c3p0-5.4.1.Final.jar b/framework/lib/hibernate-c3p0-5.4.1.Final.jar new file mode 100644 index 0000000000..94d5826edd Binary files /dev/null and b/framework/lib/hibernate-c3p0-5.4.1.Final.jar differ diff --git a/framework/lib/hibernate-core-5.3.6.Final.patched.jar b/framework/lib/hibernate-core-5.4.1.Final.patched.jar similarity index 56% rename from framework/lib/hibernate-core-5.3.6.Final.patched.jar rename to framework/lib/hibernate-core-5.4.1.Final.patched.jar index 93dd73db13..81dcc2c8b9 100644 Binary files a/framework/lib/hibernate-core-5.3.6.Final.patched.jar and b/framework/lib/hibernate-core-5.4.1.Final.patched.jar differ diff --git a/framework/lib/hibernate-ehcache-5.3.6.Final.jar b/framework/lib/hibernate-ehcache-5.3.6.Final.jar deleted file mode 100644 index ef3eddba70..0000000000 Binary files a/framework/lib/hibernate-ehcache-5.3.6.Final.jar and /dev/null differ diff --git a/framework/lib/hibernate-ehcache-5.4.1.Final.jar b/framework/lib/hibernate-ehcache-5.4.1.Final.jar new file mode 100644 index 0000000000..3295a0875a Binary files /dev/null and b/framework/lib/hibernate-ehcache-5.4.1.Final.jar differ diff --git a/framework/lib/hibernate-entitymanager-5.3.6.Final.jar b/framework/lib/hibernate-entitymanager-5.3.6.Final.jar deleted file mode 100644 index 22e3548a22..0000000000 Binary files a/framework/lib/hibernate-entitymanager-5.3.6.Final.jar and /dev/null differ diff --git a/framework/lib/jaxb-api-2.3.1.jar b/framework/lib/jaxb-api-2.3.1.jar new file mode 100644 index 0000000000..4565865471 Binary files /dev/null and b/framework/lib/jaxb-api-2.3.1.jar differ diff --git a/framework/lib/jaxb-runtime-2.3.1.jar b/framework/lib/jaxb-runtime-2.3.1.jar new file mode 100644 index 0000000000..0b9ef67c49 Binary files /dev/null and b/framework/lib/jaxb-runtime-2.3.1.jar differ diff --git a/framework/patches/hibernate-5.3.6-patch-play.README b/framework/patches/hibernate-5.3.6-patch-play.README deleted file mode 100644 index dc060eb026..0000000000 --- a/framework/patches/hibernate-5.3.6-patch-play.README +++ /dev/null @@ -1,6 +0,0 @@ ----- -Download Hibernate 5.3.6.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.3.6-patch-play.patch -APPLY -> patch -p1 -i hibernate-5.3.6-patch-play.patch diff --git a/framework/patches/hibernate-5.4.1-patch-play.README b/framework/patches/hibernate-5.4.1-patch-play.README new file mode 100644 index 0000000000..7bb38c8339 --- /dev/null +++ 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/framework/patches/hibernate-5.3.6-patch-play.patch b/framework/patches/hibernate-5.4.1-patch-play.patch similarity index 100% rename from framework/patches/hibernate-5.3.6-patch-play.patch rename to framework/patches/hibernate-5.4.1-patch-play.patch