Commit 721597b
authored
GEODE-10544: Upgrade Apache Log4j from version 2.17.2 to 2.25.3 to remediate security vulnerability CVE-2025-68161. (#7978)
* GEODE-10544: Upgrade Log4j from 2.17.2 to 2.25.3
- Updated Log4j version to 2.25.3 in dependency constraints
- Added GraalVM annotation processor configuration for geode-log4j
- Migrated test dependencies from log4j-core::tests to log4j-core-test artifact
- Updated 20 integration test files to use new package structure:
* org.apache.logging.log4j.junit -> org.apache.logging.log4j.core.test.junit
* org.apache.logging.log4j.test.appender -> org.apache.logging.log4j.core.test.appender
- Suppressed deprecation warning for Message.getFormat() method
- Added exclusions for Maven transitive dependencies to resolve Guava conflicts
- All quality checks pass: build, spotlessCheck, rat, checkPom, japicmp
* Fix integration test failures for Log4j 2.25.3
- Exclude JUnit 5.13.2 from log4j-core-test (conflicts with project's 5.8.2)
- Exclude assertj-core 3.27.3 from log4j-core-test (conflicts with Geode's 3.22.0)
- Add detailed comments explaining the exclusions
This fixes the 26 integration test failures that occurred after upgrading
Log4j from 2.17.2 to 2.25.3. The failures were caused by version conflicts
in transitive dependencies brought in by log4j-core-test.
Tested: ./gradlew :geode-log4j:integrationTest passes successfully
* Update build.gradle comments to explain all 5 dependency exclusions
- Document maven-core exclusion (Guava conflict)
- Document log4j-api-test exclusion (brings JUnit 5.13.2)
- Document junit.jupiter/platform exclusions (version mismatch with 5.8.2)
- Clarify all exclusions are required for support/1.15 branch1 parent efd7796 commit 721597b
23 files changed
Lines changed: 54 additions & 29 deletions
File tree
- build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins
- geode-log4j
- src/integrationTest/java/org/apache/geode
- alerting/log4j/internal/impl
- logging/log4j/internal/impl
- geode-logging/src/main/java/org/apache/geode/logging/internal/log4j/api/message
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| |||
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
| 218 | + | |
218 | 219 | | |
219 | 220 | | |
220 | 221 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
24 | 32 | | |
25 | 33 | | |
26 | 34 | | |
| |||
63 | 71 | | |
64 | 72 | | |
65 | 73 | | |
66 | | - | |
67 | | - | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
68 | 91 | | |
69 | 92 | | |
70 | 93 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
34 | | - | |
| 33 | + | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| |||
0 commit comments