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 06cd705e3750163033984ab9dadac55ceca1bd91 Merge: 162ff83a38 939b61ad89 Author: Mattias Reichel <[email protected]> AuthorDate: Fri Nov 14 12:54:59 2025 +0100 Merge branch '7.0.x' into 7.1.x RELEASE.md | 24 ++++++++++------------ etc/bin/Dockerfile | 2 +- etc/bin/verify.sh | 2 +- .../guide/cache/cacheUsage/cacheConfiguration.adoc | 2 +- .../en/guide/cache/cacheUsage/cacheUnitTests.adoc | 4 ++-- .../en/guide/testing/unitTesting/annotations.adoc | 6 +++--- .../unitTesting/unitTestingDomainClasses.adoc | 10 ++++----- .../unitTesting/unitTestingUrlMappings.adoc | 2 +- .../guide/theWebLayer/gson/jsonInstallation.adoc | 19 +++++++++++------ grails-doc/src/en/guide/theWebLayer/gsp.adoc | 2 +- .../gradle/plugin/core/GrailsGradlePlugin.groovy | 10 ++------- .../plugin/core/GrailsPluginGradlePlugin.groovy | 7 ++----- .../BasicCachingServiceNoCacheManagerSpec.groovy | 2 ++ .../groovy/com/demo/BasicCachingServiceSpec.groovy | 2 ++ .../grails-app/controllers/demo/UrlMappings.groovy | 2 ++ .../demo33/grails-app/domain/demo/Person.groovy | 3 ++- .../groovy/demo/DependencyInjectionSpec.groovy | 2 ++ .../src/test/groovy/demo/DataTestTraitSpec.groovy | 2 ++ .../demo/GetDomainClassesToMockMethodSpec.groovy | 2 ++ .../test/groovy/demo/PersonControllerSpec.groovy | 2 ++ .../demo33/src/test/groovy/demo/PersonSpec.groovy | 2 ++ .../grails/testing/spock/OnceBeforeSpec.groovy | 2 ++ .../groovy/grails/testing/spock/RunOnceSpec.groovy | 2 ++ 23 files changed, 65 insertions(+), 48 deletions(-)
