From 3efa1eecaa37affca05bc978ade1910bb0bdd182 Mon Sep 17 00:00:00 2001 From: Jinwoo Hwang Date: Tue, 3 Feb 2026 14:37:10 -0500 Subject: [PATCH 1/3] GEODE-10555: Remediate CVEs - Add global exclusion of ch.qos.logback to prevent transitive inclusion - Remediate CVE-2024-12798, CVE-2024-12801, CVE-2025-11226, CVE-2026-1225 - Update expected POM files to reflect dependency changes - All logging routed through Log4j 2 via log4j-slf4j-impl --- build.gradle | 3 + .../src/test/resources/expected-pom.xml | 8 + .../src/test/resources/expected-pom.xml | 28 ++ .../src/test/resources/expected-pom.xml | 12 + .../src/test/resources/expected-pom.xml | 8 + .../src/test/resources/expected-pom.xml | 52 +++ .../src/test/resources/expected-pom.xml | 148 +++++++ geode-cq/src/test/resources/expected-pom.xml | 20 + .../src/test/resources/expected-pom.xml | 2 +- .../src/test/resources/expected-pom.xml | 88 ++++ .../src/test/resources/expected-pom.xml | 381 ++++-------------- .../src/test/resources/expected-pom.xml | 28 ++ geode-jmh/src/test/resources/expected-pom.xml | 4 + .../src/test/resources/expected-pom.xml | 88 ++++ .../src/test/resources/expected-pom.xml | 32 ++ .../src/test/resources/expected-pom.xml | 8 + .../src/test/resources/expected-pom.xml | 52 +++ .../src/test/resources/expected-pom.xml | 36 ++ .../src/test/resources/expected-pom.xml | 36 ++ .../src/test/resources/expected-pom.xml | 16 + .../src/test/resources/expected-pom.xml | 12 + .../src/test/resources/expected-pom.xml | 20 + .../src/test/resources/expected-pom.xml | 20 + .../src/test/resources/expected-pom.xml | 76 ++++ .../src/test/resources/expected-pom.xml | 20 + .../src/test/resources/expected-pom.xml | 2 +- geode-wan/src/test/resources/expected-pom.xml | 28 ++ 27 files changed, 929 insertions(+), 299 deletions(-) diff --git a/build.gradle b/build.gradle index 59c2e0a2ed9a..f18bc03e23a1 100755 --- a/build.gradle +++ b/build.gradle @@ -80,8 +80,11 @@ allprojects { // Exclude 'log4j-to-slf4j' globally. Geode's logging architecture requires Log4j Core to be the primary logging implementation, // with SLF4J calls being routed TO Log4j (via log4j-slf4j-impl), not the other way around. // + // Logback is unused (transitive from spring-boot-starter-logging). Geode uses Log4j 2 for all logging. + // configurations.all { exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j' + exclude group: 'ch.qos.logback' } buildRoot = buildRoot.trim() diff --git a/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml b/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml index 1b3957f9ed07..b1feb8cbe62c 100644 --- a/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml +++ b/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/extensions/geode-modules/src/test/resources/expected-pom.xml b/extensions/geode-modules/src/test/resources/expected-pom.xml index c97e5872d641..8228c5485692 100644 --- a/extensions/geode-modules/src/test/resources/expected-pom.xml +++ b/extensions/geode-modules/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -110,6 +130,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -121,6 +145,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-common/src/test/resources/expected-pom.xml b/geode-common/src/test/resources/expected-pom.xml index 374eda1da262..17d47feafb19 100644 --- a/geode-common/src/test/resources/expected-pom.xml +++ b/geode-common/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-concurrency-test/src/test/resources/expected-pom.xml b/geode-concurrency-test/src/test/resources/expected-pom.xml index 2940e8b56ce4..ea8edc97293e 100644 --- a/geode-concurrency-test/src/test/resources/expected-pom.xml +++ b/geode-concurrency-test/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-connectors/src/test/resources/expected-pom.xml b/geode-connectors/src/test/resources/expected-pom.xml index 6a30589edb13..e45d0295697c 100644 --- a/geode-connectors/src/test/resources/expected-pom.xml +++ b/geode-connectors/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -110,6 +130,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -121,6 +145,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -132,6 +160,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -143,6 +175,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -154,6 +190,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -165,6 +205,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + true @@ -177,6 +221,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + cglib * @@ -212,6 +260,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml index dac4131b0ae7..f8a4cf1f007a 100644 --- a/geode-core/src/test/resources/expected-pom.xml +++ b/geode-core/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -110,6 +130,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -121,6 +145,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -132,6 +160,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -143,6 +175,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -154,6 +190,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -165,6 +205,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -176,6 +220,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -187,6 +235,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -198,6 +250,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -209,6 +265,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -220,6 +280,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -231,6 +295,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -242,6 +310,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -253,6 +325,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -264,6 +340,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -275,6 +355,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -286,6 +370,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + true @@ -298,6 +386,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + true @@ -310,6 +402,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -321,6 +417,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -332,6 +432,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -343,6 +447,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -354,6 +462,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -365,6 +477,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -376,6 +492,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -387,6 +507,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -398,6 +522,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -409,6 +537,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -420,6 +552,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + * * @@ -435,6 +571,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -446,6 +586,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + true @@ -458,6 +602,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-cq/src/test/resources/expected-pom.xml b/geode-cq/src/test/resources/expected-pom.xml index 3238e6c3c48f..8c9fa2712188 100644 --- a/geode-cq/src/test/resources/expected-pom.xml +++ b/geode-cq/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml b/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml index 70dd4cd8828d..19f3cb437857 100644 --- a/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml +++ b/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml @@ -1,5 +1,5 @@ - + - 4.0.0 - org.apache.geode - geode-gfsh - ${version} - Apache Geode - Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing - http://geode.apache.org - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - scm:git:https://github.com:apache/geode.git - scm:git:https://github.com:apache/geode.git - https://github.com/apache/geode - - - - - org.apache.geode - geode-all-bom - ${version} - pom - import - - - - - - org.apache.geode - geode-core - compile - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - org.apache.geode - geode-common - compile - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - org.springframework.shell - spring-shell-starter - compile - - - log4j-to-slf4j - org.apache.logging.log4j - - - + * + ch.qos.logback + + cglib - * - - - asm - * - - - spring-aop - * - - - guava - * - - - aopalliance - * - - - spring-context-support - * - - - - - org.apache.geode - geode-logging - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - org.apache.geode - geode-membership - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - org.apache.geode - geode-serialization - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - org.apache.geode - geode-unsafe - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - org.springframework - spring-web - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - - + * + ch.qos.logback + + spring-core - * - - - commons-logging - * - - - - - org.apache.commons - commons-lang3 - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - com.healthmarketscience.rmiio - rmiio - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - com.fasterxml.jackson.core - jackson-databind - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - io.swagger.core.v3 - swagger-annotations - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - jakarta.xml.bind - jakarta.xml.bind-api - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - net.sf.jopt-simple - jopt-simple - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - org.apache.logging.log4j - log4j-api - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - org.apache.geode - geode-log4j - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - org.springframework - spring-core - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - true - - - org.springframework - spring-aop - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - org.glassfish.jaxb - jaxb-runtime - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - jakarta.activation - jakarta.activation-api - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - org.apache.logging.log4j - log4j-jul - runtime - - - log4j-to-slf4j - org.apache.logging.log4j - - + + * + ch.qos.logback + - - - diff --git a/geode-http-service/src/test/resources/expected-pom.xml b/geode-http-service/src/test/resources/expected-pom.xml index b768efe732db..56b53d0ebb26 100644 --- a/geode-http-service/src/test/resources/expected-pom.xml +++ b/geode-http-service/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -110,6 +130,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -121,6 +145,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-jmh/src/test/resources/expected-pom.xml b/geode-jmh/src/test/resources/expected-pom.xml index be1bcecb491b..b75ba9403a7d 100644 --- a/geode-jmh/src/test/resources/expected-pom.xml +++ b/geode-jmh/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-junit/src/test/resources/expected-pom.xml b/geode-junit/src/test/resources/expected-pom.xml index 2c6a64729c78..87dbcf8aa1c1 100644 --- a/geode-junit/src/test/resources/expected-pom.xml +++ b/geode-junit/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + hamcrest * @@ -70,6 +74,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -81,6 +89,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -92,6 +104,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -103,6 +119,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -114,6 +134,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -125,6 +149,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -136,6 +164,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -147,6 +179,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -158,6 +194,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + junit-dep * @@ -173,6 +213,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -184,6 +228,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -195,6 +243,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -206,6 +258,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -217,6 +273,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -228,6 +288,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -239,6 +303,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -250,6 +318,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -261,6 +333,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -272,6 +348,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -283,6 +363,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -294,6 +378,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-log4j/src/test/resources/expected-pom.xml b/geode-log4j/src/test/resources/expected-pom.xml index 1dd30357b2a9..5400ae355c8e 100644 --- a/geode-log4j/src/test/resources/expected-pom.xml +++ b/geode-log4j/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -110,6 +130,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + slf4j-api * @@ -126,6 +150,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + true @@ -138,6 +166,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + true diff --git a/geode-logging/src/test/resources/expected-pom.xml b/geode-logging/src/test/resources/expected-pom.xml index b2528f6ba474..baaff2b89a65 100644 --- a/geode-logging/src/test/resources/expected-pom.xml +++ b/geode-logging/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-lucene/src/test/resources/expected-pom.xml b/geode-lucene/src/test/resources/expected-pom.xml index 4899bb2f4fef..9f12b2acc391 100644 --- a/geode-lucene/src/test/resources/expected-pom.xml +++ b/geode-lucene/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -110,6 +130,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -121,6 +145,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -132,6 +160,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + lucene-sandbox * @@ -147,6 +179,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -158,6 +194,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -169,6 +209,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -180,6 +224,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -191,6 +239,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-management/src/test/resources/expected-pom.xml b/geode-management/src/test/resources/expected-pom.xml index 738c52522175..9ed324528709 100644 --- a/geode-management/src/test/resources/expected-pom.xml +++ b/geode-management/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -110,6 +130,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -121,6 +145,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -132,6 +160,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -143,6 +175,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-membership/src/test/resources/expected-pom.xml b/geode-membership/src/test/resources/expected-pom.xml index 3fd2e3cf4e3c..95a47c531ecc 100644 --- a/geode-membership/src/test/resources/expected-pom.xml +++ b/geode-membership/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -110,6 +130,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -121,6 +145,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -132,6 +160,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -143,6 +175,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-memcached/src/test/resources/expected-pom.xml b/geode-memcached/src/test/resources/expected-pom.xml index b9ea313d1ed7..99b7c529140d 100644 --- a/geode-memcached/src/test/resources/expected-pom.xml +++ b/geode-memcached/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-old-client-support/src/test/resources/expected-pom.xml b/geode-old-client-support/src/test/resources/expected-pom.xml index 4b50e9620ae0..8746c9027f71 100644 --- a/geode-old-client-support/src/test/resources/expected-pom.xml +++ b/geode-old-client-support/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-rebalancer/src/test/resources/expected-pom.xml b/geode-rebalancer/src/test/resources/expected-pom.xml index 2d94a9365349..97e1bbedf3ff 100644 --- a/geode-rebalancer/src/test/resources/expected-pom.xml +++ b/geode-rebalancer/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + spring-beans * diff --git a/geode-serialization/src/test/resources/expected-pom.xml b/geode-serialization/src/test/resources/expected-pom.xml index 719336ecdbab..5e7e2721420d 100644 --- a/geode-serialization/src/test/resources/expected-pom.xml +++ b/geode-serialization/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-server-all/src/test/resources/expected-pom.xml b/geode-server-all/src/test/resources/expected-pom.xml index 7c572939f7a7..433544b9f5b7 100644 --- a/geode-server-all/src/test/resources/expected-pom.xml +++ b/geode-server-all/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -110,6 +130,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -121,6 +145,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -132,6 +160,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -143,6 +175,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -154,6 +190,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -165,6 +205,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -176,6 +220,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -187,6 +235,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -198,6 +250,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -209,6 +265,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -220,6 +280,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -231,6 +295,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -242,6 +310,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -253,6 +325,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-tcp-server/src/test/resources/expected-pom.xml b/geode-tcp-server/src/test/resources/expected-pom.xml index e8b3e583a3b8..988bd23ac215 100644 --- a/geode-tcp-server/src/test/resources/expected-pom.xml +++ b/geode-tcp-server/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -66,6 +70,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -77,6 +85,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -88,6 +100,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + @@ -99,6 +115,10 @@ log4j-to-slf4j org.apache.logging.log4j + + * + ch.qos.logback + diff --git a/geode-unsafe/src/test/resources/expected-pom.xml b/geode-unsafe/src/test/resources/expected-pom.xml index a5533e9a7c87..ef0bed734d20 100644 --- a/geode-unsafe/src/test/resources/expected-pom.xml +++ b/geode-unsafe/src/test/resources/expected-pom.xml @@ -1,5 +1,5 @@ - +