The GitHub Actions job "CI - Groovy Joint Validation Build" on 
grails-core.git/feature/i18n-boot-message-source-8.0.x has succeeded.
Run started by GitHub user codeconsole (triggered by codeconsole).

Head commit for run:
7aaa5bcaa726ee6f0f24f58b5dd62a952666a97a / Scott Murphy Heiberg 
<[email protected]>
Merge branch '8.0.x' into feature/i18n-boot-message-source-8.0.x

Three conflicts, all from both sides appending to the same places.

GrailsGradlePlugin: additive on both sides - this branch adds the i18n
descriptor wiring, 8.0.x adds the AOT cache and native metadata tasks from
#16094. Kept both. The merge had also swallowed the closing braces of
configureI18nDescriptor as common context, truncating the method; restored.

upgrading80x.adoc: both sides added a section numbered 45. 8.0.x now owns 45
(GORM API registry) and 46 (startup banner), so the message-bundle section is
renumbered to 47. Rebuilt from the two clean versions rather than untangling in
place, because the conflict hunks were separated by false-common context from a
code sample.

whatsNew.adoc: additive, kept both.

Report URL: https://github.com/apache/grails-core/actions/runs/32301385437

With regards,
GitHub Actions via GitBox

Reply via email to