Skip to content

Align Log4j across published BOMs #16045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesfredley merged 1 commit into from
Jul 29, 2026
+19 −10
Merged

Align Log4j across published BOMs #16045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ ext {
'asciidoctor-gradle-jvm.version': '4.0.5',
'asciidoctorj.version' : '3.0.0',
'asset-pipeline-gradle.version' : '5.0.34',
'bnd.version' : '7.1.0',
'byte-buddy.version' : '1.18.3',
'commons-text.version' : '1.15.0',
'directory-watcher.version' : '0.19.1',
Expand All @@ -37,13 +38,16 @@ 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.
'log4j2.version' : '2.25.5',
'objenesis.version' : '3.4',
'spring-boot.version' : '3.5.16',
]

// Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
gradleBomPlatformDependencies = [
'spring-boot-bom' : "org.springframework.boot:spring-boot-dependencies:${gradleBomDependencyVersions['spring-boot.version']}",
'log4j2-bom' : "org.apache.logging.log4j:log4j-bom:${gradleBomDependencyVersions['log4j2.version']}",
'gradle-spock-bom': "org.spockframework:spock-bom:${gradleBomDependencyVersions['gradle-spock.version']}",
]

Expand All @@ -56,6 +60,7 @@ ext {
'asciidoctor-gradle-jvm': "org.asciidoctor:asciidoctor-gradle-jvm:${gradleBomDependencyVersions['asciidoctor-gradle-jvm.version']}",
'asciidoctorj' : "org.asciidoctor:asciidoctorj:${gradleBomDependencyVersions['asciidoctorj.version']}",
'asset-pipeline-gradle' : "cloud.wondrify:asset-pipeline-gradle:${gradleBomDependencyVersions['asset-pipeline-gradle.version']}",
'bnd-annotation' : "biz.aQute.bnd:biz.aQute.bnd.annotation:${gradleBomDependencyVersions['bnd.version']}",
'byte-buddy' : "net.bytebuddy:byte-buddy:${gradleBomDependencyVersions['byte-buddy.version']}",
'commons-text' : "org.apache.commons:commons-text:${gradleBomDependencyVersions['commons-text.version']}",
'directory-watcher' : "io.methvin:directory-watcher:${gradleBomDependencyVersions['directory-watcher.version']}",
Expand All @@ -64,6 +69,12 @@ ext {
'javaparser-core' : "com.github.javaparser:javaparser-core:${gradleBomDependencyVersions['javaparser-core.version']}",
'jline' : "jline:jline:${gradleBomDependencyVersions['jline.version']}",
'jna' : "net.java.dev.jna:jna:${gradleBomDependencyVersions['jna.version']}",
// Security override of spring-boot-dependencies - see log4j2.version
'log4j2-api' : "org.apache.logging.log4j:log4j-api:${gradleBomDependencyVersions['log4j2.version']}",
'log4j2-core' : "org.apache.logging.log4j:log4j-core:${gradleBomDependencyVersions['log4j2.version']}",
'log4j2-jul' : "org.apache.logging.log4j:log4j-jul:${gradleBomDependencyVersions['log4j2.version']}",
'log4j2-slf4j2-impl' : "org.apache.logging.log4j:log4j-slf4j2-impl:${gradleBomDependencyVersions['log4j2.version']}",
'log4j2-to-slf4j' : "org.apache.logging.log4j:log4j-to-slf4j:${gradleBomDependencyVersions['log4j2.version']}",
'objenesis' : "org.objenesis:objenesis:${gradleBomDependencyVersions['objenesis.version']}",
'spring-boot-cli' : "org.springframework.boot:spring-boot-cli:${gradleBomDependencyVersions['spring-boot.version']}",
'spring-boot-gradle' : "org.springframework.boot:spring-boot-gradle-plugin:${gradleBomDependencyVersions['spring-boot.version']}",
Expand All @@ -87,8 +98,6 @@ ext {
'jackson.version' : '2.21.5',
// Security: overrides spring-boot-dependencies (1.5.34). 1.5.37 fixes CVE-2026-13006 flagged against logback-core.
'logback.version' : '1.5.37',
// Security: overrides spring-boot-dependencies (2.24.3). 2.25.5 fixes CVE-2026-49844 flagged against log4j-api.
'log4j2.version' : '2.25.5',
'jquery.version' : '3.7.1',
'hibernate-groovy-proxy.version': '1.1',
'jakarta-servlet-api.version' : '6.1.0',
Expand Down Expand Up @@ -120,7 +129,6 @@ ext {
'asset-pipeline-bom': "cloud.wondrify:asset-pipeline-bom:${bomDependencyVersions['asset-pipeline-bom.version']}",
'spock-bom' : "org.spockframework:spock-bom:${bomDependencyVersions['spock.version']}",
'jackson-bom' : "com.fasterxml.jackson:jackson-bom:${bomDependencyVersions['jackson.version']}",
'log4j2-bom' : "org.apache.logging.log4j:log4j-bom:${bomDependencyVersions['log4j2.version']}",
'groovy-bom' : "org.apache.groovy:groovy-bom:${bomDependencyVersions['groovy.version']}",
'junit-bom' : "org.junit:junit-bom:${bomDependencyVersions['junit.version']}",
'selenium-bom' : "org.seleniumhq.selenium:selenium-bom:${bomDependencyVersions['selenium.version']}",
Expand Down Expand Up @@ -176,12 +184,6 @@ ext {
// Security override of spring-boot-dependencies - see logback.version
'logback-classic' : "ch.qos.logback:logback-classic:${bomDependencyVersions['logback.version']}",
'logback-core' : "ch.qos.logback:logback-core:${bomDependencyVersions['logback.version']}",
// Security override of spring-boot-dependencies - see log4j2.version
'log4j2-api' : "org.apache.logging.log4j:log4j-api:${bomDependencyVersions['log4j2.version']}",
'log4j2-core' : "org.apache.logging.log4j:log4j-core:${bomDependencyVersions['log4j2.version']}",
'log4j2-jul' : "org.apache.logging.log4j:log4j-jul:${bomDependencyVersions['log4j2.version']}",
'log4j2-slf4j2-impl' : "org.apache.logging.log4j:log4j-slf4j2-impl:${bomDependencyVersions['log4j2.version']}",
'log4j2-to-slf4j' : "org.apache.logging.log4j:log4j-to-slf4j:${bomDependencyVersions['log4j2.version']}",
// start - boot & selenium conflict, so pin the version we want (newest)
'jakarta-servlet-api' : "jakarta.servlet:jakarta.servlet-api:${bomDependencyVersions['jakarta-servlet-api.version']}",
'jakarta-validation-api' : "jakarta.validation:jakarta.validation-api:${bomDependencyVersions['jakarta-validation-api.version']}",
Expand Down Expand Up @@ -234,7 +236,10 @@ ext {

// Because pom exclusions aren't properly supported by gradle, we can't inherit the grails-gradle-bom
// this requires copying the platforms selectively to the grails-bom. Create a combined version for convenience.
combinedPlatforms = ['spring-boot-bom': gradleBomPlatformDependencies['spring-boot-bom']] + bomPlatformDependencies
combinedPlatforms = [
'spring-boot-bom': gradleBomPlatformDependencies['spring-boot-bom'],
'log4j2-bom' : gradleBomPlatformDependencies['log4j2-bom'],
] + bomPlatformDependencies
combinedDependencies = gradleBomDependencies + bomDependencies
combinedVersions = gradleBomDependencyVersions + bomDependencyVersions

Expand Down
1 change: 1 addition & 0 deletions grails-bom/base/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ ext {
}

dependencies {
api platform(gradleBomPlatformDependencies['log4j2-bom'])
api platform(gradleBomPlatformDependencies['spring-boot-bom']), {
exclude group: 'org.apache.groovy'
exclude group: 'org.spockframework'
Expand Down
1 change: 1 addition & 0 deletions grails-bom/hibernate5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ ext {
}

dependencies {
api platform(gradleBomPlatformDependencies['log4j2-bom'])
api platform(project(':grails-bom'))
api platform(gradleBomPlatformDependencies['spring-boot-bom']), {
exclude group: 'org.hibernate.orm'
Expand Down
1 change: 1 addition & 0 deletions grails-bom/micronaut/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ def overriddenModules = customBomDependencies.values().collect { String coord ->
Set<String> overriddenCoords = overriddenModules.collect { "${it.group}:${it.module}".toString() } as Set

dependencies {
api platform(gradleBomPlatformDependencies['log4j2-bom'])
api(platform(project(':grails-bom'))) {
overriddenModules.each { ovr ->
exclude group: ovr.group, module: ovr.module
Expand Down
1 change: 1 addition & 0 deletions grails-gradle/bom/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ ext {
}

dependencies {
api platform(gradleBomPlatformDependencies['log4j2-bom'])
api platform(gradleBomPlatformDependencies['spring-boot-bom']), {
exclude group: 'org.apache.groovy'
exclude group: 'org.spockframework'
Expand Down
Loading