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 91ace4334e987d4604382617fcdaf0199e01ef34 Merge: e9e015cf0d 796cd2f1bc Author: Mattias Reichel <[email protected]> AuthorDate: Wed Dec 3 11:06:40 2025 +0100 Merge branch '7.0.x' into 7.1.x # Conflicts: # gradle.properties # grails-core/src/test/groovy/grails/util/GrailsUtilTests.java .github/scripts/releaseDistributions.sh | 12 ++--- .github/scripts/releaseJarFiles.sh | 7 +-- .github/workflows/release.yml | 51 ++++++++++++++-------- dependencies.gradle | 6 +-- .../examples/grails3-neo4j-hibernate/build.gradle | 1 - .../examples/grails3-neo4j/build.gradle | 1 - grails-dependencies/assets/build.gradle | 1 - .../gradleBuild/gradleDependencies.adoc | 1 - .../src/en/guide/upgrading/upgrading60x.adoc | 5 ++- .../forge/build/gradle/GradleRepository.java | 10 +++++ .../forge/feature/assetPipeline/AssetPipeline.java | 5 --- grails-geb/README.md | 5 ++- grails-profiles/web/profile.yml | 2 - grails-test-examples/app1/build.gradle | 2 +- grails-test-examples/app2/build.gradle | 1 - grails-test-examples/demo33/build.gradle | 1 - grails-test-examples/geb-gebconfig/build.gradle | 1 - grails-test-examples/geb/build.gradle | 1 - grails-test-examples/gsp-layout/build.gradle | 1 - grails-test-examples/gsp-sitemesh3/build.gradle | 1 - .../grails-database-per-tenant/build.gradle | 1 - .../hibernate5/grails-hibernate/build.gradle | 1 - .../grails-partitioned-multi-tenancy/build.gradle | 1 - .../grails-schema-per-tenant/build.gradle | 1 - .../hibernate5/issue450/build.gradle | 1 - grails-test-examples/hyphenated/build.gradle | 1 - grails-test-examples/issue-11102/build.gradle | 1 - grails-test-examples/mongodb/base/build.gradle | 1 - .../mongodb/database-per-tenant/build.gradle | 1 - .../mongodb/gson-templates/build.gradle | 1 - .../mongodb/hibernate5/build.gradle | 1 - grails-test-examples/namespaces/build.gradle | 1 - grails-test-examples/scaffolding/build.gradle | 1 - .../views-functional-tests/build.gradle | 3 +- 34 files changed, 67 insertions(+), 64 deletions(-)
