jamesfredley commented on PR #15654: URL: https://github.com/apache/grails-core/pull/15654#issuecomment-4567283374
Follow-up to the merge-order comment above. Per @matrei's review, I've carved the remaining non-clone changes out of this PR into focused, single-topic PRs so each can be reviewed - and accepted or declined - on its own. Worth restating: this Step 1 PR was never *just* "copy hibernate5 to hibernate7" - it also carried several independent improvements, and bundling them is what made it hard to review. ## Full carve-out stack Already split (B-E): - PR-B #15682 - async defensive cleanup (merged) - PR-C #15683 - `addAllDomainClasses` TCK helper - PR-D #15684 - `DetachedCriteriaSpec` command-chain style - PR-E #15685 - `MongoDatastoreSpec` base class + mongo package rename Newly split (F-I), covering @matrei's request to carve out the bom-split, jacoco, and code-analysis, and to revert `tests` -> `specs`: - PR-F #15689 - Micronaut BOM split (`grails-hibernate5-micronaut-bom`) - PR-G #15686 - `grails-code-analysis` convention plugin + violation aggregation - PR-H #15687 - `grails-jacoco` convention plugin + Codecov coverage (depends on PR-G) - PR-I #15688 - `grails.gorm.tests` -> `grails.gorm.specs` rename (draft - see the open discussion on whether we keep it) ## Where this leaves us Each topic is now independently reviewable. I don't expect all of these to land - PMD/Jacoco need project agreement (@matrei), and the `tests` -> `specs` rename is still under discussion (@borinquenkid). That's the point of splitting: we decide each on its own merits. For whichever of F-I we agree to keep, I'll shrink PR-A the same way as B-E: a revert commit on the stage branch, so once 8.0.x is merged back the final state is unchanged and only PR-A's review surface shrinks. I'm holding the PR-A reductions for F-I until we settle which ones we're keeping, to avoid reverting something we then decide to retain. ## Updated merge order 1. Land any of B-E on 8.0.x (B merged; C/D/E ready). 2. For each of F/G/H/I we keep: merge it to 8.0.x, then revert that slice on the stage branch (PR-H depends on PR-G; PR-I is a draft pending the naming-convention decision). 3. Merge 8.0.x into `8.0.x-stage-hibernate7` - the revert commits plus the incoming changes resolve to the intended end state. 4. Merge PR-A #15654 last, reduced to the actual hibernate5 -> hibernate7 clone. 5. Rebase Step 2 #15568 on the updated stage branch. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
