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.

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

ISPN-13296 Create Hibernate 2LC implementation for Hibernate 6.0.x #9811

Merged
merged 2 commits into from May 3, 2022

Conversation

wburns
Copy link
Member

@wburns wburns commented Jan 14, 2022

@wburns wburns force-pushed the ISPN-13296_hibernate_6 branch 2 times, most recently from 266efc5 to 72ae03b Compare January 14, 2022 15:15
@wburns
Copy link
Member Author

wburns commented Jan 14, 2022

The tests in the cache-v60 module are not running and always displays
[INFO] Tests run: 0, Failures: 0, Errors: 0, Skipped: 0

@wburns
Copy link
Member Author

wburns commented Jan 14, 2022

This PR removes the JPA and cache-v5* modules as they were all reliant upon Hibernate 5.x. Paul has already confirmed that EAP will not require Hibernate 5.x support in the version that will import Infinispan 14.

This PR adds new jakarta classifier jars to commons, core and hotrod-client for users to utilize instead of javax packages. The new cache-v60 module uses jakarta only and relies upon Hibernate 6.

@wburns
Copy link
Member Author

wburns commented Jan 21, 2022

This issue cannot be fixed until we have the next build of Hibernate which should be coming within the next few days.

@wburns wburns force-pushed the ISPN-13296_hibernate_6 branch 3 times, most recently from 9970404 to b6d7ed4 Compare February 8, 2022 00:58
@wburns
Copy link
Member Author

wburns commented Feb 16, 2022

Rebased and updated. Note however that tests still fail and we need next release of Hibernate to fix remaining issues.

@wburns wburns force-pushed the ISPN-13296_hibernate_6 branch 2 times, most recently from 8901459 to d9f3101 Compare March 28, 2022 20:00
@wburns
Copy link
Member Author

wburns commented Apr 4, 2022

Updated to Hibernate 6 Final.

@tristantarrant
Copy link
Member

We need docs before merging. In particular:

  • add a note to the upgrade guide about both the dropping the old 2LC implementations as well as the Javax > Jakarta transition
  • adjust the ref_hibernate_second_level_cache.adoc file to the specific versions

@wburns wburns force-pushed the ISPN-13296_hibernate_6 branch 3 times, most recently from efd6767 to 82db2e8 Compare April 29, 2022 19:18
@wburns
Copy link
Member Author

wburns commented Apr 29, 2022

Rebased and added docs.

@tristantarrant
Copy link
Member

A few Maven warnings:

[WARNING] The artifact org.hibernate:hibernate-core:jar:6.0.0.Final has been relocated to org.hibernate.orm:hibernate-core:jar:6.0.0.Final
[WARNING] The artifact org.hibernate:hibernate-testing:jar:6.0.0.Final has been relocated to org.hibernate.orm:hibernate-testing:jar:6.0.0.Final

and

[WARNING] Some problems were encountered while building the effective model for org.infinispan:infinispan-hibernate-cache-v60:jar:14.0.0-SNAPSHOT
[WARNING] 'dependencyManagement.dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: org.hibernate:hibernate-testing:jar -> version ${versionx.org.hibernate.hibernate-core} vs ${versionx.org.hibernate.hibernate-testing} @ org.infinispan:infinispan-parent:14.0.0-SNAPSHOT, /home/tst/Work/Infinispan/infinispan/pom.xml, line 1058, column 22

@wburns
Copy link
Member Author

wburns commented May 2, 2022

Updated to remove warnings, however still looking at tests not showing up.

@wburns
Copy link
Member Author

wburns commented May 2, 2022

Updated pom.xml so the surefire-reports directory is generated now. Thanks @tristantarrant !

@tristantarrant tristantarrant merged commit 1079078 into infinispan:main May 3, 2022
@tristantarrant
Copy link
Member

Merged, thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants