codeconsole opened a new pull request, #16342: URL: https://github.com/apache/grails-core/pull/16342
Release-line merge of `8.1.x` into `9.0.x`, not a squash. `projectVersion` remains `9.0.0-SNAPSHOT`. Five files conflicted and were resolved by hand: - `settings.gradle`, `dependencies.gradle`, `.github/workflows/gradle.yml`: took the 8.1.x removal of the Grails-Micronaut island (#16320). Kept the 9.0.x Groovy `6.0.0-beta-2` pin and the 9.0.x functional-test hang workaround. - `XmlUtils.groovy` (grails-testing-support-http-client): took the 8.1.x XML parser hardening (#16331, `XmlParserFeature`, DOCTYPE rejected) and kept the 9.0.x `ACCESS_EXTERNAL_DTD`/`ACCESS_EXTERNAL_SCHEMA` parser properties. One semantic conflict needed a code change beyond the textual merge. #16178 makes `CompilePlugin` compile every module with invokedynamic off. On Groovy 6 that requires `groovy-callsite` on every compile classpath (GROOVY-11158), and only modules that depend on `grails-common` have it, so nine modules (`grails-bootstrap`, `grails-codecs-core`, `grails-events-core`, ...) and everything downstream failed to compile. `CompilePlugin` on this branch now defaults `grailsIndy` to `true`, which is the pre-merge 9.0.x behaviour for plain library modules; Grails plugin modules are still compiled indy-off by the Grails Gradle plugin, which applies its own default after evaluation, and `-PgrailsIndy=<boolean>` still overrides both. `CompilePluginSpec` was updated to match. The 8.1.x comment on that line already noted that Grails 9 / Groovy 6 could flip it. Not addressed here: `9.0.x` already fails to compile `grails-web-databinding` before this merge (`GrailsWebDataBinder.groovy:560`, `Cannot find matching method java.util.ArrayList#leftShift(void)` on Groovy 6.0.0-beta-2, see the 9.0.x CI run for 51b15282c3). The collection branch needs the same `||` flow-state hoist that the array and Map branches already got in 9.0.x. CI on this PR will stay red until that lands on 9.0.x. -- 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]
