This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch merge-hibernate6 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 985b13cc4128c7572aa3a8986e27c614e33dfec9 Merge: aab64f231c 93a0aebe60 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Wed Sep 24 22:00:54 2025 -0500 Merge branch '7.0.x' into merge-hibernate6 .github/workflows/gradle.yml | 1 + DEVELOPMENT.md | 1 + RELEASE.md | 262 +++++++++++-- build.gradle | 3 +- buildSrc/build.gradle | 5 +- dependencies.gradle | 10 +- gradle.properties | 3 +- gradle/functional-test-config.gradle | 5 + gradle/java-config.gradle | 5 + gradle/publish-config.gradle | 42 ++- gradle/sbom-config.gradle | 250 +++++++++++++ gradle/test-webjar-asset-config.gradle | 3 + grails-async/core/build.gradle | 1 + grails-async/gpars/build.gradle | 1 + grails-async/plugin/build.gradle | 1 + grails-async/rxjava/build.gradle | 1 + grails-async/rxjava2/build.gradle | 1 + grails-async/rxjava3/build.gradle | 1 + grails-bom/build.gradle | 1 + grails-bootstrap/build.gradle | 1 + grails-cache/build.gradle | 1 + grails-codecs-core/build.gradle | 1 + grails-codecs/build.gradle | 1 + grails-common/build.gradle | 1 + grails-console/build.gradle | 1 + grails-controllers/build.gradle | 1 + grails-converters/build.gradle | 1 + grails-core/build.gradle | 1 + .../src/main/groovy/grails/boot/GrailsApp.groovy | 3 +- grails-data-hibernate5/boot-plugin/build.gradle | 1 + grails-data-hibernate5/core/build.gradle | 1 + grails-data-hibernate5/dbmigration/build.gradle | 1 + .../command/DatabaseMigrationCommand.groovy | 10 +- .../asciidoc/databaseMigration/gettingStarted.adoc | 14 - grails-data-hibernate5/grails-plugin/build.gradle | 1 + grails-data-mongodb/boot-plugin/build.gradle | 1 + grails-data-mongodb/bson/build.gradle | 1 + grails-data-mongodb/core/build.gradle | 1 + grails-data-mongodb/ext/build.gradle | 1 + grails-data-mongodb/grails-plugin/build.gradle | 1 + grails-data-mongodb/gson-templates/build.gradle | 1 + grails-data-simple/build.gradle | 1 + grails-databinding-core/build.gradle | 1 + grails-databinding/build.gradle | 1 + grails-datamapping-async/build.gradle | 1 + grails-datamapping-core-test/build.gradle | 1 + grails-datamapping-core/build.gradle | 1 + .../transform/ServiceTransformation.groovy | 24 +- grails-datamapping-rx/build.gradle | 1 + grails-datamapping-support/build.gradle | 1 + grails-datamapping-tck/build.gradle | 1 + grails-datamapping-validation/build.gradle | 1 + grails-datasource/build.gradle | 1 + grails-datastore-async/build.gradle | 1 + grails-datastore-core/build.gradle | 1 + grails-datastore-web/build.gradle | 1 + grails-dependencies/assets/build.gradle | 1 + grails-dependencies/starter-web/build.gradle | 1 + grails-dependencies/test/build.gradle | 1 + grails-doc/build.gradle | 2 +- .../plugins/creatingAndInstallingPlugins.adoc | 241 +----------- .../src/en/guide/upgrading/upgrading60x.adoc | 61 +++- grails-doc/src/en/ref/Controllers/render.adoc | 6 +- grails-domain-class/build.gradle | 1 + grails-encoder/build.gradle | 1 + grails-events/compat/build.gradle | 1 + grails-events/core/build.gradle | 1 + grails-events/gpars/build.gradle | 1 + grails-events/plugin/build.gradle | 1 + grails-events/rxjava/build.gradle | 1 + grails-events/rxjava2/build.gradle | 1 + grails-events/rxjava3/build.gradle | 1 + grails-events/spring/build.gradle | 1 + grails-events/transforms/build.gradle | 1 + grails-fields/build.gradle | 1 + grails-forge/build.gradle | 2 - grails-forge/buildSrc/build.gradle | 5 +- grails-forge/gradle/java-config.gradle | 5 + grails-forge/gradle/publish-config.gradle | 38 +- grails-forge/grails-cli/build.gradle | 2 + grails-forge/grails-forge-cli/build.gradle | 2 + grails-forge/grails-forge-core/build.gradle | 1 + grails-geb/README.md | 40 +- grails-geb/build.gradle | 5 +- .../grails/plugin/geb/ContainerFileDetector.groovy | 3 +- .../plugin/geb/ContainerGebConfiguration.groovy | 7 +- .../grails/plugin/geb/ContainerGebSpec.groovy | 13 +- .../plugin/geb/ContainerGebTestDescription.groovy | 5 +- .../grails/plugin/geb/GebOnFailureReporter.groovy | 10 +- .../plugin/geb/GebRecordingTestListener.groovy | 19 +- .../plugin/geb/GrailsContainerGebExtension.groovy | 38 +- .../grails/plugin/geb/GrailsGebSettings.groovy | 84 +++-- .../plugin/geb/WebDriverContainerHolder.groovy | 406 ++++++++++++++------- grails-gradle/bom/build.gradle | 1 + grails-gradle/buildSrc/build.gradle | 1 + grails-gradle/common/build.gradle | 1 + grails-gradle/docs-core/build.gradle | 2 + grails-gradle/gradle/java-config.gradle | 5 + grails-gradle/gradle/publish-config.gradle | 4 +- grails-gradle/model/build.gradle | 2 + .../src/main/groovy/grails/util/Environment.groovy | 15 - grails-gradle/plugins/build.gradle | 7 + .../gradle/plugin/core/GrailsExtension.groovy | 47 ++- .../gradle/plugin/core/GrailsGradlePlugin.groovy | 167 ++++----- .../plugin/core/GrailsPluginGradlePlugin.groovy | 99 ++--- .../grails/gradle/plugin/core/PluginDefiner.groovy | 68 ++-- .../exploded/ExplodedCompatibilityRule.groovy | 33 +- .../exploded/ExplodedDisambiguationRule.groovy | 31 +- .../plugin/exploded/GrailsExplodedPlugin.groovy | 106 ++++++ grails-gradle/tasks/build.gradle | 2 + grails-gsp/core/build.gradle | 1 + grails-gsp/grails-layout/build.gradle | 1 + grails-gsp/grails-sitemesh3/build.gradle | 1 + grails-gsp/grails-taglib/build.gradle | 1 + grails-gsp/grails-web-gsp-taglib/build.gradle | 1 + grails-gsp/grails-web-gsp/build.gradle | 1 + grails-gsp/grails-web-jsp/build.gradle | 1 + grails-gsp/grails-web-taglib/build.gradle | 1 + grails-gsp/plugin/build.gradle | 1 + grails-i18n/build.gradle | 1 + grails-interceptors/build.gradle | 1 + grails-logging/build.gradle | 1 + grails-micronaut/build.gradle | 1 + grails-mimetypes/build.gradle | 1 + grails-profiles/base/build.gradle | 1 + grails-profiles/base/commands/run-app.groovy | 2 - grails-profiles/base/commands/test-app.groovy | 2 - grails-profiles/plugin/build.gradle | 1 + grails-profiles/profile/build.gradle | 1 + grails-profiles/rest-api-plugin/build.gradle | 1 + grails-profiles/rest-api/build.gradle | 1 + grails-profiles/web-plugin/build.gradle | 1 + grails-profiles/web/build.gradle | 1 + grails-rest-transforms/build.gradle | 1 + grails-scaffolding/build.gradle | 1 + .../plugin/scaffolding/DomainServiceLocator.java | 103 ++++++ .../grails/plugin/scaffolding/GormService.groovy | 10 +- .../scaffolding/RestfulServiceController.groovy | 21 +- grails-services/build.gradle | 1 + grails-shell-cli/build.gradle | 5 + grails-spring/build.gradle | 1 + grails-test-core/build.gradle | 1 + grails-test-examples/exploded/build.gradle | 65 ++++ .../exploded/grails-app/conf/application.yml | 124 +++++++ .../exploded/grails-app/conf/logback.xml | 40 ++ .../grails-app/conf/spring/resources.groovy | 14 +- .../controllers/exploded/UrlMappings.groovy | 21 +- .../grails-app/init/exploded/Application.groovy | 17 +- .../grails-app/init/exploded/BootStrap.groovy | 21 +- .../exploded/grails-app/views/error.gsp | 50 +++ .../exploded/grails-app/views/index.gsp | 147 ++++++++ .../grails-app/views/layouts/main.gsp} | 29 +- .../grails-app/views/notFound.gsp} | 16 +- .../groovy/exploded/LoadAfterSpec.groovy} | 12 +- grails-test-examples/geb-gebconfig/build.gradle | 1 + .../groovy/org/demo/spock/GebConfigSpec.groovy | 4 +- .../integration-test/resources/GebConfig.groovy | 39 +- .../geb/grails-app/views/serverName/index.gsp | 9 +- .../spock/ContainerFileDetectorDefaultSpec.groovy | 7 +- .../spock/ContainerFileDetectorSpockSpec.groovy | 2 +- .../org/demo/spock/DownloadSupportSpec.groovy | 4 +- .../org/demo/spock/InheritedConfigSpec.groovy | 16 +- .../groovy/org/demo/spock/PageDelegateSpec.groovy | 2 +- .../org/demo/spock/PerTestRecordingSpec.groovy | 6 +- .../groovy/org/demo/spock/RootPageSpec.groovy | 4 +- .../org/demo/spock/ServerNameControllerSpec.groovy | 4 +- .../groovy/org/demo/spock/UploadSpec.groovy | 12 +- .../org/demo/spock/pages/ServerNamePage.groovy | 19 +- .../org/demo/spock/pages/UploadSuccessPage.groovy | 18 +- .../plugins/exploded}/build.gradle | 41 +-- .../exploded/grails-app/conf/application.yml | 98 +++++ .../plugins/exploded/grails-app/conf/logback.xml | 40 ++ .../controllers/exploded/LoginController.groovy | 19 +- .../controllers/exploded/UrlMappings.groovy | 27 +- .../grails-app/init/exploded/Application.groovy | 21 +- .../grails-app/init/exploded/BootStrap.groovy | 21 +- .../exploded/grails-app/views/layouts/main.gsp | 70 ++++ .../exploded/grails-app/views/login/auth.gsp} | 18 +- .../groovy/exploded/ExplodedGrailsPlugin.groovy | 28 +- grails-test-examples/scaffolding/build.gradle | 72 ++++ .../grails-app/assets/images/advancedgrails.svg | 27 ++ .../assets/images/apple-touch-icon-retina.png | Bin 0 -> 7038 bytes .../grails-app/assets/images/apple-touch-icon.png | Bin 0 -> 3077 bytes .../grails-app/assets/images/documentation.svg | 19 + .../grails-app/assets/images/favicon.ico | Bin 0 -> 5558 bytes .../assets/images/grails-cupsonly-logo-white.svg | 26 ++ .../grails-app/assets/images/grails.svg | 13 + .../scaffolding/grails-app/assets/images/slack.svg | 18 + .../grails-app/assets/javascripts/application.js | 27 +- .../grails-app/assets/stylesheets/application.css | 25 +- .../grails-app/assets/stylesheets/errors.css | 109 ++++++ .../grails-app/assets/stylesheets/grails.css | 96 +++++ .../scaffolding/grails-app/conf/application.yml | 157 ++++++++ .../scaffolding/grails-app/conf/logback-spring.xml | 59 +++ .../controllers/com/example/UrlMappings.groovy | 23 +- .../controllers/com/example/UserController.groovy | 18 +- .../com/example/community/UserController.groovy | 20 +- .../grails-app/domain/com/example/User.groovy | 64 ++++ .../domain/com/example/community/User.groovy} | 38 +- .../grails-app/i18n/messages.properties | 71 ++++ .../grails-app/init/com/example/Application.groovy | 21 +- .../grails-app/init/com/example/BootStrap.groovy} | 26 +- .../services/com/example/UserService.groovy} | 35 +- .../example/community/CommunityUserService.groovy | 20 +- .../scaffolding/grails-app/views/error.gsp | 51 +++ .../scaffolding/grails-app/views/index.gsp | 102 ++++++ .../scaffolding/grails-app/views/layouts/main.gsp | 99 +++++ .../grails-app/views/notFound.gsp} | 35 +- .../example/UserCommunityControllerSpec.groovy} | 40 +- .../groovy/com/example/UserControllerSpec.groovy} | 40 +- .../groovy/com/example/pages/LoginPage.groovy} | 23 +- .../groovy/com/example/pages/LogoutPage.groovy | 26 +- grails-testing-support-core/build.gradle | 1 + grails-testing-support-datamapping/build.gradle | 1 + grails-testing-support-mongodb/build.gradle | 1 + grails-testing-support-views-gson/build.gradle | 1 + grails-testing-support-web/build.gradle | 1 + grails-url-mappings/build.gradle | 1 + grails-validation/build.gradle | 1 + grails-views-core/build.gradle | 1 + grails-views-gson/build.gradle | 1 + grails-views-markup/build.gradle | 1 + grails-web-boot/build.gradle | 1 + grails-web-common/build.gradle | 1 + grails-web-core/build.gradle | 1 + grails-web-databinding/build.gradle | 1 + grails-web-mvc/build.gradle | 1 + grails-web-url-mappings/build.gradle | 1 + grails-wrapper/build.gradle | 2 + settings.gradle | 6 + 230 files changed, 3731 insertions(+), 1230 deletions(-)
