This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit ed11fd5cb5ebdd5afaafec34d7b632964fc9f71a Merge: 9ca377b921 15d4e9cf1f Author: James Daugherty <[email protected]> AuthorDate: Mon Nov 10 15:50:28 2025 -0500 Merge remote-tracking branch 'upstream/7.0.x' into 7.1.x .github/scripts/releaseDistributions.sh | 15 +- .github/scripts/releaseJarFiles.sh | 9 +- .github/vote_templates/announce.txt | 14 +- .github/vote_templates/staged.txt | 20 +- .github/vote_templates/vote_succeeded.txt | 12 + .github/workflows/release.yml | 665 ++++++++++----------- .sdkmanrc | 2 +- RELEASE.md | 10 +- dependencies.gradle | 6 +- etc/bin/Dockerfile | 2 +- etc/bin/verify.sh | 27 +- .../groovy/org/grails/config/NavigableMap.groovy | 83 +-- .../grails/config/SpringProfileExcludeSpec.groovy | 173 ++++++ .../ConvertersConfigurationInitializer.java | 26 +- .../converters/marshaller/json/EnumMarshaller.java | 4 + ...umMarshaller.java => SimpleEnumMarshaller.java} | 20 +- .../converters/marshaller/xml/EnumMarshaller.java | 4 + ...umMarshaller.java => SimpleEnumMarshaller.java} | 12 +- .../advancedGORMFeatures/ormdsl/caching.adoc | 16 +- .../AbstractMethodDecoratingTransformation.groovy | 2 - .../src/en/guide/upgrading/upgrading60x.adoc | 79 ++- .../build/gradle/templates/buildGradle.rocker.raw | 7 - .../templates/gradleWrapperProperties.rocker.raw | 5 - .../feature/test/GebWithWebDriverBinaries.java | 9 +- .../grails/forge/io/FileSystemOutputHandler.java | 67 ++- .../main/java/org/grails/forge/io/OutputUtils.java | 61 ++ .../java/org/grails/forge/io/ZipOutputHandler.java | 52 +- .../grails-forge-core/src/main/resources/pom.xml | 14 +- .../test/GebWithWebDriverBinariesSpec.groovy | 4 +- .../org/grails/forge/create/CreateAppSpec.groovy | 2 +- .../model/src/main/groovy/grails/io/IOUtils.groovy | 5 +- .../main/groovy/grails/util/BuildSettings.groovy | 2 +- .../src/test/groovy/grails/io/IOUtilsSpec.groovy | 11 +- .../gradle/plugin/core/GrailsGradlePlugin.groovy | 2 +- .../web/converters/JSONConverterTests.groovy | 24 + grails-testing-support-web/build.gradle | 1 + 36 files changed, 952 insertions(+), 515 deletions(-)
