Agreed on working from this branch. Thanks for all the work
Walter > On May 11, 2025, at 4:36 PM, James Daugherty > <jdaughe...@jdresources.net.INVALID> wrote: > > Hi Everyone, > > As discussed, I looked at merging the hibernate 6 repository into > grails-core. The merged branch is located here: > https://github.com/apache/grails-core/tree/merge-hibernate6 > > A couple notes about this branch: > 1. The hibernate6 repo only had material changes to core & docs. I've only > merged these projects so far. I have left the other projects out of the > merge, since they weren't included in settings.gradle & there are no > changes between the hibernate5 projects. > > 2. Once grails-data-hibernate6/core is passing all tests, we can copy each > project from hibernate5 to hibernate6 - 1 by 1, until all are updated & > passing. > > 3. While I merged the docs folder, I did not add the docs to the main > grails-data page. > > 4. The combined groovydocs build fails because there are duplicate classes > under the hibernate5 & hibernate6 projects. Mongo appears to also include > any project that is flagged with `gormApiDocs` since it uses hibernate? > > We need to decide what to do here. Several options exist: > # Do we repackage to apache for hibernate 5 and deal with the duplicates > when we update to Hibernate 7? This is what Hibernate did for 5->6. > # Do we repackage to a hibernate specific version in the package path? > # Do we just include the duplicates? > # Do we only include the hibernate5 docs until we start recommending > hibernate6? > # Other ideas? > > For now I'm excluding this project from the aggregated groovydocs & gorm > groovydocs to prevent failures. > > 5. 423 of 555 tests are passing in the merged branch. It looks like the > majority of the failures are from the TCK. I'm guessing the TCK wasn't > running against the hibernate 6 repo (one of the reasons I refactored it > was to make it run easier)? We can start working on fixing these tests by > adding the associated test to Hibernate6Suite, and running Hibernate6Suite > to run the TCK test in IntelliJ. > > I'd like to propose we start working out of this branch instead of the > repo. It will be easier to keep up-to-date this way. We can discuss next > steps at Wednesday's meeting. > > -James
