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 b48f425beb8475037af5591ea21815a14a0d17bd Merge: cac9ed3e47 600a1d5f14 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Wed May 21 22:47:55 2025 -0500 Merge branch '7.0.x' into merge-hibernate6 .github/workflows/codeql.yml | 5 +- .github/workflows/gradle.yml | 56 +- .github/workflows/groovy-joint-workflow.yml | 5 + .github/workflows/rat.yml | 4 + .github/workflows/release-notes.yml | 4 + .github/workflows/release.yml | 12 +- .github/workflows/retry-release.yml | 108 ---- .github/workflows/sdkman.yml | 53 -- CONTRIBUTING.md | 20 - HEADER | 16 + README.md | 29 +- UPGRADE7.md | 36 +- build.gradle | 48 +- buildSrc/build.gradle | 2 +- dependencies.gradle | 78 ++- etc/bin/rename_gradle_artifacts.sh | 602 ++++++++++----------- gradle/java-config.gradle | 1 - gradle/publish-root-config.gradle | 1 - gradle/rat-root-config.gradle | 2 - grails-bom/build.gradle | 12 + .../org/grails/plugins/CodecsGrailsPlugin.groovy | 32 -- .../plugins/codecs/CodecsGrailsPlugin.groovy | 9 +- .../src/main/resources/META-INF/grails-plugin.xml | 3 - .../GrailsApplicationContextCommandRunner.groovy | 28 +- .../src/main/resources/META-INF/grails-plugin.xml | 3 - .../src/main/resources/META-INF/grails.factories | 1 - .../src/main/groovy/grails/dev/Support.groovy | 107 ---- .../ApplicationContextCommandRegistry.groovy | 35 +- .../main/groovy/grails/plugins/GrailsPlugin.java | 21 +- .../injection/ApplicationClassInjector.groovy | 46 +- .../cfg/GroovyConfigPropertySourceLoader.groovy | 27 +- .../org/grails/plugins/AbstractGrailsPlugin.java | 8 +- .../plugins/AbstractGrailsPluginManager.java | 28 +- .../org/grails/plugins/DefaultGrailsPlugin.java | 58 +- .../GroovyConfigPropertySourceLoaderSpec.groovy | 28 +- .../src/test/resources/builtin-config.groovy | 18 +- .../src/main/docs/gettingStarted.adoc | 2 +- grails-data-graphql/build.gradle | 6 +- grails-data-graphql/core/build.gradle | 2 +- grails-data-neo4j/build.gradle | 4 +- .../datastore/gorm/CustomAutoTimestampSpec.groovy | 53 +- .../gorm/events/AutoTimestampEventListener.java | 9 +- .../src/main/resources/META-INF/grails-plugin.xml | 3 - grails-doc/src/en/guide/commandLine.adoc | 4 - .../src/en/guide/commandLine/gradleBuild.adoc | 5 +- grails-doc/src/en/guide/conf/config.adoc | 1 - grails-doc/src/en/guide/contributing/build.adoc | 53 +- .../guide/gettingStarted/aHelloWorldExample.adoc | 2 - .../gettingStarted/downloadingAndInstalling.adoc | 46 +- grails-doc/src/en/guide/introduction/whatsNew.adoc | 37 +- .../introduction/whatsNew/dependencyUpgrades.adoc | 3 - .../en/guide/theWebLayer/gson/pluginSupport.adoc | 4 +- .../src/en/guide/upgrading/upgrading60x.adoc | 206 +++++-- grails-doc/src/en/ref/Command Line.adoc | 1 - .../src/en/ref/Command Line/schema-export.adoc | 2 +- grails-doc/src/en/ref/Tags - GSP/formatDate.adoc | 2 + .../src/main/resources/META-INF/grails-plugin.xml | 3 - .../src/main/resources/META-INF/grails.factories | 1 - grails-geb/build.gradle | 1 - grails-gradle/build.gradle | 42 +- .../src/test/resources/docs/guide/single.html | 8 +- grails-gradle/gradle/e2eTest.gradle | 2 +- grails-gradle/gradle/java-config.gradle | 1 - .../main/groovy/grails/util/BuildSettings.groovy | 34 +- .../src/main/groovy/grails/util/Environment.groovy | 30 +- .../org/grails/io/support/MainClassFinder.groovy | 6 +- grails-gradle/plugins/build.gradle | 8 +- .../gradle/test/GrailsPublishPluginSpec.groovy | 8 +- .../build.gradle | 4 +- .../otherProject/build.gradle | 2 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../groovy-doc-disabled/build.gradle | 4 +- .../groovy-only-project/build.gradle | 4 +- .../java-already-configured/build.gradle | 4 +- .../other-artifacts/java-only-project/build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../multiple-source-sets/build.gradle | 4 +- .../non-groovy-java-sources-included/build.gradle | 4 +- .../other-artifacts/simple-project/build.gradle | 4 +- .../build.gradle | 4 +- .../otherProject/build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../gradle/plugin/core/GrailsExtension.groovy | 5 - .../gradle/plugin/core/GrailsGradlePlugin.groovy | 132 +++-- .../publishing/GrailsPublishGradlePlugin.groovy | 60 +- .../gradle/plugin/run/FindMainClassTask.groovy | 56 +- .../views/AbstractGroovyTemplatePlugin.groovy | 17 - .../plugin/views/gsp/GroovyPagePlugin.groovy | 52 +- grails-gradle/settings.gradle | 5 +- grails-gradle/tasks/README.md | 17 + grails-gradle/tasks/build.gradle | 109 ++++ .../gradle/plugin/run/FindMainClassTask.groovy | 55 +- .../grails/gradle/plugin/util/SourceSets.groovy | 0 .../groovy/org/grails/gsp/GroovyPageMetaInfo.java | 35 +- .../web/taglib/TagLibraryTransformerSpec.groovy | 2 +- .../plugins/web/DefaultDateHelperSpec.groovy | 50 +- .../web/pages/ReservedWordOverrideTests.groovy | 5 +- .../web/taglib/AbstractGrailsTagTests.groovy | 7 +- .../src/main/resources/META-INF/grails-plugin.xml | 3 - grails-profiles/base/profile.yml | 4 +- grails-profiles/plugin/skeleton/build.gradle | 2 - grails-profiles/profile/skeleton/build.gradle | 4 +- .../web/skeleton/grails-app/views/layouts/main.gsp | 1 - .../src/main/resources/META-INF/grails-plugin.xml | 3 - .../src/main/resources/META-INF/grails.factories | 1 - .../src/main/resources/META-INF/grails-plugin.xml | 3 - grails-shell-cli/build.gradle | 30 +- .../main/groovy/org/grails/cli/GrailsCli.groovy | 273 +++++----- .../cli/boot/GrailsDependencyVersions.groovy | 4 +- .../org/grails/cli/profile/AbstractProfile.groovy | 31 +- .../grails/cli/profile/ProfileRepoConfig.groovy | 79 +++ .../cli/profile/commands/CommandRegistry.groovy | 44 +- .../grails/cli/profile/commands/HelpCommand.groovy | 31 +- .../ApplicationContextCommandFactory.groovy | 34 +- .../commands/factory/ServiceCommandFactory.groovy | 28 +- .../GrailsRepositoryConfiguration.groovy | 41 +- .../repository/MavenProfileRepository.groovy | 33 +- .../grails/cli/profile/steps/StepRegistry.groovy | 28 +- .../profile/repository/MavenRepositorySpec.groovy | 5 +- grails-test-examples/app1/build.gradle | 14 - grails-test-examples/app2/build.gradle | 18 +- .../app2/grails-app/controllers/UrlMappings.groovy | 1 + .../controllers/app2/ErrorsController.groovy | 2 +- .../groovy/app2/ErrorsControllerSpec.groovy | 9 +- grails-test-examples/app3/build.gradle | 12 - .../async-events-pubsub-demo/build.gradle | 13 - grails-test-examples/cache/build.gradle | 12 - grails-test-examples/datasources/build.gradle | 12 - grails-test-examples/demo33/build.gradle | 13 - .../external-configuration/build.gradle | 18 - grails-test-examples/geb/build.gradle | 18 - grails-test-examples/gorm/build.gradle | 12 - grails-test-examples/gsp-sitemesh3/build.gradle | 13 - .../gsp-spring-boot/app/build.gradle | 17 +- .../gsp-spring-boot/script/app.groovy | 2 +- grails-test-examples/hyphenated/build.gradle | 13 - grails-test-examples/issue-11102/build.gradle | 13 - grails-test-examples/issue-11767/build.gradle | 11 - .../issue-698-domain-save-npe/build.gradle | 12 - grails-test-examples/issue-views-182/build.gradle | 12 - grails-test-examples/micronaut/build.gradle | 13 - grails-test-examples/namespaces/build.gradle | 13 - .../plugins/issue-11767-plugin/build.gradle | 11 - .../plugins/issue11005/build.gradle | 12 - .../plugins/loadafter/build.gradle | 12 - .../plugins/loadfirst/build.gradle | 12 - .../plugins/loadsecond/build.gradle | 12 - .../grails/commons/GrailsPluginManagerTests.groovy | 28 +- .../test/defaultErrorMessages.properties | 30 - .../resources/grails-app/conf/BuildConfig.groovy | 23 - .../logging-0.1/LoggingGrailsPlugin.groovy | 22 - .../global-plugins/logging-0.1/plugin.xml | 4 - .../logging-0.1/scripts/DoSomething.groovy | 19 - .../logging-0.1/scripts/_Install.groovy | 0 .../grails-plugin-utils/grails-debug/plugin.xml | 4 - .../grails-debug/scripts/RunDebug.groovy | 0 .../jsecurity-0.3/JSecurityGrailsPlugin.groovy | 22 - .../plugins/jsecurity-0.3/plugin.xml | 4 - .../scripts/CreateAuthController.groovy | 0 .../jsecurity-0.3/scripts/CreateDbRealm.groovy | 0 .../test/test-projects/inline-plugins/README.txt | 1 - .../app/grails-app/conf/BuildConfig.groovy | 21 - .../plugins/foo/FooGrailsPlugin.groovy | 20 - .../controllers/foo/FooController.groovy | 22 - .../plugins/foobar/FoobarGrailsPlugin.groovy | 20 - .../controllers/foobar/FoobarController.groovy | 23 - .../test-projects/nested-inline-plugins/README.txt | 3 - .../app/grails-app/conf/BuildConfig.groovy | 21 - .../plugin-one/PluginOneGrailsPlugin.groovy | 24 - .../plugin-one/grails-app/conf/BuildConfig.groovy | 20 - .../plugin-two/PluginTwoGrailsPlugin.groovy | 20 - .../plugin-build-settings/application.properties | 24 - .../grails-app/conf/BootStrap.groovy | 29 - .../grails-app/conf/BuildConfig.groovy | 43 -- .../grails-app/conf/Config.groovy | 91 ---- .../grails-app/conf/DataSource.groovy | 50 -- .../grails-app/conf/UrlMappings.groovy | 30 - .../grails-app/conf/spring/resources.groovy | 23 - .../grails-app/i18n/messages.properties | 49 -- .../HibernateGrailsPlugin.groovy | 57 -- .../hibernate-1.2-SNAPSHOT/application.properties | 19 - .../hibernate-1.2-SNAPSHOT/dependencies.groovy | 44 -- .../grails-app/i18n/messages.properties | 16 - .../grails-app/i18n/org/example/custom.properties | 16 - .../i18n/org/example/custom_fr.properties | 16 - .../lib/hibernate-annotations-3.4.0.GA.jar | Bin 279714 -> 0 bytes .../lib/hibernate-core-3.3.1.GA.jar | Bin 2766130 -> 0 bytes .../plugins/hibernate-1.2-SNAPSHOT/plugin.xml | 29 - .../hibernate-1.2-SNAPSHOT/scripts/_Install.groovy | 10 - .../scripts/_Uninstall.groovy | 5 - .../hibernate-1.2-SNAPSHOT/scripts/_Upgrade.groovy | 10 - .../WebflowGrailsPlugin.groovy | 53 -- .../webflow-1.2-SNAPSHOT/application.properties | 21 - .../webflow-1.2-SNAPSHOT/dependencies.groovy | 36 -- .../grails-app/i18n/messages.properties | 16 - .../org.springframework.webflow-2.0.8.RELEASE.jar | Bin 519341 -> 0 bytes .../plugins/webflow-1.2-SNAPSHOT/plugin.xml | 36 -- .../webflow-1.2-SNAPSHOT/scripts/_Install.groovy | 10 - .../webflow-1.2-SNAPSHOT/scripts/_Uninstall.groovy | 5 - .../webflow-1.2-SNAPSHOT/scripts/_Upgrade.groovy | 10 - .../testing/spock/WebSetupSpecInterceptor.groovy | 2 +- .../src/main/resources/META-INF/grails-plugin.xml | 3 - .../grails/web/databinding/DataBindingUtils.java | 2 +- .../src/main/resources/META-INF/grails.factories | 1 - grails-wrapper-impl/build.gradle | 58 -- .../src/main/groovy/grails/init/RunCommand.groovy | 81 --- grails-wrapper/build.gradle | 3 +- ...aseHandler.java => FindLastReleaseHandler.java} | 4 +- ...otHandler.java => FindLastSnapshotHandler.java} | 5 +- .../main/java/grails/init/GrailsReleaseType.java | 47 ++ .../src/main/java/grails/init/GrailsUpdater.java | 267 +++++++++ .../src/main/java/grails/init/GrailsVersion.java | 121 +++++ .../main/java/grails/init/GrailsWrapperHome.java | 229 ++++++++ .../main/java/grails/init/GrailsWrapperRepo.java | 112 ++++ .../src/main/java/grails/init/Start.java | 211 ++++---- settings.gradle | 1 - 224 files changed, 2771 insertions(+), 3317 deletions(-)
