This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 8b2f7d0c12c1e566cfebec540fd11892f68fa093 Merge: c00b347073 3b10b18c81 Author: James Daugherty <[email protected]> AuthorDate: Sun May 17 13:31:42 2026 -0400 Merge branch '7.0.x' into 7.1.x # Conflicts: # gradle.properties # grails-core/src/test/groovy/grails/util/GrailsUtilTests.java # settings.gradle .gitattributes | 53 +++++++++++++++++ .github/vote_templates/announce.txt | 4 ++ .github/vote_templates/staged.txt | 7 --- .github/workflows/groovy-joint-workflow.yml | 4 +- .github/workflows/release.yml | 2 + NOTICE | 8 ++- RELEASE.md | 18 +++++- codecov.yml | 37 ++++++++++++ dependencies.gradle | 2 +- etc/bin/Dockerfile | 9 +++ etc/bin/verify-cli-distribution.sh | 18 ++++++ etc/bin/verify-wrapper-distribution.sh | 19 ++++++ etc/bin/verify.sh | 5 ++ .../src/main/resources/fonts/archia-bold.eot | Bin 15838 -> 0 bytes .../src/main/resources/fonts/archia-bold.ttf | Bin 41696 -> 0 bytes .../src/main/resources/fonts/archia-bold.woff | Bin 19684 -> 0 bytes .../src/main/resources/fonts/archia-bold.woff2 | Bin 14136 -> 0 bytes .../src/main/resources/fonts/archia-light.eot | Bin 42146 -> 0 bytes .../src/main/resources/fonts/archia-light.ttf | Bin 41864 -> 0 bytes .../src/main/resources/fonts/archia-light.woff | Bin 19908 -> 0 bytes .../src/main/resources/fonts/archia-light.woff2 | Bin 14240 -> 0 bytes .../src/main/resources/fonts/archia-medium.eot | Bin 16471 -> 0 bytes .../src/main/resources/fonts/archia-medium.ttf | Bin 43528 -> 0 bytes .../src/main/resources/fonts/archia-medium.woff | Bin 20436 -> 0 bytes .../src/main/resources/fonts/archia-medium.woff2 | Bin 14484 -> 0 bytes .../src/main/resources/fonts/archia-regular.eot | Bin 15329 -> 0 bytes .../src/main/resources/fonts/archia-regular.ttf | Bin 41328 -> 0 bytes .../src/main/resources/fonts/archia-regular.woff | Bin 19244 -> 0 bytes .../src/main/resources/fonts/archia-regular.woff2 | Bin 13656 -> 0 bytes .../src/main/resources/fonts/archia-semibold.eot | Bin 43510 -> 0 bytes .../src/main/resources/fonts/archia-semibold.ttf | Bin 43216 -> 0 bytes .../src/main/resources/fonts/archia-semibold.woff | Bin 20240 -> 0 bytes .../src/main/resources/fonts/archia-semibold.woff2 | Bin 14460 -> 0 bytes .../src/main/resources/fonts/archia-thin.eot | Bin 15796 -> 0 bytes .../src/main/resources/fonts/archia-thin.ttf | Bin 41700 -> 0 bytes .../src/main/resources/fonts/archia-thin.woff | Bin 19676 -> 0 bytes .../src/main/resources/fonts/archia-thin.woff2 | Bin 14004 -> 0 bytes .../src/main/resources/stylesheets/screen.css | 57 ++---------------- grails-data-hibernate5/dbmigration/build.gradle | 8 +++ .../src/test/resources/logging.properties | 16 ++++++ grails-test-examples/issue-10279/build.gradle | 48 ++++++++++++++++ .../issue-10279/grails-app/conf/application.groovy | 26 +++++++++ .../issue-10279/grails-app/conf/application.yml | 44 ++++++++++++++ .../issue-10279/grails-app/conf/logback.xml | 39 +++++++++++++ .../controllers/issue10279/UrlMappings.groovy | 25 ++++++++ .../grails-app/init/issue10279/Application.groovy | 28 +++++++++ .../issue10279/ActuatorEnvClosureSpec.groovy | 56 ++++++++++++++++++ grails-test-examples/jetty/build.gradle | 64 +++++++++++++++++++++ .../grails-app/assets/javascripts/application.js | 16 ++++++ .../grails-app/assets/stylesheets/application.css | 18 ++++++ .../jetty/grails-app/conf/application.yml | 60 +++++++++++++++++++ .../jetty/grails-app/conf/logback-spring.xml | 42 ++++++++++++++ .../jetty/grails-app/conf/spring/resources.groovy | 22 +++++++ .../issue12688/SessionController.groovy | 38 ++++++++++++ .../controllers/issue12688/UrlMappings.groovy | 33 +++++++++++ .../grails-app/init/issue12688/Application.groovy | 31 ++++++++++ .../grails-app/init/issue12688/BootStrap.groovy | 29 ++++++++++ .../jetty/grails-app/views/error.gsp | 29 ++++++++++ .../jetty/grails-app/views/index.gsp | 28 +++++++++ .../jetty/grails-app/views/notFound.gsp | 28 +++++++++ .../jetty/grails-app/views/session/index.gsp | 30 ++++++++++ .../jetty/grails-app/views/session/show.gsp | 27 +++++++++ .../groovy/issue12688/JettySessionSpec.groovy | 51 ++++++++++++++++ .../groovy/issue12688/pages/SessionFormPage.groovy | 32 +++++++++++ .../groovy/issue12688/pages/SessionShowPage.groovy | 31 ++++++++++ settings.gradle | 4 ++ 66 files changed, 1082 insertions(+), 64 deletions(-) diff --cc settings.gradle index bbeaaccf3c,a495395d66..f0aefc6fb1 --- a/settings.gradle +++ b/settings.gradle @@@ -392,22 -388,24 +392,24 @@@ include 'grails-test-examples-gsp-layout', 'grails-test-examples-gsp-sitemesh3', 'grails-test-examples-gsp-spring-boot', - 'grails-test-examples-issue-698-domain-save-npe', 'grails-test-examples-hyphenated', - 'grails-test-examples-issue-views-182', 'grails-test-examples-issue-11102', - 'grails-test-examples-demo33', - 'grails-test-examples-micronaut', - 'grails-test-examples-micronaut-groovy-only', - 'grails-test-examples-plugins-loadfirst', - 'grails-test-examples-plugins-loadsecond', - 'grails-test-examples-plugins-loadafter', - 'grails-test-examples-plugins-issue11005', 'grails-test-examples-issue-11767', 'grails-test-examples-issue-15228', + 'grails-test-examples-issue-10279', + 'grails-test-examples-issue-698-domain-save-npe', + 'grails-test-examples-issue-views-182', ++ 'grails-test-examples-jetty', + 'grails-test-examples-micronaut', + 'grails-test-examples-micronaut-groovy-only', + 'grails-test-examples-namespaces', 'grails-test-examples-plugins-exploded', 'grails-test-examples-plugins-issue-11767', + 'grails-test-examples-plugins-issue11005', + 'grails-test-examples-plugins-loadafter', + 'grails-test-examples-plugins-loadfirst', + 'grails-test-examples-plugins-loadsecond', 'grails-test-examples-plugins-micronaut-singleton', - 'grails-test-examples-cache', 'grails-test-examples-config-report', 'grails-test-examples-scaffolding', 'grails-test-examples-scaffolding-fields', @@@ -455,7 -451,7 +458,8 @@@ project(':grails-test-examples-scaffold project(':grails-test-examples-scaffolding-fields').projectDir = file('grails-test-examples/scaffolding-fields') project(':grails-test-examples-views-functional-tests').projectDir = file('grails-test-examples/views-functional-tests') project(':grails-test-examples-views-functional-tests-plugin').projectDir = file('grails-test-examples/views-functional-tests-plugin') +project(':grails-test-examples-test-phases').projectDir = file('grails-test-examples/test-phases') + project(':grails-test-examples-jetty').projectDir = file('grails-test-examples/jetty') includeBuild('./grails-gradle') { name = 'grails-gradle'
