This is an automated email from the ASF dual-hosted git repository. jamesfredley pushed a commit to branch grails8-groovy6-canary in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 0ea4f2665eb5be27a4c1d89b881d6d99c0742706 Merge: d3384e9395 423022f17c Author: James Fredley <[email protected]> AuthorDate: Wed May 20 13:55:29 2026 -0400 Merge branch 'grails8-groovy5-sb4' into grails8-groovy6-canary Brings in from #15557: - The grails-test-examples/compile-static project (#15294 cherry-pick). - The 5.0.6-SNAPSHOT -> 5.0.6 pin in dependencies.gradle (conflict resolved in favour of this branch's 6.0.0-SNAPSHOT pin, since this canary tracks Groovy 6 not Groovy 5). Assisted-by: opencode:claude-4.7-opus .../gradle/plugin/core/GrailsExtension.groovy | 7 ++ .../gradle/plugin/core/GrailsGradlePlugin.groovy | 11 ++- .../core/GrailsGradlePreserveParametersSpec.groovy | 83 ++++++++++++++++ .../preserve-params-default/build.gradle | 11 +++ .../preserve-params-default/gradle.properties | 1 + .../grails-app/conf/application.yml | 0 .../preserve-params-default/settings.gradle | 1 + .../preserve-params-disabled/build.gradle | 15 +++ .../preserve-params-disabled/gradle.properties | 1 + .../grails-app/conf/application.yml | 0 .../preserve-params-disabled/settings.gradle | 1 + .../preserve-params-enabled/build.gradle | 15 +++ .../preserve-params-enabled/gradle.properties | 1 + .../grails-app/conf/application.yml | 0 .../preserve-params-enabled/settings.gradle | 1 + .../preserve-params-null/build.gradle | 15 +++ .../preserve-params-null/gradle.properties | 1 + .../grails-app/conf/application.yml | 0 .../preserve-params-null/settings.gradle | 1 + .../preserve-params-provider-null/build.gradle | 15 +++ .../gradle.properties | 1 + .../grails-app/conf/application.yml | 0 .../preserve-params-provider-null/settings.gradle | 1 + grails-test-examples/compile-static/build.gradle | 84 ++++++++++++++++ .../grails-app/assets/images/advancedgrails.svg | 27 ++++++ .../assets/images/apple-touch-icon-retina.png | Bin 0 -> 7038 bytes .../grails-app/assets/images/apple-touch-icon.png | Bin 0 -> 3077 bytes .../grails-app/assets/images/documentation.svg | 19 ++++ .../grails-app/assets/images/favicon.ico | Bin 0 -> 5558 bytes .../assets/images/grails-cupsonly-logo-white.svg | 26 +++++ .../grails-app/assets/images/grails.svg | 13 +++ .../grails-app/assets/images/slack.svg | 18 ++++ .../grails-app/assets/javascripts/application.js | 39 ++++++++ .../grails-app/assets/stylesheets/application.css | 33 +++++++ .../grails-app/assets/stylesheets/errors.css | 108 +++++++++++++++++++++ .../grails-app/assets/stylesheets/grails.css | 95 ++++++++++++++++++ .../compile-static/grails-app/conf/application.yml | 90 +++++++++++++++++ .../grails-app/conf/logback-spring.xml | 59 +++++++++++ .../com/example/compilestatic/UrlMappings.groovy | 34 +++++++ .../domain/com/example/compilestatic/Author.groovy | 28 ++++++ .../domain/com/example/compilestatic/Book.groovy | 27 ++++++ .../grails-app/i18n/messages.properties | 70 +++++++++++++ .../grails-app/i18n/messages_cs.properties | 69 +++++++++++++ .../grails-app/i18n/messages_da.properties | 70 +++++++++++++ .../grails-app/i18n/messages_de.properties | 69 +++++++++++++ .../grails-app/i18n/messages_es.properties | 69 +++++++++++++ .../grails-app/i18n/messages_fr.properties | 33 +++++++ .../grails-app/i18n/messages_it.properties | 69 +++++++++++++ .../grails-app/i18n/messages_ja.properties | 69 +++++++++++++ .../grails-app/i18n/messages_nb.properties | 70 +++++++++++++ .../grails-app/i18n/messages_nl.properties | 69 +++++++++++++ .../grails-app/i18n/messages_pl.properties | 73 ++++++++++++++ .../grails-app/i18n/messages_pt_BR.properties | 73 ++++++++++++++ .../grails-app/i18n/messages_pt_PT.properties | 48 +++++++++ .../grails-app/i18n/messages_ru.properties | 45 +++++++++ .../grails-app/i18n/messages_sk.properties | 70 +++++++++++++ .../grails-app/i18n/messages_sv.properties | 69 +++++++++++++ .../grails-app/i18n/messages_th.properties | 69 +++++++++++++ .../grails-app/i18n/messages_zh_CN.properties | 32 ++++++ .../com/example/compilestatic/Application.groovy | 31 ++++++ .../com/example/compilestatic/BootStrap.groovy | 29 ++++++ .../com/example/compilestatic/BookService.groovy | 36 +++++++ .../compile-static/grails-app/views/error.gsp | 51 ++++++++++ .../compile-static/grails-app/views/index.gsp | 102 +++++++++++++++++++ .../grails-app/views/layouts/main.gsp | 99 +++++++++++++++++++ .../compile-static/grails-app/views/notFound.gsp | 38 ++++++++ .../example/compilestatic/BookServiceSpec.groovy | 44 +++++++++ .../com/example/compilestatic/DemoSpec.groovy | 38 ++++++++ settings.gradle | 2 + 69 files changed, 2486 insertions(+), 2 deletions(-)
