This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 7.0.x-hibernate6 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit a72213a7a337173fca8fe0e651de98866b6783c6 Merge: bb8351a274 d4484ac074 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Sat Oct 11 12:19:42 2025 -0500 Merge branch '7.0.x' into merge-hibernate6 .asf.yaml | 32 ++- .github/release-drafter.yml | 4 - .github/scripts/releaseDistributions.sh | 6 +- .github/vote_templates/announce.txt | 6 +- .github/vote_templates/groovy_pmc.txt | 33 --- .github/vote_templates/staged.txt | 18 +- .github/workflows/gradle.yml | 18 +- .github/workflows/groovy-joint-workflow.yml | 3 +- .github/workflows/release-abort.yml | 2 +- .github/workflows/release.yml | 110 ++++---- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 16 +- DISCLAIMER | 1 - DOAP.rdf | 2 +- INSTALL | 2 +- README.md | 12 +- RELEASE.md | 62 ++-- SECURITY.md | 2 +- UPGRADE7.md | 52 ---- {grails-logging => build-logic}/README.md | 5 +- .../buildSrc => build-logic}/build.gradle | 20 +- {grails-gradle => build-logic}/gradle.properties | 5 - build-logic/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + build-logic/gradlew | 251 ++++++++++++++++ build-logic/gradlew.bat | 94 ++++++ {grails-gradle => build-logic}/settings.gradle | 22 +- .../org/apache/grails/buildsrc/GradleUtils.groovy | 45 ++- .../apache/grails/buildsrc/PublishPlugin.groovy | 250 ++++++++++++++++ .../org/apache/grails/buildsrc/SbomPlugin.groovy | 314 +++++++++++++++++++++ build.gradle | 32 --- dependencies.gradle | 4 +- etc/bin/download-release-artifacts.sh | 84 +++--- etc/bin/reset-verify.sh | 4 +- etc/bin/verify-cli-distribution.sh | 14 +- etc/bin/verify-jar-artifacts.sh | 2 +- etc/bin/verify-keys.sh | 2 +- etc/bin/verify-source-distribution.sh | 12 +- etc/bin/verify-wrapper-distribution.sh | 14 +- etc/bin/verify.sh | 8 +- gradle.properties | 4 +- gradle/publish-config.gradle | 148 ---------- gradle/rat-root-config.gradle | 2 + gradle/sbom-config.gradle | 250 ---------------- grails-async/core/build.gradle | 4 +- grails-async/gpars/build.gradle | 4 +- grails-async/plugin/build.gradle | 4 +- grails-async/rxjava/build.gradle | 4 +- grails-async/rxjava2/build.gradle | 4 +- grails-async/rxjava3/build.gradle | 4 +- grails-bom/build.gradle | 7 +- grails-bootstrap/build.gradle | 4 +- grails-cache/build.gradle | 4 +- grails-codecs-core/build.gradle | 4 +- grails-codecs/build.gradle | 4 +- grails-common/build.gradle | 32 ++- .../grails/util/GrailsMessageSourceUtils.groovy | 0 grails-console/build.gradle | 4 +- grails-controllers/build.gradle | 4 +- grails-converters/build.gradle | 4 +- .../ConvertersConfigurationInitializer.java | 6 + ...DateMarshaller.java => CalendarMarshaller.java} | 21 +- .../converters/marshaller/json/DateMarshaller.java | 2 +- ...{DateMarshaller.java => InstantMarshaller.java} | 38 +-- ...ateMarshaller.java => LocalDateMarshaller.java} | 38 +-- ...arshaller.java => LocalDateTimeMarshaller.java} | 38 +-- ...rshaller.java => OffsetDateTimeMarshaller.java} | 38 +-- ...arshaller.java => ZonedDateTimeMarshaller.java} | 38 +-- grails-core/build.gradle | 4 +- .../src/main/groovy/grails/boot/GrailsApp.groovy | 6 +- .../tools/ClassRelativeClassLoaderSpec.groovy | 2 +- .../src/main/docs/gettingStarted/CRUD.adoc | 2 +- .../docs/gettingStarted/creatingDomainClasses.adoc | 2 +- .../guide-rx/src/main/docs/introduction.adoc | 2 +- .../src/main/docs/querying/dynamicFinders.adoc | 2 +- .../guide-rx/src/main/docs/querying/index.adoc | 8 +- .../src/main/docs/querying/whereQueries.adoc | 2 +- .../guide-whats-new/src/main/docs/index.adoc | 2 +- .../docs/src/main/docs/guide/gettingStarted.adoc | 6 +- .../docs/src/main/docs/guide/types.adoc | 2 +- grails-data-hibernate5/README.md | 10 +- grails-data-hibernate5/boot-plugin/build.gradle | 4 +- grails-data-hibernate5/core/build.gradle | 4 +- grails-data-hibernate5/dbmigration/README.md | 8 +- grails-data-hibernate5/dbmigration/build.gradle | 4 +- .../DatabaseMigrationGrailsPlugin.groovy | 2 +- .../asciidoc/databaseMigration/introduction.adoc | 2 +- .../gormAssociation/manyToOneAndOneToOne.adoc | 2 +- .../docs/src/docs/asciidoc/introduction.adoc | 2 +- .../docs/src/docs/asciidoc/learningMore.adoc | 2 +- grails-data-hibernate5/grails-plugin/build.gradle | 4 +- .../plugin/hibernate/HibernateGrailsPlugin.groovy | 2 +- grails-data-mongodb/README.md | 10 +- grails-data-mongodb/boot-plugin/build.gradle | 4 +- grails-data-mongodb/bson/build.gradle | 4 +- .../codecs/temporal/InstantBsonConverter.groovy | 6 +- .../temporal/InstantBsonConverterSpec.groovy | 6 +- grails-data-mongodb/core/build.gradle | 21 +- .../docs/asciidoc/introduction/compatibility.adoc | 2 +- .../src/docs/asciidoc/querying/queryingBasics.adoc | 2 +- grails-data-mongodb/ext/build.gradle | 4 +- grails-data-mongodb/grails-plugin/build.gradle | 4 +- .../plugins/mongodb/MongodbGrailsPlugin.groovy | 2 +- grails-data-mongodb/gson-templates/build.gradle | 4 +- grails-data-neo4j/README.md | 2 +- .../src/docs/asciidoc/mapping/associations.adoc | 2 +- .../docs/src/docs/asciidoc/querying.adoc | 6 +- grails-data-simple/build.gradle | 4 +- grails-databinding-core/build.gradle | 4 +- grails-databinding/build.gradle | 4 +- grails-datamapping-async/build.gradle | 4 +- grails-datamapping-core-test/build.gradle | 4 +- grails-datamapping-core/build.gradle | 4 +- .../compiler/gorm/GormEntityTransformation.groovy | 2 +- grails-datamapping-rx/build.gradle | 4 +- grails-datamapping-support/build.gradle | 4 +- grails-datamapping-tck/build.gradle | 4 +- grails-datamapping-validation/build.gradle | 4 +- grails-datasource/build.gradle | 4 +- grails-datastore-async/build.gradle | 4 +- grails-datastore-core/build.gradle | 4 +- grails-datastore-web/build.gradle | 4 +- grails-dependencies/assets/build.gradle | 5 +- grails-dependencies/starter-web/build.gradle | 5 +- grails-dependencies/test/build.gradle | 5 +- grails-doc/README.md | 2 +- .../services/dependencyInjectionServices.adoc | 2 +- .../src/en/guide/upgrading/upgrading60x.adoc | 140 ++++++++- grails-doc/src/en/ref/Tags - GSP/javascript.adoc | 2 +- grails-domain-class/build.gradle | 8 +- grails-encoder/build.gradle | 4 +- grails-events/compat/build.gradle | 4 +- grails-events/core/build.gradle | 4 +- grails-events/gpars/build.gradle | 4 +- grails-events/plugin/build.gradle | 4 +- grails-events/rxjava/build.gradle | 4 +- grails-events/rxjava2/build.gradle | 4 +- grails-events/rxjava3/build.gradle | 4 +- grails-events/spring/build.gradle | 4 +- grails-events/transforms/build.gradle | 4 +- grails-fields/README.md | 8 +- grails-fields/build.gradle | 4 +- grails-forge/README.md | 2 +- grails-forge/build.gradle | 36 --- grails-forge/buildSrc/build.gradle | 3 +- grails-forge/gradle.properties | 2 +- grails-forge/gradle/publish-config.gradle | 142 ---------- grails-forge/grails-cli-shadow/build.gradle | 1 - grails-forge/grails-cli/build.gradle | 16 +- grails-forge/grails-forge-cli/build.gradle | 4 +- .../forge/cli/command/CreateAppCommandSpec.groovy | 13 - grails-forge/grails-forge-core/build.gradle | 6 +- .../grails/forge/feature/cache/GrailsCache.java | 2 +- .../grails/forge/feature/database/MongoGorm.java | 2 +- .../grails/forge/feature/database/Neo4jGorm.java | 71 ----- .../feature/lang/groovy/application.rocker.raw | 11 +- .../forge/feature/logging/LogbackGroovy.java | 83 ------ .../logging/template/logbackGroovy.rocker.raw | 119 -------- .../forge/feature/micronaut/GrailsMicronaut.java | 19 +- .../feature/micronaut/MicronautHttpClient.java | 32 ++- .../feature/migration/DatabaseMigrationPlugin.java | 2 +- .../feature/other/template/maindocs.rocker.raw | 8 +- .../forge/feature/test/template/spock.rocker.raw | 2 +- .../org/grails/forge/feature/view/GrailsViews.java | 2 +- .../org/grails/forge/feature/view/Scaffolding.java | 2 +- .../java/org/grails/forge/options/GormImpl.java | 3 +- .../src/main/resources/gsp/main.gsp | 4 +- .../grails-forge-core/src/main/resources/pom.xml | 18 +- .../forge/feature/database/MongoGormSpec.groovy | 9 - .../forge/feature/database/Neo4JGormSpec.groovy | 67 ----- .../feature/logging/LogbackGroovyConfigSpec.groovy | 56 ---- grails-forge/settings.gradle | 78 ++++- .../org/grails/forge/create/CreateAppSpec.groovy | 6 +- grails-geb/build.gradle | 4 +- .../plugin/geb/GrailsContainerGebExtension.groovy | 2 +- .../plugin/geb/WebDriverContainerHolder.groovy | 18 +- grails-gradle/.gitignore | 14 - grails-gradle/bom/build.gradle | 7 +- grails-gradle/build.gradle | 30 -- grails-gradle/buildSrc/build.gradle | 1 - grails-gradle/common/build.gradle | 4 +- grails-gradle/docs-core/build.gradle | 4 +- .../src/main/groovy/grails/doc/DocPublisher.groovy | 2 +- .../doc/dropdown/CreateReleaseDropDownTask.groovy | 2 +- .../src/main/resources/grails/doc/doc.properties | 4 +- grails-gradle/gradle.properties | 5 - grails-gradle/gradle/java-config.gradle | 23 -- grails-gradle/gradle/publish-config.gradle | 118 -------- grails-gradle/model/build.gradle | 4 +- .../src/main/groovy/grails/util/Environment.groovy | 9 - grails-gradle/plugins/README.md | 2 +- grails-gradle/plugins/build.gradle | 4 +- .../gradle/plugin/agent/AgentTasksEnhancer.groovy | 88 ------ .../gradle/plugin/core/GrailsExtension.groovy | 32 --- .../gradle/plugin/core/GrailsGradlePlugin.groovy | 30 +- grails-gradle/settings.gradle | 75 ++++- grails-gradle/tasks/build.gradle | 4 +- grails-gsp/README.md | 8 +- grails-gsp/core/build.gradle | 4 +- .../src/main/groovy/org/grails/gsp/GroovyPage.java | 47 +-- .../groovy/org/grails/gsp/GroovyPageMetaInfo.java | 67 +++-- .../groovy/org/grails/gsp/GroovyPageWritable.java | 36 ++- .../org/grails/gsp/GroovyPagesTemplateEngine.java | 21 ++ .../grails/gsp/compiler/GroovyPageCompiler.groovy | 36 ++- .../org/grails/gsp/compiler/GroovyPageParser.java | 7 +- grails-gsp/grails-layout/build.gradle | 4 +- grails-gsp/grails-sitemesh3/build.gradle | 4 +- .../plugins/sitemesh3/Sitemesh3GrailsPlugin.groovy | 2 +- grails-gsp/grails-taglib/build.gradle | 4 +- grails-gsp/grails-web-gsp-taglib/build.gradle | 4 +- grails-gsp/grails-web-gsp/build.gradle | 4 +- .../web/gsp/GroovyPagesTemplateRenderer.java | 27 +- grails-gsp/grails-web-jsp/build.gradle | 4 +- grails-gsp/grails-web-taglib/build.gradle | 4 +- grails-gsp/plugin/build.gradle | 4 +- .../gsp/compiler/tags/GroovyEachParseTests.groovy | 14 +- .../groovy/org/grails/web/pages/ParseSpec.groovy | 16 +- grails-i18n/build.gradle | 4 +- grails-interceptors/build.gradle | 4 +- grails-logging/README.md | 2 +- grails-logging/build.gradle | 4 +- grails-micronaut/build.gradle | 4 +- grails-mimetypes/build.gradle | 4 +- grails-profiles/base/build.gradle | 9 +- grails-profiles/plugin/build.gradle | 7 +- grails-profiles/profile/build.gradle | 7 +- grails-profiles/rest-api-plugin/build.gradle | 7 +- grails-profiles/rest-api/build.gradle | 7 +- grails-profiles/web-plugin/build.gradle | 6 +- grails-profiles/web/build.gradle | 6 +- .../web/skeleton/grails-app/views/layouts/main.gsp | 4 +- grails-rest-transforms/build.gradle | 8 +- grails-scaffolding/build.gradle | 4 +- .../scaffolding/ScaffoldingGrailsPlugin.groovy | 2 +- grails-services/build.gradle | 4 +- grails-shell-cli/build.gradle | 4 +- .../profile/repository/MavenRepositorySpec.groovy | 2 - grails-spring/build.gradle | 4 +- grails-test-core/build.gradle | 4 +- .../cache/grails-app/views/layouts/main.gsp | 6 +- .../grails-app/views/layouts/main.gsp | 6 +- .../geb/grails-app/views/layouts/main.gsp | 6 +- .../groovy/org/demo/spock/RootPageSpec.groovy | 2 +- .../org/demo/spock/ServerNameControllerSpec.groovy | 2 +- .../gsp-layout/grails-app/views/layouts/main.gsp | 6 +- .../grails-app/views/layouts/main.gsp | 6 +- .../issue450/grails-app/views/layouts/main.gsp | 6 +- .../micronaut/grails-app/views/layouts/main.gsp | 6 +- .../scaffolding/grails-app/views/layouts/main.gsp | 4 +- .../converters/JSONDateTimeMarshallingSpec.groovy | 149 ++++++++++ grails-testing-support-core/build.gradle | 4 +- grails-testing-support-datamapping/build.gradle | 4 +- grails-testing-support-mongodb/build.gradle | 4 +- grails-testing-support-views-gson/build.gradle | 4 +- grails-testing-support-web/build.gradle | 4 +- .../grails/testing/web/GrailsWebUnitTest.groovy | 5 +- grails-url-mappings/build.gradle | 4 +- grails-validation/build.gradle | 4 +- grails-views-core/build.gradle | 7 +- grails-views-gson/build.gradle | 7 +- .../grails/plugin/json/builder/JsonGenerator.java | 2 +- .../json/converters/InstantJsonConverter.groovy | 3 +- .../converters/ZonedDateTimeJsonConverter.groovy | 2 +- .../view/JsonViewGeneratorConfiguration.groovy | 2 +- .../plugin/json/view/JsonViewGrailsPlugin.groovy | 2 +- .../plugin/json/view/DateTimeRenderingSpec.groovy | 230 +++++++++++++++ grails-views-markup/build.gradle | 4 +- .../markup/view/MarkupViewGrailsPlugin.groovy | 2 +- grails-web-boot/build.gradle | 4 +- grails-web-common/build.gradle | 4 +- grails-web-core/build.gradle | 4 +- grails-web-databinding/build.gradle | 8 +- grails-web-mvc/build.gradle | 4 +- grails-web-url-mappings/build.gradle | 4 +- grails-wrapper/build.gradle | 6 +- grails-wrapper/distribution-artifacts/DISCLAIMER | 1 - settings.gradle | 77 ++++- 277 files changed, 2619 insertions(+), 2447 deletions(-)
