Skip to content

GEODE-10544: Upgrade Apache Log4j from version 2.17.2 to 2.25.3 to remediate security vulnerability CVE-2025-68161. #7978

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

Open
JinwooHwang wants to merge 3 commits into
base: support/1.15
Choose a base branch
from
Open

GEODE-10544: Upgrade Apache Log4j from version 2.17.2 to 2.25.3 to remediate security vulnerability CVE-2025-68161. #7978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb22b6a
GEODE-10544: Upgrade Log4j from 2.17.2 to 2.25.3
JinwooHwang Jan 10, 2026
3df1413
Fix integration test failures for Log4j 2.25.3
JinwooHwang Jan 10, 2026
bf8b9d1
Update build.gradle comments to explain all 5 dependency exclusions
JinwooHwang Jan 10, 2026
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
3 changes: 2 additions & 1 deletion ...y-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class DependencyConstraints {
deps.put("fastutil.version", "8.5.8")
deps.put("javax.transaction-api.version", "1.3")
deps.put("jgroups.version", "3.6.20.Final")
deps.put("log4j.version", "2.17.2")
deps.put("log4j.version", "2.25.3")
deps.put("micrometer.version", "1.9.1")
deps.put("shiro.version", "1.13.0")
deps.put("slf4j-api.version", "1.7.32")
Expand Down Expand Up @@ -215,6 +215,7 @@ class DependencyConstraints {
dependencySet(group: 'org.apache.logging.log4j', version: get('log4j.version')) {
entry('log4j-api')
entry('log4j-core')
entry('log4j-core-test')
entry('log4j-jcl')
entry('log4j-jul')
entry('log4j-slf4j-impl')
Expand Down
27 changes: 25 additions & 2 deletions geode-log4j/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ plugins {
id 'jmh'
}

// Suppress Log4j 2.25.3 GraalVM annotation processor warning
tasks.withType(JavaCompile) {
options.compilerArgs.addAll([
'-Alog4j.graalvm.groupId=org.apache.geode',
'-Alog4j.graalvm.artifactId=geode-log4j'
])
}

dependencies {
api(platform(project(':boms:geode-all-bom')))

Expand Down Expand Up @@ -63,8 +71,23 @@ dependencies {
exclude module: 'geode-core'
}
integrationTestImplementation('junit:junit')
integrationTestImplementation('org.apache.logging.log4j:log4j-core::tests')
integrationTestImplementation('org.apache.logging.log4j:log4j-core::test-sources')
// Log4j 2.20.0+ moved test utilities to log4j-core-test with new package names:
// org.apache.logging.log4j.junit → org.apache.logging.log4j.core.test.junit
// org.apache.logging.log4j.test → org.apache.logging.log4j.core.test
// log4j-core-test 2.25.3 requires the following exclusions:
// - assertj-core 3.27.3: conflicts with Geode's 3.22.0 custom assertions
// (NoSuchMethodError: CommonValidations.failIfEmptySinceActualIsNotEmpty)
// - maven-core 3.9.10: causes Gradle dependency resolution conflict with Guava
// - log4j-api-test: brings JUnit 5.13.2 transitively
// - junit.jupiter/platform 5.13.2: conflicts with project's JUnit 5.8.2
// (JUnitException: OutputDirectoryProvider not available due to version mismatch)
integrationTestImplementation('org.apache.logging.log4j:log4j-core-test') {
exclude group: 'org.apache.maven'
exclude group: 'org.apache.logging.log4j', module: 'log4j-api-test'
exclude group: 'org.assertj', module: 'assertj-core'
exclude group: 'org.junit.jupiter'
exclude group: 'org.junit.platform'
}
integrationTestImplementation('org.assertj:assertj-core')

distributedTestImplementation(project(':geode-junit')) {
Expand Down
2 changes: 1 addition & 1 deletion ...Test/java/org/apache/geode/alerting/log4j/internal/impl/AlertAppenderIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/apache/geode/logging/log4j/internal/impl/BothLogWriterAppendersIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import java.net.URL;

import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
4 changes: 2 additions & 2 deletions ...org/apache/geode/logging/log4j/internal/impl/CacheWithCustomLogConfigIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
2 changes: 1 addition & 1 deletion ...he/geode/logging/log4j/internal/impl/ConfigurationWithLogLevelChangesIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
2 changes: 1 addition & 1 deletion ...eode/logging/log4j/internal/impl/ConsoleAppenderWithLoggerContextRuleIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.appender.DefaultErrorHandler;
import org.apache.logging.log4j.core.appender.OutputStreamManager;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
Expand Down
2 changes: 1 addition & 1 deletion ...gging/log4j/internal/impl/DistributedSystemWithBothLogWriterAppendersIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.util.Properties;

import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
2 changes: 1 addition & 1 deletion ...eode/logging/log4j/internal/impl/DistributedSystemWithLogLevelChangesIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
2 changes: 1 addition & 1 deletion ...tionTest/java/org/apache/geode/logging/log4j/internal/impl/FastLoggerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
4 changes: 2 additions & 2 deletions ...he/geode/logging/log4j/internal/impl/GemfireVerboseMarkerFilterAcceptIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
Expand Down
4 changes: 2 additions & 2 deletions ...ache/geode/logging/log4j/internal/impl/GemfireVerboseMarkerFilterDenyIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.appender.DefaultErrorHandler;
import org.apache.logging.log4j.core.appender.OutputStreamManager;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
2 changes: 1 addition & 1 deletion ...pache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderWithCacheIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
2 changes: 1 addition & 1 deletion ...ode/logging/log4j/internal/impl/GeodeConsoleAppenderWithSystemOutRuleIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.net.URL;

import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
Expand Down
4 changes: 2 additions & 2 deletions ...ache/geode/logging/log4j/internal/impl/GeodeVerboseMarkerFilterAcceptIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
Expand Down
4 changes: 2 additions & 2 deletions ...apache/geode/logging/log4j/internal/impl/GeodeVerboseMarkerFilterDenyIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
Expand Down
4 changes: 2 additions & 2 deletions ...pache/geode/logging/log4j/internal/impl/LogServiceWithCustomLogConfigIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
2 changes: 1 addition & 1 deletion .../apache/geode/logging/log4j/internal/impl/LogWriterAppenderWithLimitsIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.io.File;
import java.net.URL;

import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
2 changes: 1 addition & 1 deletion ...eode/logging/log4j/internal/impl/LogWriterAppenderWithMemberNameInXmlIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import java.util.regex.Pattern;

import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
2 changes: 1 addition & 1 deletion ...rg/apache/geode/logging/log4j/internal/impl/SecurityLogWriterAppenderIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.net.URL;

import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
Expand Down
1 change: 1 addition & 0 deletions ...java/org/apache/geode/logging/internal/log4j/api/message/GemFireParameterizedMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ public String getFormattedMessage() {
* @return the message pattern.
*/
@Override
@SuppressWarnings("deprecation")
public String getFormat() {
return messagePattern;
}
Expand Down