This is an automated email from the ASF dual-hosted git repository. jamesfredley pushed a commit to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit ac0baf72da5a56bab0ed863d1690bb591f675f7c Merge: 9819ebee66 ce07dd577c Author: James Fredley <[email protected]> AuthorDate: Tue Jan 27 10:47:31 2026 -0500 Merge branch '7.0.x' into 7.1.x # Conflicts: # gradle.properties # grails-core/src/test/groovy/grails/util/GrailsUtilTests.java .github/workflows/gradle.yml | 6 +++--- .github/workflows/release.yml | 2 +- .sdkmanrc | 5 ++++- build-logic/gradle/wrapper/gradle-wrapper.properties | 2 ++ etc/bin/Dockerfile | 3 ++- gradle.properties | 4 +++- gradle/wrapper/gradle-wrapper.properties | 2 ++ grails-data-graphql/gradle.properties | 2 +- grails-data-neo4j/gradle.properties | 2 +- grails-doc/src/en/guide/GORM/quickStartGuide.adoc | 4 ++-- .../src/en/guide/GORM/quickStartGuide/basicCRUD.adoc | 16 ++++++++-------- .../src/en/guide/commandLine/creatingCustomCommands.adoc | 2 +- .../en/guide/conf/dataSource/multipleDatasources.adoc | 2 +- grails-doc/src/en/guide/conf/docengine.adoc | 2 +- grails-forge/gradle.properties | 2 +- grails-forge/gradle/wrapper/gradle-wrapper.properties | 2 ++ .../gradle/templates/gradleWrapperProperties.rocker.raw | 3 ++- grails-gradle/gradle/wrapper/gradle-wrapper.properties | 2 ++ .../skeleton/gradle/wrapper/gradle-wrapper.properties | 2 ++ .../skeleton/gradle/wrapper/gradle-wrapper.properties | 2 ++ grails-test-examples/gsp-spring-boot/script/.sdkmanrc | 4 ++-- 21 files changed, 45 insertions(+), 26 deletions(-)
