jamesfredley commented on PR #15558:
URL: https://github.com/apache/grails-core/pull/15558#issuecomment-5159770955

   ## 2026-08-02 refresh
   
   ### Trunk sync
   - Merged `8.0.x` → `8.1.x` and pushed
   - Merged `8.1.x` → `9.0.x` (kept 9.0 version bindings) and pushed
   - Merged `9.0.x` into `grails8-groovy6-canary` and pushed (`dd0f4a8075`)
   
   ### Conflict resolutions on canary
   - `dependencies.gradle`: kept Groovy `6.0.0-SNAPSHOT` + Jackson `2.22.1` / 
annotations `2.22`; took trunk Log4j `2.25.5` and related security pins; 
aligned Hibernate5 Micronaut island Groovy pin to `5.0.8`
   - `end-to-end/spring-dependency-management`: took end-to-end layout from 
trunk; kept canary `ext['groovy.version']` override
   - `GlobalGrailsClassInjectorTransformation`: took full 9.0.x rewrite; 
retained only `classInjectorCache.get(...)` (Groovy 6 `@CompileStatic` Map 
subscript workaround)
   
   ### Groovy 6 workaround review
   Surveyed recent Groovy / Spock status (Groovy 6 still pre-release / alpha-2 
+ master; Spock has no `groovy-6` artifact yet). **No workarounds removed 
today** without a canary proof build. Confident keep: Spock bridge, Micronaut 
island, Jackson 2.22, WriteFilteringMap excludes, CoreGrailsPlugin beans, URL 
mapping qualify, SBOM JLine, joint CI→master. Candidates for later retest only: 
JSON views default methods (`GROOVY-10687`), MapConstructor / GORM 
staticPropertyMissing.
   
   ### PR hygiene
   - Description rewritten to current tip state only (no historical narrative)
   - PR is mergeable against `9.0.x` again
   
   Still **DRAFT / DO NOT MERGE**.


-- 
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]

Reply via email to