Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hibernate 5.4 update #1290

Merged
merged 3 commits into from
Jan 25, 2019
Merged

hibernate 5.4 update #1290

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46012d5
hibernate 5.4 update
sbeigel Jan 17, 2019
607408c
hibernate 4.5.1 update
sbeigel Jan 22, 2019
81b4fe6
cleanup: entitymanager removed
sbeigel Jan 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions framework/dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ 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.4.0.Final.patched
- 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
Expand All @@ -59,9 +59,9 @@ require: &allDependencies
- 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.0.Final
- org.hibernate -> hibernate-entitymanager 5.4.0.Final
- org.hibernate -> hibernate-ehcache 5.4.0.Final
- org.hibernate -> hibernate-c3p0 5.4.1.Final
- org.hibernate -> hibernate-entitymanager 5.4.1.Final
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This dependency is not needed.

https://github.com/hibernate/hibernate-orm/tree/master/hibernate-entitymanager/src/main/resources

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, you're right, I removed it!

- 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
Expand Down
Binary file renamed framework/lib/hibernate-c3p0-5.4.0.Final.jar → framework/lib/hibernate-c3p0-5.4.1.Final.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ib/hibernate-core-5.4.0.Final.patched.jar → ...ib/hibernate-core-5.4.1.Final.patched.jar
View file
Open in desktop
Binary file not shown.
Binary file removed framework/lib/hibernate-ehcache-5.4.0.Final.jar
View file
Open in desktop
Binary file not shown.
Binary file added framework/lib/hibernate-ehcache-5.4.1.Final.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...b/hibernate-entitymanager-5.4.0.Final.jar → ...b/hibernate-entitymanager-5.4.1.Final.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions ...patches/hibernate-5.4.0-patch-play.README → ...patches/hibernate-5.4.1-patch-play.README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
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.0-patch-play.patch
APPLY -> patch -p1 -i hibernate-5.4.0-patch-play.patch
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
0 .../patches/hibernate-5.4.0-patch-play.patch → .../patches/hibernate-5.4.1-patch-play.patch
View file
Open in desktop
File renamed without changes.