This is an automated email from the ASF dual-hosted git repository. jamesfredley pushed a commit to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 29883477671dc1516572f9e69f5acf74135a9325 Merge: 053610bb49 95bb3023f1 Author: James Fredley <[email protected]> AuthorDate: Sat Feb 21 18:38:47 2026 -0500 Merge pull request #15434 from apache/7.0.x merge 7.0.x into 7.1.x dependencies.gradle | 4 +- gradle.properties | 3 +- .../injection/ApplicationClassInjector.groovy | 46 +- .../injection/ApplicationClassInjectorSpec.groovy | 100 +++ .../AbstractHibernateGormStaticApi.groovy | 2 +- .../core/GrailsDataHibernate5TckManager.groovy | 47 +- .../orm/hibernate/ExistsCrossJoinSpec.groovy | 122 +++ .../DataServiceMultiDataSourceSpec.groovy | 107 +++ .../WhereQueryMultiDataSourceSpec.groovy | 179 +++++ grails-data-hibernate5/dbmigration/README.md | 22 + .../mongo/core/GrailsDataMongoTckManager.groovy | 38 + .../query/criteria/AbstractDetachedCriteria.groovy | 3 + .../implementers/AbstractWhereImplementer.groovy | 8 +- .../services/WhereConnectionRoutingSpec.groovy | 211 +++++ .../criteria/DetachedCriteriaCloneSpec.groovy | 123 +++ .../testing/tck/base/GrailsDataTckManager.groovy | 16 + .../testing/tck/domains/WhereRoutingItem.groovy | 43 + .../tck/domains/WhereRoutingItemService.groovy | 37 + .../tests/WhereQueryConnectionRoutingSpec.groovy | 140 ++++ .../dataSource/automaticDatabaseMigration.adoc | 15 +- .../src/en/guide/upgrading/upgrading60x.adoc | 18 + .../build/gradle/templates/buildGradle.rocker.raw | 2 +- .../micronaut/GrailsMicronautValidator.java | 48 ++ .../feature/reloading/SpringBootDevTools.java | 12 +- .../feature/spring/SpringBootUndertowFeature.java | 4 + .../grails-forge-core/src/main/resources/pom.xml | 6 + .../reloading/SpringBootDevToolsSpec.groovy | 32 +- .../forge/feature/spring/SpringBootSpec.groovy | 14 + .../gradle/plugin/core/GrailsGradlePlugin.groovy | 91 ++- .../core/GrailsGradlePluginJavaCompatSpec.groovy | 109 +++ .../java-compat-no-toolchain/build.gradle | 21 + .../java-compat-no-toolchain/gradle.properties | 1 + .../grails-app/conf/application.yml | 0 .../java-compat-no-toolchain/settings.gradle | 1 + .../java-compat-toolchain-23/build.gradle | 29 + .../java-compat-toolchain-23/gradle.properties | 1 + .../grails-app/conf/application.yml | 0 .../java-compat-toolchain-23/settings.gradle | 1 + .../java-compat-toolchain-24/build.gradle | 29 + .../java-compat-toolchain-24/gradle.properties | 1 + .../grails-app/conf/application.yml | 0 .../java-compat-toolchain-24/settings.gradle | 1 + .../java-compat-toolchain-current/build.gradle | 27 + .../gradle.properties | 1 + .../grails-app/conf/application.yml | 0 .../java-compat-toolchain-current/settings.gradle | 1 + grails-micronaut/build.gradle | 3 +- .../micronaut/GrailsMicronautGrailsPlugin.groovy | 36 +- .../integration-test/groovy/gorm/ExistsSpec.groovy | 57 ++ .../services/example/ProductService.groovy | 10 + .../DataServiceMultiDataSourceSpec.groovy | 46 ++ .../build.gradle | 18 +- .../grails-app/conf/application.yml | 35 +- .../micronautgroovyonly}/UrlMappings.groovy | 3 +- .../init/micronautgroovyonly/Application.groovy} | 22 +- .../BeanInjectionService.groovy} | 36 +- .../micronautgroovyonly/TestService.groovy} | 17 +- .../BeanInjectionServiceSpec.groovy | 57 ++ .../MicronautContextSpec.groovy | 83 ++ .../MicronautQualifierSpec.groovy | 97 +++ .../main/groovy/bean/injection/AppConfig.groovy} | 19 +- .../bean/injection/FactoryCreatedService.groovy} | 18 +- .../groovy/bean/injection/NamedService.groovy} | 17 +- .../bean/injection/PrimaryNamedService.groovy} | 21 +- .../main/groovy/bean/injection/Qualified.groovy} | 20 +- .../bean/injection/QualifiedNamedService.groovy} | 22 +- .../bean/injection/RegularNamedService.groovy} | 23 +- .../groovy/bean/injection/ServiceFactory.groovy} | 24 +- .../bean/injection/SpecialNamedService.groovy} | 23 +- grails-test-examples/micronaut/build.gradle | 14 +- .../micronaut/grails-app/conf/application.yml | 7 + .../micronaut/ExternalApiController.groovy | 113 +++ ...pings.groovy => MicronautTestController.groovy} | 42 +- .../controllers/micronaut/UrlMappings.groovy | 15 + .../services/micronaut/ExternalApiService.groovy | 110 +++ .../micronaut/MicronautBeanDuplicationSpec.groovy | 105 +++ .../groovy/micronaut/MicronautBeanTypesSpec.groovy | 99 +++ .../MicronautDeclarativeClientSpec.groovy | 299 +++++++ .../micronaut/MicronautErsatzAdvancedSpec.groovy | 863 +++++++++++++++++++++ .../micronaut/MicronautErsatzPatternSpec.groovy | 481 ++++++++++++ .../micronaut/MicronautErsatzRoundtripSpec.groovy | 531 +++++++++++++ .../micronaut/MicronautPluginBeanSpec.groovy | 85 ++ .../main/groovy/bean/injection/AppConfig.groovy} | 19 +- .../bean/injection/FactoryCreatedService.groovy} | 18 +- .../groovy/bean/injection/ServiceFactory.groovy} | 24 +- .../client/MicronautAdvancedClient.groovy | 59 ++ .../client/MicronautFilteredClient.groovy} | 22 +- .../micronaut/client/MicronautHeaderClient.groovy} | 24 +- .../micronaut/client/MicronautPathClient.groovy} | 27 +- .../client/MicronautReactiveClient.groovy} | 41 +- .../micronaut/client/MicronautTestClient.groovy} | 43 +- .../java/bean/injection/JavaMessageProvider.java | 23 + .../java/bean/injection/JavaSingletonService.java | 28 + .../client/MicronautRetryableClient.java} | 22 +- .../micronaut/filter/AuthTokenClientFilter.java} | 21 +- .../plugins/issue-11767/build.gradle | 6 +- .../build.gradle | 15 +- .../MicronautSingletonGrailsPlugin.groovy} | 19 +- .../plugins/micronaut/PluginMessageProvider.java | 22 + .../plugins/micronaut/PluginSingletonService.java | 28 + settings.gradle | 4 + 101 files changed, 5234 insertions(+), 418 deletions(-)
