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 83c9e62d5535e1959c581900eb47ff11bea88566
Merge: a04197fd17 9942511516
Author: James Fredley <[email protected]>
AuthorDate: Sun Oct 19 18:43:55 2025 -0400

    Merge branch '7.0.x' into 7.1.x
    
    # Conflicts:
    #       gradle.properties
    #       grails-core/src/test/groovy/grails/util/GrailsUtilTests.java

 .github/workflows/codeql.yml                       |   6 +-
 .github/workflows/release.yml                      |  18 +-
 RELEASE.md                                         |  10 +-
 .../org/apache/grails/buildsrc/GradleUtils.groovy  |   4 -
 .../apache/grails/buildsrc/PublishPlugin.groovy    |   4 +
 .../org/apache/grails/buildsrc/SbomPlugin.groovy   | 188 +++++++++++--------
 dependencies.gradle                                |   2 +-
 etc/bin/verify-reproducible.sh                     |   2 +-
 .../mongo/engine/MongoCodecEntityPersister.groovy  |  19 ++
 .../engine/codecs/PersistentEntityCodec.groovy     |   7 -
 .../BeforeUpdatePropertyPersistenceSpec.groovy     | 201 +++++++++++++++++++++
 .../core/grailsversion/GrailsVersionSpec.groovy    |   2 +-
 grails-forge/gradle.properties                     |   2 +-
 13 files changed, 360 insertions(+), 105 deletions(-)

Reply via email to