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

Jump to bottom

hibernate 5.4 update #1290

Merged
merged 3 commits into from
Jan 25, 2019
Merged

hibernate 5.4 update #1290

merged 3 commits into from
Jan 25, 2019

Conversation

sbeigel
Copy link
Contributor

@sbeigel sbeigel commented Jan 17, 2019

Updated to Hibernate 5.4.0.Final with patch (unchanged) and some dependencies.

@sbeigel
Copy link
Contributor Author

sbeigel commented Jan 22, 2019 •
edited
Loading

...5.4.1 just got released, so I immediately updated this PR :)

@tazmaniax
Copy link
Collaborator

@sbeigel I'm thinking you meant 5.4.1 :) Nice one, thx!

@sbeigel
Copy link
Contributor Author

sbeigel commented Jan 22, 2019 •
edited
Loading

lol, you're absolutely right! I'll edit the comment ;)

aleksandy
aleksandy reviewed Jan 23, 2019
View reviewed changes
framework/dependencies.yml Outdated
- 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!

@xael-fry xael-fry merged commit 7ea47aa into playframework:master Jan 25, 2019
@xael-fry
Copy link
Member

Merge and pushed in master.
Thanks

@xael-fry xael-fry added this to the 1.5.3 milestone Jan 25, 2019
@EddyVerbruggen
Copy link
Contributor

@sbeigel Do you perhaps recall why framework/lib/ehcache-2.10.6.jar was added as part of this PR? Previous versions of Play1 didn't unclude the ehcache-xxx.jar at all, and it's causing build issues for us.

@sbeigel
Copy link
Contributor Author

sbeigel commented Sep 15, 2019

@EddyVerbruggen ehcache-core 2.6.11 was the previous dependency, it was updated with this PR

@EddyVerbruggen
Copy link
Contributor

EddyVerbruggen commented Sep 15, 2019 •
edited
Loading

@sbeigel Yes, that one was upgraded indeed (thanks!), but also, this one sneaked in and wasn't included before (nor a lower version).

@EddyVerbruggen
Copy link
Contributor

I guess we'll remove that lib from our play/libs folder for the time being.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aleksandy aleksandy aleksandy left review comments

@xael-fry xael-fry xael-fry approved these changes

Assignees
No one assigned
Labels
feature
Projects
None yet
Milestone
1.5.3
Development

Successfully merging this pull request may close these issues.
5 participants
@sbeigel @tazmaniax @xael-fry @EddyVerbruggen @aleksandy