jamesfredley commented on PR #15654: URL: https://github.com/apache/grails-core/pull/15654#issuecomment-4564632896
@sbglasius @matrei @borinquenkid @jdaugherty I tried to address all the comment concerns by carving out pieces of the Step 1 PR into separate PRs Merge order 1. Any order on these 3 to 8.0.x: Merge PR-B #15682 (https://github.com/apache/grails-core/pull/15682) (chore/async-defensive-cleanup) PR-C #15683 (https://github.com/apache/grails-core/pull/15683) (refactor/tck-add-all-domain-classes) PR-D #15684 (https://github.com/apache/grails-core/pull/15684) (chore/tck-detached-criteria-style) 2. Merge PR-E #15685 (https://github.com/apache/grails-core/pull/15685) (refactor/mongo-package-rename-and-base-spec) after PR-C so the mongo specs can pick up the helper via the rebase/merge. 3. Merge 8.0.x into 8.0.x-stage-hibernate7 (https://github.com/apache/grails-core/tree/8.0.x-stage-hibernate7) once all four land — the revert commit ba235da8f7 on PR-A and the incoming changes resolve to the intended end state. 4. Merge PR-A #15654 (https://github.com/apache/grails-core/pull/15654) (8.0.x-stage-hibernate7) last — ~132 fewer files in its diff than before. 5. Rebase Step 2 #15568 (https://github.com/apache/grails-core/pull/15568) (8.0.x-hibernate7) on the updated stage branch and Hibernate 7 review can proceed. ``` Summary timeline [8.0.x] ──┬── PR-B #15682 (chore/async-defensive-cleanup) ──┐ ├── PR-C #15683 (refactor/tck-add-all-domain-classes) ──┐ ├── PR-D #15684 (chore/tck-detached-criteria-style) ────┤ └── PR-E #15685 (refactor/mongo-package-rename-and-base-spec) (depends on PR-C, so merge PR-C first) ─────────────┤ │ ▼ merge 8.0.x into 8.0.x-stage-hibernate7 ─┤ │ ▼ PR-A #15654 (8.0.x-stage-hibernate7) ─┤ │ ▼ Step 2 #15568 (8.0.x-hibernate7) ``` -- 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]
