You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by sc...@apache.org on 2026/06/17 19:53:34 UTC

(grails-core) branch 8.0.x updated (35ad3b0713 -> 831f3fc29b)

This is an automated email from the ASF dual-hosted git repository.

codeconsole pushed a change to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git


    from 35ad3b0713 Merge pull request #15677 from apache/deps/micronaut-5.0.0
     add b0e0990395 Make SiteMesh 3 the default GSP layout, mutually exclusive with grails-layout
     add 769e97167b Merge branch 'deps/sitemesh3-3.3.0-snapshot' into feat/sitemesh3-default-layout
     add d561d7defa Undo revert
     add 97840681ee Merge branch '8.0.x' into feat/sitemesh3-default-layout
     add a553b4724a Model the GSP layout choice as a one-of option to fix the forge UI glitch
     add 021059d03e Run CI test apps against SiteMesh 3 by default
     add 920c12c901 Fix empty SiteMesh 3 output for undecorated GSP responses
     add 81d9147c89 Fix SiteMesh 3 applyLayout for embedded/nested field rendering
     add 6178aeb3f9 Drop redundant grails-layout from starter-web test apps
     add 8a1fbcbcd1 Don't apply a SiteMesh 3 layout to template/partial renders
     add 8b5db5286b Default test apps to SiteMesh 3, opt into SiteMesh 2 via flag
     add 692ee12d9f Apply gspLayout option in the project generation endpoints
     add 852d1321aa Drop redundant user-agent param from the GitHub create endpoint
     add db817ebd2d Fix if/else spacing in the SiteMesh test-app build files
     add 51d5e88310 Make SiteMesh 3 the silent forge default, SiteMesh 2 a selectable feature
     add bb94c8c27d Merge branch '8.0.x' into feat/sitemesh3-default-layout
     add a61691ec37 Re-enable the gsp-sitemesh3 test example
     add 6e83b250f1 Fix SiteMesh 3 layout chaining, error-page decoration and JSP rendering
     add e7390ac489 Drop SiteMesh 3 plugin workarounds superseded by the updated starter
     add 53ee6ca353 Fix stale SiteMesh toggle in the hibernate7 test examples
     add 3589ba6d0f Don't mis-slice head content around title-prefixed elements
     add 751a937153 Match SiteMesh 2's default layout config and application fallback
     add 159f812597 Run the jetty and scaffolding examples against SiteMesh 3 by default
     add 8e6a989fce Publish grails-gsp-spring-boot and re-enable its example
     add 7040b864f8 Support the full applyLayout attribute surface under SiteMesh 3
     add c7a29df896 Merge remote-tracking branch 'apache/8.0.x' into feat/sitemesh3-default-layout
     add 14da8e4b11 Apply the published-module build conventions to grails-gsp-spring-boot
     add 5e636fdcd5 Leave the view resolver unwrapped when the SiteMesh 3 beans are absent
     add 536da4d477 Defer to SiteMesh 2's layout resolver instead of double-wrapping it
     add cb6edf7630 Merge branch '8.0.x' into feat/sitemesh3-default-layout
     add 8ae337f600 Merge branch '8.0.x' into feat/sitemesh3-default-layout
     add 6de6f5da77 Merge branch '8.0.x' into feat/sitemesh3-default-layout
     add 3381711083 Add a CI lane that runs the test suite against SiteMesh 2
     add d7667d5be2 Merge branch '8.0.x' into feat/sitemesh3-default-layout
     new 831f3fc29b Merge pull request #15713 from codeconsole/feat/sitemesh3-default-layout

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/{coverage.yml => sitemesh2.yml}  | 120 ++++++++--------
 gradle/publish-root-config.gradle                  |   1 +
 grails-dependencies/starter-web/build.gradle       |   2 +-
 grails-doc/src/en/ref/Tags - GSP/applyLayout.adoc  |   5 +-
 .../grails/forge/feature/sitemesh3/Sitemesh3.java  |  41 +++---
 .../org/grails/forge/feature/view/GrailsGsp.java   |   7 -
 .../Sitemesh3.java => view/GrailsLayout.java}      |  33 ++---
 .../{web/GrailsWeb.java => view/GspLayout.java}    |  39 +++---
 .../grails/forge/feature/view/GspLayoutSpec.groovy |  68 +++++++++
 .../plugins/sitemesh3/Sitemesh3GrailsPlugin.groovy |  40 ++----
 .../plugins/web/taglib/RenderSitemeshTagLib.groovy | 155 ++++++++++++++++++++-
 .../sitemesh3/CaptureAwareContentProcessor.java    |   8 ++
 .../sitemesh3/GrailsSiteMeshViewContext.java       |  14 +-
 .../sitemesh3/GrailsSiteMeshViewResolver.java      |   3 +
 ...railsSiteMeshViewResolverBeanPostProcessor.java |  30 ++++
 .../sitemesh3/Sitemesh3AutoConfiguration.java      |   2 +-
 .../plugins/sitemesh3/Sitemesh3CapturedPage.java   |  26 +++-
 .../Sitemesh3EnvironmentPostProcessor.java         |  70 ----------
 .../plugins/sitemesh3/Sitemesh3LayoutFinder.java   |  20 ++-
 .../sitemesh3/Sitemesh3RenderViewMutator.java      |  49 +++++++
 .../src/main/resources/META-INF/spring.factories   |   2 -
 ...ework.boot.env.EnvironmentPostProcessor.imports |   1 -
 .../sitemesh3/GrailsSiteMeshViewContextSpec.groovy |  40 ++++++
 ...iteMeshViewResolverBeanPostProcessorSpec.groovy |  39 ++++++
 .../GrailsSiteMeshViewResolverSpec.groovy          |  22 +++
 .../sitemesh3/Sitemesh3CapturedPageSpec.groovy     |  77 ++++++++++
 .../Sitemesh3EnvironmentPostProcessorSpec.groovy   |  71 ----------
 .../sitemesh3/Sitemesh3LayoutFinderSpec.groovy     |  63 ++++++++-
 .../Sitemesh3RenderViewMutatorSpec.groovy          |  73 ++++++++++
 grails-gsp/spring-boot/build.gradle                |  10 +-
 grails-profiles/web/profile.yml                    |   2 +-
 grails-test-examples/app1/build.gradle             |   7 +-
 grails-test-examples/app2/build.gradle             |   7 +-
 grails-test-examples/app3/build.gradle             |   7 +-
 .../async-events-pubsub-demo/build.gradle          |   7 +-
 grails-test-examples/cache/build.gradle            |   7 +-
 grails-test-examples/config-report/build.gradle    |   6 +-
 grails-test-examples/database-cleanup/build.gradle |   1 -
 grails-test-examples/datasources/build.gradle      |   7 +-
 grails-test-examples/demo33/build.gradle           |   7 +-
 grails-test-examples/exploded/build.gradle         |   6 +-
 .../external-configuration/build.gradle            |   7 +-
 grails-test-examples/geb-context-path/build.gradle |   7 +-
 grails-test-examples/geb-gebconfig/build.gradle    |   7 +-
 grails-test-examples/geb/build.gradle              |   7 +-
 grails-test-examples/gorm/build.gradle             |   7 +-
 .../grails/layout/EndToEndController.groovy        |  29 ++++
 .../grails-app/views/endToEnd/_content.gsp}        |   1 +
 .../grails-app/views/endToEnd/_document.gsp}       |   6 +-
 .../grails-app/views/endToEnd/actionContent.gsp}   |   1 +
 .../grails-app/views/endToEnd/modelContent.gsp}    |   1 +
 .../grails-app/views/endToEnd/parseContent.gsp}    |  11 +-
 .../grails-app/views/endToEnd/templateContent.gsp} |   1 +
 .../views/endToEnd/templateDocument.gsp}           |   1 +
 .../grails-app/views/endToEnd/urlContent.gsp}      |   1 +
 .../grails-app/views/layouts/model.gsp}            |   8 +-
 .../integration-test/groovy/EndToEndSpec.groovy    |  61 ++++++++
 .../grails-database-per-tenant/build.gradle        |   7 +-
 .../hibernate5/grails-hibernate/build.gradle       |   7 +-
 .../grails-partitioned-multi-tenancy/build.gradle  |   7 +-
 .../grails-schema-per-tenant/build.gradle          |   7 +-
 .../hibernate5/issue450/build.gradle               |   7 +-
 .../grails-database-per-tenant/build.gradle        |   7 +-
 .../hibernate7/grails-hibernate/build.gradle       |   7 +-
 .../grails-partitioned-multi-tenancy/build.gradle  |   7 +-
 .../grails-schema-per-tenant/build.gradle          |   7 +-
 .../hibernate7/issue450/build.gradle               |   7 +-
 grails-test-examples/hyphenated/build.gradle       |   7 +-
 grails-test-examples/issue-11102/build.gradle      |   7 +-
 .../issue-698-domain-save-npe/build.gradle         |   7 +-
 grails-test-examples/issue-views-182/build.gradle  |   7 +-
 grails-test-examples/jetty/build.gradle            |   6 +-
 grails-test-examples/mongodb/base/build.gradle     |   7 +-
 .../mongodb/database-per-tenant/build.gradle       |   7 +-
 .../mongodb/gson-templates/build.gradle            |   7 +-
 .../mongodb/hibernate5/build.gradle                |   7 +-
 grails-test-examples/namespaces/build.gradle       |   7 +-
 grails-test-examples/plugins/exploded/build.gradle |   6 +-
 .../plugins/issue11005/build.gradle                |   7 +-
 .../plugins/loadafter/build.gradle                 |   7 +-
 .../plugins/loadfirst/build.gradle                 |   7 +-
 .../plugins/loadsecond/build.gradle                |   7 +-
 .../scaffolding-fields/build.gradle                |   1 -
 grails-test-examples/scaffolding/build.gradle      |   6 +-
 grails-test-examples/test-phases/build.gradle      |   1 -
 .../views-functional-tests/build.gradle            |   7 +-
 grails-test-suite-uber/build.gradle                |   7 +-
 settings.gradle                                    |   4 +-
 88 files changed, 1054 insertions(+), 496 deletions(-)
 copy .github/workflows/{coverage.yml => sitemesh2.yml} (51%)
 copy grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/{sitemesh3/Sitemesh3.java => view/GrailsLayout.java} (68%)
 copy grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/{web/GrailsWeb.java => view/GspLayout.java} (62%)
 create mode 100644 grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GspLayoutSpec.groovy
 delete mode 100644 grails-gsp/grails-sitemesh3/src/main/java/org/grails/plugins/sitemesh3/Sitemesh3EnvironmentPostProcessor.java
 create mode 100644 grails-gsp/grails-sitemesh3/src/main/java/org/grails/plugins/sitemesh3/Sitemesh3RenderViewMutator.java
 delete mode 100644 grails-gsp/grails-sitemesh3/src/main/resources/META-INF/spring.factories
 delete mode 100644 grails-gsp/grails-sitemesh3/src/main/resources/META-INF/spring/org.springframework.boot.env.EnvironmentPostProcessor.imports
 create mode 100644 grails-gsp/grails-sitemesh3/src/test/groovy/org/grails/plugins/sitemesh3/Sitemesh3CapturedPageSpec.groovy
 delete mode 100644 grails-gsp/grails-sitemesh3/src/test/groovy/org/grails/plugins/sitemesh3/Sitemesh3EnvironmentPostProcessorSpec.groovy
 create mode 100644 grails-gsp/grails-sitemesh3/src/test/groovy/org/grails/plugins/sitemesh3/Sitemesh3RenderViewMutatorSpec.groovy
 copy grails-test-examples/{demo33/grails-app/views/test/foo.gsp => gsp-sitemesh3/grails-app/views/endToEnd/_content.gsp} (95%)
 copy grails-test-examples/{gsp-layout/grails-app/views/endToEnd/titleInSubtemplate.gsp => gsp-sitemesh3/grails-app/views/endToEnd/_document.gsp} (90%)
 copy grails-test-examples/{demo33/grails-app/views/test/foo.gsp => gsp-sitemesh3/grails-app/views/endToEnd/actionContent.gsp} (89%)
 copy grails-test-examples/{demo33/grails-app/views/test/foo.gsp => gsp-sitemesh3/grails-app/views/endToEnd/modelContent.gsp} (89%)
 copy grails-test-examples/{gsp-layout/grails-app/views/endToEnd/multilineTitle.gsp => gsp-sitemesh3/grails-app/views/endToEnd/parseContent.gsp} (86%)
 copy grails-test-examples/{demo33/grails-app/views/test/foo.gsp => gsp-sitemesh3/grails-app/views/endToEnd/templateContent.gsp} (90%)
 copy grails-test-examples/{demo33/grails-app/views/test/foo.gsp => gsp-sitemesh3/grails-app/views/endToEnd/templateDocument.gsp} (94%)
 copy grails-test-examples/{demo33/grails-app/views/test/foo.gsp => gsp-sitemesh3/grails-app/views/endToEnd/urlContent.gsp} (90%)
 copy grails-test-examples/{app1/grails-app/views/forwarding/forwardedView.gsp => gsp-sitemesh3/grails-app/views/layouts/model.gsp} (86%)


(grails-core) 01/01: Merge pull request #15713 from codeconsole/feat/sitemesh3-default-layout

Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

codeconsole pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git

commit 831f3fc29ba800d17be021d7ef8107207ea8e90a
Merge: 35ad3b0713 d7667d5be2
Author: Scott Murphy <sc...@alwaysvip.com>
AuthorDate: Wed Jun 17 13:53:27 2026 -0600

    Merge pull request #15713 from codeconsole/feat/sitemesh3-default-layout
    
    8.x Make SiteMesh 3 the default GSP layout

 .github/workflows/sitemesh2.yml                    | 127 +++++++++++++++++
 gradle/publish-root-config.gradle                  |   1 +
 grails-dependencies/starter-web/build.gradle       |   2 +-
 grails-doc/src/en/ref/Tags - GSP/applyLayout.adoc  |   5 +-
 .../grails/forge/feature/sitemesh3/Sitemesh3.java  |  41 +++---
 .../org/grails/forge/feature/view/GrailsGsp.java   |   7 -
 .../Sitemesh3.java => view/GrailsLayout.java}      |  33 ++---
 .../Sitemesh3.java => view/GspLayout.java}         |  43 ++----
 .../grails/forge/feature/view/GspLayoutSpec.groovy |  68 +++++++++
 .../plugins/sitemesh3/Sitemesh3GrailsPlugin.groovy |  40 ++----
 .../plugins/web/taglib/RenderSitemeshTagLib.groovy | 155 ++++++++++++++++++++-
 .../sitemesh3/CaptureAwareContentProcessor.java    |   8 ++
 .../sitemesh3/GrailsSiteMeshViewContext.java       |  14 +-
 .../sitemesh3/GrailsSiteMeshViewResolver.java      |   3 +
 ...railsSiteMeshViewResolverBeanPostProcessor.java |  30 ++++
 .../sitemesh3/Sitemesh3AutoConfiguration.java      |   2 +-
 .../plugins/sitemesh3/Sitemesh3CapturedPage.java   |  26 +++-
 .../Sitemesh3EnvironmentPostProcessor.java         |  70 ----------
 .../plugins/sitemesh3/Sitemesh3LayoutFinder.java   |  20 ++-
 .../sitemesh3/Sitemesh3RenderViewMutator.java      |  49 +++++++
 .../src/main/resources/META-INF/spring.factories   |   2 -
 ...ework.boot.env.EnvironmentPostProcessor.imports |   1 -
 .../sitemesh3/GrailsSiteMeshViewContextSpec.groovy |  40 ++++++
 ...iteMeshViewResolverBeanPostProcessorSpec.groovy |  39 ++++++
 .../GrailsSiteMeshViewResolverSpec.groovy          |  22 +++
 .../sitemesh3/Sitemesh3CapturedPageSpec.groovy     |  77 ++++++++++
 .../Sitemesh3EnvironmentPostProcessorSpec.groovy   |  71 ----------
 .../sitemesh3/Sitemesh3LayoutFinderSpec.groovy     |  63 ++++++++-
 .../Sitemesh3RenderViewMutatorSpec.groovy          |  73 ++++++++++
 grails-gsp/spring-boot/build.gradle                |  10 +-
 grails-profiles/web/profile.yml                    |   2 +-
 grails-test-examples/app1/build.gradle             |   7 +-
 grails-test-examples/app2/build.gradle             |   7 +-
 grails-test-examples/app3/build.gradle             |   7 +-
 .../async-events-pubsub-demo/build.gradle          |   7 +-
 grails-test-examples/cache/build.gradle            |   7 +-
 grails-test-examples/config-report/build.gradle    |   6 +-
 grails-test-examples/database-cleanup/build.gradle |   1 -
 grails-test-examples/datasources/build.gradle      |   7 +-
 grails-test-examples/demo33/build.gradle           |   7 +-
 grails-test-examples/exploded/build.gradle         |   6 +-
 .../external-configuration/build.gradle            |   7 +-
 grails-test-examples/geb-context-path/build.gradle |   7 +-
 grails-test-examples/geb-gebconfig/build.gradle    |   7 +-
 grails-test-examples/geb/build.gradle              |   7 +-
 grails-test-examples/gorm/build.gradle             |   7 +-
 .../grails/layout/EndToEndController.groovy        |  29 ++++
 .../grails-app/views/endToEnd/_content.gsp         |  19 +++
 .../grails-app/views/endToEnd/_document.gsp        |  22 +++
 .../grails-app/views/endToEnd/actionContent.gsp    |  19 +++
 .../grails-app/views/endToEnd/modelContent.gsp     |  19 +++
 .../grails-app/views/endToEnd/parseContent.gsp     |  22 +++
 .../grails-app/views/endToEnd/templateContent.gsp  |  19 +++
 .../grails-app/views/endToEnd/templateDocument.gsp |  19 +++
 .../grails-app/views/endToEnd/urlContent.gsp       |  19 +++
 .../grails-app/views/layouts/model.gsp             |  22 +++
 .../integration-test/groovy/EndToEndSpec.groovy    |  61 ++++++++
 .../grails-database-per-tenant/build.gradle        |   7 +-
 .../hibernate5/grails-hibernate/build.gradle       |   7 +-
 .../grails-partitioned-multi-tenancy/build.gradle  |   7 +-
 .../grails-schema-per-tenant/build.gradle          |   7 +-
 .../hibernate5/issue450/build.gradle               |   7 +-
 .../grails-database-per-tenant/build.gradle        |   7 +-
 .../hibernate7/grails-hibernate/build.gradle       |   7 +-
 .../grails-partitioned-multi-tenancy/build.gradle  |   7 +-
 .../grails-schema-per-tenant/build.gradle          |   7 +-
 .../hibernate7/issue450/build.gradle               |   7 +-
 grails-test-examples/hyphenated/build.gradle       |   7 +-
 grails-test-examples/issue-11102/build.gradle      |   7 +-
 .../issue-698-domain-save-npe/build.gradle         |   7 +-
 grails-test-examples/issue-views-182/build.gradle  |   7 +-
 grails-test-examples/jetty/build.gradle            |   6 +-
 grails-test-examples/mongodb/base/build.gradle     |   7 +-
 .../mongodb/database-per-tenant/build.gradle       |   7 +-
 .../mongodb/gson-templates/build.gradle            |   7 +-
 .../mongodb/hibernate5/build.gradle                |   7 +-
 grails-test-examples/namespaces/build.gradle       |   7 +-
 grails-test-examples/plugins/exploded/build.gradle |   6 +-
 .../plugins/issue11005/build.gradle                |   7 +-
 .../plugins/loadafter/build.gradle                 |   7 +-
 .../plugins/loadfirst/build.gradle                 |   7 +-
 .../plugins/loadsecond/build.gradle                |   7 +-
 .../scaffolding-fields/build.gradle                |   1 -
 grails-test-examples/scaffolding/build.gradle      |   6 +-
 grails-test-examples/test-phases/build.gradle      |   1 -
 .../views-functional-tests/build.gradle            |   7 +-
 grails-test-suite-uber/build.gradle                |   7 +-
 settings.gradle                                    |   4 +-
 88 files changed, 1277 insertions(+), 433 deletions(-)