This is an automated email from the ASF dual-hosted git repository. matrei pushed a commit to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit f35f3ce6d935fa38bdf1a1f38dc4f810dbded4cc Merge: fd1c744196 6a1019390e Author: Mattias Reichel <[email protected]> AuthorDate: Thu Nov 20 22:55:58 2025 +0100 Merge branch '7.0.x' into 7.1.x dependencies.gradle | 10 +- grails-cache/build.gradle | 5 +- .../marshaller/json/GenericJavaBeanMarshaller.java | 1 + .../marshaller/json/GroovyBeanMarshaller.java | 1 + .../marshaller/xml/GenericJavaBeanMarshaller.java | 1 + .../marshaller/xml/GroovyBeanMarshaller.java | 1 + .../marshaller/json/StaticPropertySpec.groovy | 68 ++++++++++++++ grails-data-hibernate5/dbmigration/build.gradle | 1 - grails-data-hibernate5/grails-plugin/build.gradle | 1 - grails-data-mongodb/grails-plugin/build.gradle | 5 +- .../examples/grails3-neo4j-hibernate/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- .../examples/grails3-neo4j/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- grails-dependencies/assets/build.gradle | 1 + .../gradleBuild/gradleDependencies.adoc | 1 + grails-doc/src/en/guide/introduction/whatsNew.adoc | 2 +- .../introduction/whatsNew/dependencyUpgrades.adoc | 2 +- grails-fields/build.gradle | 2 - .../forge/feature/assetPipeline/AssetPipeline.java | 5 + .../resources/assets/javascripts/application.js | 4 +- .../resources/assets/stylesheets/application.css | 6 +- grails-geb/build.gradle | 1 - grails-gsp/grails-sitemesh3/build.gradle | 2 - grails-gsp/plugin/build.gradle | 2 - grails-gsp/spring-boot/build.gradle | 4 +- grails-profiles/web/profile.yml | 2 + .../grails-app/assets/javascripts/application.js | 4 +- .../grails-app/assets/stylesheets/application.css | 6 +- .../grails/rest/render/ContainerRenderer.groovy | 2 +- .../main/groovy/grails/rest/render/Renderer.groovy | 2 +- .../rest/render/errors/VndErrorJsonRenderer.groovy | 3 +- .../rest/render/errors/VndErrorXmlRenderer.groovy | 3 +- .../grails/rest/render/hal/HalJsonRenderer.groovy | 2 +- .../render/util/AbstractLinkingRenderer.groovy | 4 +- .../rest/render/json/DefaultJsonRenderer.groovy | 2 +- grails-scaffolding/build.gradle | 1 - grails-test-examples/app1/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- grails-test-examples/app2/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- grails-test-examples/demo33/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 4 +- .../grails-app/assets/stylesheets/application.css | 8 +- grails-test-examples/geb-gebconfig/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 4 +- .../grails-app/assets/stylesheets/application.css | 8 +- grails-test-examples/geb/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 4 +- .../grails-app/assets/stylesheets/application.css | 8 +- .../org/demo/spock/PerTestRecordingSpec.groovy | 12 +-- grails-test-examples/gsp-layout/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 4 +- .../grails-app/assets/stylesheets/application.css | 8 +- grails-test-examples/gsp-sitemesh3/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 4 +- .../grails-app/assets/stylesheets/application.css | 8 +- .../grails-database-per-tenant/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- .../hibernate5/grails-hibernate/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- .../grails-partitioned-multi-tenancy/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- .../grails-schema-per-tenant/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- .../hibernate5/issue450/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 4 +- .../grails-app/assets/stylesheets/application.css | 8 +- grails-test-examples/hyphenated/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- grails-test-examples/issue-11102/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 4 +- .../grails-app/assets/stylesheets/application.css | 8 +- .../build.gradle | 25 +++-- .../issue-15228/grails-app/conf/application.yml | 58 ++++++++++++ .../issue-15228/grails-app/conf/logback.xml | 39 ++++++++ .../issue15228/app/AppController.groovy | 33 ++++--- .../controllers/issue15228/app/UrlMappings.groovy | 21 ++--- .../init/issue15228/app/Application.groovy | 22 ++--- .../grails-app/views/app/normalView.gson | 20 ++-- .../grails-app/views/errors/_errors.gson | 30 +++--- .../_otherValidateableObject.gson | 20 ++-- .../issue11767/app/GsonViewRespondSpec.groovy | 104 +++++++++++++++++++++ .../issue15228/app/OtherValidateableObject.groovy | 22 ++--- .../issue15228/app/ValidateableObject.groovy | 22 ++--- .../grails-app/assets/javascripts/application.js | 4 +- .../grails-app/assets/stylesheets/application.css | 8 +- grails-test-examples/mongodb/base/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- .../mongodb/database-per-tenant/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- .../mongodb/gson-templates/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- .../mongodb/hibernate5/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- grails-test-examples/namespaces/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- grails-test-examples/plugins/exploded/build.gradle | 1 - .../plugins/issue11005/build.gradle | 1 - .../plugins/loadafter/build.gradle | 1 - .../plugins/loadfirst/build.gradle | 1 - .../plugins/loadsecond/build.gradle | 1 - grails-test-examples/scaffolding/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 4 +- .../grails-app/assets/stylesheets/application.css | 6 +- .../views-functional-tests-plugin/build.gradle | 2 - .../views-functional-tests/build.gradle | 1 + .../grails-app/assets/javascripts/application.js | 2 +- .../grails-app/assets/stylesheets/application.css | 4 +- .../groovy/functional/tests/BookSpec.groovy | 27 +++--- .../rest/render/xml/DefaultXmlRendererSpec.groovy | 3 - .../views/mvc/renderer/DefaultViewRenderer.groovy | 2 +- grails-views-gson/build.gradle | 2 - .../AbstractJsonViewContainerRenderer.groovy | 11 +-- grails-views-markup/build.gradle | 2 - .../grails/web/mapping/ResponseRedirector.groovy | 8 +- .../web/mapping/RedirectNonAbsoluteURISpec.groovy | 22 +++++ settings.gradle | 2 + 132 files changed, 587 insertions(+), 303 deletions(-)
