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 fa45c9c309b24cb02533d5e0b9c6cc86269691a0 Merge: 6e463ae14b a35474f878 Author: James Fredley <[email protected]> AuthorDate: Sun Aug 2 12:01:10 2026 -0400 Merge branch '7.0.x' into 7.1.x .agents/skills/grails-developer/SKILL.md | 2 +- .agents/skills/groovy-developer/SKILL.md | 2 +- AGENTS.md | 2 +- dependencies.gradle | 16 +++- grails-bom/base/build.gradle | 1 + grails-bom/hibernate5/build.gradle | 1 + grails-bom/micronaut/build.gradle | 1 + grails-forge/settings.gradle | 2 +- grails-gradle/bom/build.gradle | 1 + grails-shell-cli/build.gradle | 5 ++ ...SpringApplicationWebApplicationInitializer.java | 15 +++- ...ApplicationWebApplicationInitializerSpec.groovy | 97 ++++++++++++++++++++++ settings.gradle | 2 +- 13 files changed, 138 insertions(+), 9 deletions(-) diff --cc dependencies.gradle index d8644ef417,ffda4df22a..61cc341174 --- a/dependencies.gradle +++ b/dependencies.gradle @@@ -37,6 -38,8 +37,9 @@@ ext 'jline.version' : '2.14.6', 'jna.version' : '5.17.0', 'jquery.version' : '3.7.1', + // Security: overrides spring-boot-dependencies (2.24.3). 2.25.5 fixes CVE-2026-49844 flagged against log4j-api. ++ // Also declared in bomDependencyVersions so app BOMs and the Gradle plugin BOM stay aligned. + 'log4j2.version' : '2.25.5', 'objenesis.version' : '3.4', 'spring-boot.version' : '3.5.16', ]
