This is an automated email from the ASF dual-hosted git repository. matrei pushed a commit to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit c7dace8b40610d376804c52527fad96aef79c108 Merge: 9fdc3bee48 d77461e0ad Author: Mattias Reichel <[email protected]> AuthorDate: Fri Mar 13 15:23:28 2026 +0100 Merge branch '7.0.x' into 7.1.x # Conflicts: # .github/workflows/gradle.yml # gradle.properties # grails-core/src/test/groovy/grails/util/GrailsUtilTests.java # grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/DatastoreServiceMethodInvokingFactoryBean.groovy .github/workflows/codestyle.yml | 61 +- .github/workflows/forge-deploy-next.yml | 6 + .github/workflows/forge-deploy-prev-snapshot.yml | 6 + .github/workflows/forge-deploy-prev.yml | 6 + .github/workflows/forge-deploy-release.yml | 6 + .github/workflows/forge-deploy-snapshot.yml | 6 + .github/workflows/gradle.yml | 34 +- .github/workflows/groovy-joint-workflow.yml | 7 + .github/workflows/rat.yml | 4 +- .../buildsrc/GrailsCodeStyleExtension.groovy | 9 + .../grails/buildsrc/GrailsCodeStylePlugin.groovy | 19 + .../org/apache/grails/buildsrc/SbomPlugin.groovy | 8 + build.gradle | 36 + gradle/docs-dependencies.gradle | 22 +- gradle/grails-data-tck-config.gradle | 4 +- .../hibernate/query/AbstractHibernateQuery.java | 8 +- ...hedCriteriaProjectionNullAssociationSpec.groovy | 136 +++ grails-data-hibernate5/dbmigration/build.gradle | 5 +- grails-datamapping-core/build.gradle | 1 + .../datastore/gorm/jdbc/DataSourceBuilder.java | 64 +- .../gorm/jdbc/DataSourceBuilderSpec.groovy | 927 +++++++++++++++++++++ ...atastoreServiceMethodInvokingFactoryBean.groovy | 2 +- grails-doc/build.gradle | 8 +- .../src/en/guide/testing/integrationTesting.adoc | 36 + .../functionaltests/async/AsyncPromiseSpec.groovy | 8 +- .../micronaut/MicronautErsatzRoundtripSpec.groovy | 2 + .../grails-app/domain/com/example/User.groovy | 9 +- .../com/example/UserCommunityControllerSpec.groovy | 3 +- .../groovy/com/example/UserControllerSpec.groovy | 3 +- grails-testing-support-dbcleanup-core/README.md | 58 ++ .../testing/cleanup/core/DatabaseCleanup.groovy | 19 + .../cleanup/core/DatabaseCleanupExtension.groovy | 38 +- .../cleanup/core/DatabaseCleanupInterceptor.groovy | 40 +- .../core/DatabaseCleanupExtensionSpec.groovy | 64 ++ .../core/DatabaseCleanupInterceptorSpec.groovy | 184 +++- 35 files changed, 1771 insertions(+), 78 deletions(-) diff --cc .github/workflows/gradle.yml index bcc40c1a21,a1f7095655..8f21bdcc15 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@@ -189,8 -191,8 +197,8 @@@ jobs ./tmp1/cli/bin/grails --version ./tmp1/cli/bin/grails-forge-cli --version - name: "📤 Upload CLI Zip to Workflow Summary Page" - if: ${{ matrix.java == '17' }} + if: ${{ matrix.java == '17' && matrix.indy == false }} - uses: actions/upload-artifact@v6 + uses: actions/[email protected] with: name: 'apache-grails-SNAPSHOT-bin.zip' include-hidden-files: true diff --cc grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/DatastoreServiceMethodInvokingFactoryBean.groovy index 973afd25c7,5e3a002dc4..b4daa22290 --- a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/DatastoreServiceMethodInvokingFactoryBean.groovy +++ b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/DatastoreServiceMethodInvokingFactoryBean.groovy @@@ -35,9 -32,7 +35,9 @@@ import org.grails.datastore.mapping.cor import org.grails.datastore.mapping.services.Service /** - * Variant of {#link MethodInvokingFactoryBean} which returns the correct - * Variant of {@link MethodInvokingFactoryBean} which returns the correct data service type instead of {@code java.lang.Object} so the Autowire with type works correctly. ++ * Variant of {@link MethodInvokingFactoryBean} which returns the correct + * data service type instead of {@code java.lang.Object} so the Autowire + * with type works correctly. */ @Internal @CompileStatic
