This is an automated email from the ASF dual-hosted git repository. jinwoo pushed a commit to branch support/2.0 in repository https://gitbox.apache.org/repos/asf/geode.git
commit ed45800813338a5eb6b83d5cd827d47a70f96b02 Author: Jinwoo Hwang <[email protected]> AuthorDate: Tue Mar 10 08:30:08 2026 -0400 GEODE-10555: Remediate CVE-2024-12798 CVE-2024-12801 CVE-2025-11226 CVE-2026-1225 (#7982) * 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 * Update geode-server-all expected dependency classpath Remove logback-classic and logback-core from expected dependencies * Update assembly integration test expected files - Remove logback-classic and logback-core from assembly_content.txt - Remove logback from expected_jars.txt (bundled jars) - Remove logback from gfsh_dependency_classpath.txt --- build.gradle | 3 + .../src/test/resources/expected-pom.xml | 8 + .../src/test/resources/expected-pom.xml | 28 ++ .../integrationTest/resources/assembly_content.txt | 2 - .../integrationTest/resources/expected_jars.txt | 2 - .../resources/gfsh_dependency_classpath.txt | 10 +- geode-common/src/test/resources/expected-pom.xml | 12 + .../src/test/resources/expected-pom.xml | 8 + .../src/test/resources/expected-pom.xml | 52 +++ geode-core/src/test/resources/expected-pom.xml | 148 ++++++++ geode-cq/src/test/resources/expected-pom.xml | 20 ++ .../src/test/resources/expected-pom.xml | 2 +- geode-dunit/src/test/resources/expected-pom.xml | 88 +++++ geode-gfsh/src/test/resources/expected-pom.xml | 381 +++++---------------- .../src/test/resources/expected-pom.xml | 28 ++ geode-jmh/src/test/resources/expected-pom.xml | 4 + geode-junit/src/test/resources/expected-pom.xml | 88 +++++ geode-log4j/src/test/resources/expected-pom.xml | 32 ++ geode-logging/src/test/resources/expected-pom.xml | 8 + geode-lucene/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 ++ .../resources/dependency_classpath.txt | 14 +- .../src/test/resources/expected-pom.xml | 76 ++++ .../src/test/resources/expected-pom.xml | 20 ++ geode-unsafe/src/test/resources/expected-pom.xml | 2 +- geode-wan/src/test/resources/expected-pom.xml | 28 ++ 31 files changed, 939 insertions(+), 317 deletions(-) diff --git a/build.gradle b/build.gradle index 59c2e0a2ed..f18bc03e23 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 1b3957f9ed..b1feb8cbe6 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 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/extensions/geode-modules/src/test/resources/expected-pom.xml b/extensions/geode-modules/src/test/resources/expected-pom.xml index c97e5872d6..8228c54856 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 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index 4d69191014..f368dbfbf4 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -1017,8 +1017,6 @@ lib/log4j-core-2.25.3.jar lib/log4j-jcl-2.25.3.jar lib/log4j-jul-2.25.3.jar lib/log4j-slf4j-impl-2.25.3.jar -lib/logback-classic-1.5.11.jar -lib/logback-core-1.5.11.jar lib/lucene-analysis-common-9.12.3.jar lib/lucene-analysis-phonetic-9.12.3.jar lib/lucene-core-9.12.3.jar diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt b/geode-assembly/src/integrationTest/resources/expected_jars.txt index f2023163ef..8402711e4e 100644 --- a/geode-assembly/src/integrationTest/resources/expected_jars.txt +++ b/geode-assembly/src/integrationTest/resources/expected_jars.txt @@ -84,8 +84,6 @@ log4j-core log4j-jcl log4j-jul log4j-slf4j-impl -logback-classic -logback-core lucene-analysis-common lucene-analysis-phonetic lucene-core diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt index 290385f1c6..3597de43cb 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -21,11 +21,11 @@ spring-shell-starter-3.3.3.jar spring-web-6.1.14.jar commons-lang3-3.18.0.jar rmiio-2.1.2.jar +jackson-datatype-jsr310-2.17.0.jar jackson-datatype-joda-2.17.0.jar jackson-annotations-2.17.0.jar -jackson-dataformat-yaml-2.17.0.jar jackson-core-2.17.0.jar -jackson-datatype-jsr310-2.17.0.jar +jackson-dataformat-yaml-2.17.0.jar jackson-databind-2.17.0.jar swagger-annotations-2.2.22.jar jaxb-runtime-4.0.2.jar @@ -76,6 +76,7 @@ commons-io-2.19.0.jar commons-logging-1.3.5.jar classgraph-4.8.147.jar micrometer-core-1.14.0.jar +HdrHistogram-2.2.2.jar fastutil-8.5.8.jar jakarta.resource-api-2.1.0.jar jetty-ee10-annotations-12.0.27.jar @@ -108,7 +109,6 @@ jetty-xml-12.0.27.jar jetty-http-12.0.27.jar jetty-io-12.0.27.jar spring-boot-starter-logging-3.3.5.jar -logback-classic-1.5.11.jar jul-to-slf4j-2.0.16.jar jetty-jndi-12.0.27.jar jetty-util-12.0.27.jar @@ -117,8 +117,8 @@ byte-buddy-1.14.9.jar micrometer-observation-1.14.0.jar spring-jcl-6.1.14.jar micrometer-commons-1.14.0.jar -HdrHistogram-2.2.2.jar LatencyUtils-2.0.3.jar +snakeyaml-2.2.jar reactor-core-3.6.10.jar jline-console-3.26.3.jar jline-builtins-3.26.3.jar @@ -127,7 +127,6 @@ jline-style-3.26.3.jar jline-terminal-3.26.3.jar ST4-4.3.3.jar txw2-4.0.2.jar -snakeyaml-2.2.jar asm-commons-9.8.jar asm-tree-9.8.jar asm-9.8.jar @@ -140,6 +139,5 @@ jakarta.enterprise.lang-model-4.0.1.jar jakarta.validation-api-3.0.2.jar jboss-logging-3.4.3.Final.jar classmate-1.5.1.jar -logback-core-1.5.11.jar jakarta.el-api-5.0.0.jar jakarta.inject-api-2.0.1.jar diff --git a/geode-common/src/test/resources/expected-pom.xml b/geode-common/src/test/resources/expected-pom.xml index 374eda1da2..17d47feafb 100644 --- a/geode-common/src/test/resources/expected-pom.xml +++ b/geode-common/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-concurrency-test/src/test/resources/expected-pom.xml b/geode-concurrency-test/src/test/resources/expected-pom.xml index 2940e8b56c..ea8edc9729 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 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-connectors/src/test/resources/expected-pom.xml b/geode-connectors/src/test/resources/expected-pom.xml index 6a30589edb..e45d029569 100644 --- a/geode-connectors/src/test/resources/expected-pom.xml +++ b/geode-connectors/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -132,6 +160,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -143,6 +175,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -154,6 +190,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -165,6 +205,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -177,6 +221,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>cglib</artifactId> <groupId>*</groupId> @@ -212,6 +260,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml index dac4131b0a..f8a4cf1f00 100644 --- a/geode-core/src/test/resources/expected-pom.xml +++ b/geode-core/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -132,6 +160,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -143,6 +175,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -154,6 +190,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -165,6 +205,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -176,6 +220,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -187,6 +235,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -198,6 +250,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -209,6 +265,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -220,6 +280,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -231,6 +295,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -242,6 +310,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -253,6 +325,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -264,6 +340,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -275,6 +355,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -286,6 +370,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -298,6 +386,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -310,6 +402,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -321,6 +417,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -332,6 +432,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -343,6 +447,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -354,6 +462,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -365,6 +477,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -376,6 +492,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -387,6 +507,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -398,6 +522,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -409,6 +537,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -420,6 +552,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>*</artifactId> <groupId>*</groupId> @@ -435,6 +571,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -446,6 +586,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -458,6 +602,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-cq/src/test/resources/expected-pom.xml b/geode-cq/src/test/resources/expected-pom.xml index 3238e6c3c4..8c9fa27121 100644 --- a/geode-cq/src/test/resources/expected-pom.xml +++ b/geode-cq/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> 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 70dd4cd882..19f3cb4378 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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with diff --git a/geode-dunit/src/test/resources/expected-pom.xml b/geode-dunit/src/test/resources/expected-pom.xml index d33bf896f4..e79012b8a4 100644 --- a/geode-dunit/src/test/resources/expected-pom.xml +++ b/geode-dunit/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>geode-core</artifactId> <groupId>*</groupId> @@ -70,6 +74,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -81,6 +89,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -92,6 +104,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -103,6 +119,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -114,6 +134,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -125,6 +149,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -136,6 +164,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -147,6 +179,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>geode-core</artifactId> <groupId>*</groupId> @@ -162,6 +198,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -173,6 +213,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -184,6 +228,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -195,6 +243,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -206,6 +258,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -217,6 +273,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>cglib</artifactId> <groupId>*</groupId> @@ -257,6 +317,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -268,6 +332,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>junit-dep</artifactId> <groupId>*</groupId> @@ -283,6 +351,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -294,6 +366,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -305,6 +381,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -316,6 +396,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -327,6 +411,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>hamcrest</artifactId> <groupId>*</groupId> diff --git a/geode-gfsh/src/test/resources/expected-pom.xml b/geode-gfsh/src/test/resources/expected-pom.xml index c0a34b4cba..45903f4904 100644 --- a/geode-gfsh/src/test/resources/expected-pom.xml +++ b/geode-gfsh/src/test/resources/expected-pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd";> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,595 +16,383 @@ See the License for the specific language governing permissions and limitations under the License. --> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.geode</groupId> - <artifactId>geode-gfsh</artifactId> - <version>${version}</version> - <name>Apache Geode</name> - <description>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</description> - <url>http://geode.apache.org</url> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> - <scm> - <connection>scm:git:https://github.com:apache/geode.git</connection> - <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection> - <url>https://github.com/apache/geode</url> - </scm> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.geode</groupId> - <artifactId>geode-all-bom</artifactId> - <version>${version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.geode</groupId> - <artifactId>geode-core</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.apache.geode</groupId> - <artifactId>geode-common</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.shell</groupId> - <artifactId>spring-shell-starter</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>cglib</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>asm</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>spring-aop</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>guava</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>aopalliance</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>spring-context-support</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.geode</groupId> - <artifactId>geode-logging</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.apache.geode</groupId> - <artifactId>geode-membership</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.apache.geode</groupId> - <artifactId>geode-serialization</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.apache.geode</groupId> - <artifactId>geode-unsafe</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>spring-core</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>com.healthmarketscience.rmiio</groupId> - <artifactId>rmiio</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-annotations</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>net.sf.jopt-simple</groupId> - <artifactId>jopt-simple</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.apache.geode</groupId> - <artifactId>geode-log4j</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jul</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> - </dependency> - </dependencies> - </project> diff --git a/geode-http-service/src/test/resources/expected-pom.xml b/geode-http-service/src/test/resources/expected-pom.xml index b768efe732..56b53d0ebb 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 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-jmh/src/test/resources/expected-pom.xml b/geode-jmh/src/test/resources/expected-pom.xml index be1bcecb49..b75ba9403a 100644 --- a/geode-jmh/src/test/resources/expected-pom.xml +++ b/geode-jmh/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-junit/src/test/resources/expected-pom.xml b/geode-junit/src/test/resources/expected-pom.xml index 2c6a64729c..87dbcf8aa1 100644 --- a/geode-junit/src/test/resources/expected-pom.xml +++ b/geode-junit/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>hamcrest</artifactId> <groupId>*</groupId> @@ -70,6 +74,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -81,6 +89,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -92,6 +104,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -103,6 +119,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -114,6 +134,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -125,6 +149,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -136,6 +164,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -147,6 +179,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -158,6 +194,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>junit-dep</artifactId> <groupId>*</groupId> @@ -173,6 +213,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -184,6 +228,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -195,6 +243,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -206,6 +258,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -217,6 +273,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -228,6 +288,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -239,6 +303,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -250,6 +318,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -261,6 +333,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -272,6 +348,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -283,6 +363,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -294,6 +378,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-log4j/src/test/resources/expected-pom.xml b/geode-log4j/src/test/resources/expected-pom.xml index 1dd30357b2..5400ae355c 100644 --- a/geode-log4j/src/test/resources/expected-pom.xml +++ b/geode-log4j/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>slf4j-api</artifactId> <groupId>*</groupId> @@ -126,6 +150,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -138,6 +166,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> diff --git a/geode-logging/src/test/resources/expected-pom.xml b/geode-logging/src/test/resources/expected-pom.xml index b2528f6ba4..baaff2b89a 100644 --- a/geode-logging/src/test/resources/expected-pom.xml +++ b/geode-logging/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-lucene/src/test/resources/expected-pom.xml b/geode-lucene/src/test/resources/expected-pom.xml index 4899bb2f4f..9f12b2acc3 100644 --- a/geode-lucene/src/test/resources/expected-pom.xml +++ b/geode-lucene/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -132,6 +160,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>lucene-sandbox</artifactId> <groupId>*</groupId> @@ -147,6 +179,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -158,6 +194,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -169,6 +209,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -180,6 +224,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -191,6 +239,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-management/src/test/resources/expected-pom.xml b/geode-management/src/test/resources/expected-pom.xml index 738c525221..9ed3245287 100644 --- a/geode-management/src/test/resources/expected-pom.xml +++ b/geode-management/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -132,6 +160,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -143,6 +175,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-membership/src/test/resources/expected-pom.xml b/geode-membership/src/test/resources/expected-pom.xml index 3fd2e3cf4e..95a47c531e 100644 --- a/geode-membership/src/test/resources/expected-pom.xml +++ b/geode-membership/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -132,6 +160,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -143,6 +175,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-memcached/src/test/resources/expected-pom.xml b/geode-memcached/src/test/resources/expected-pom.xml index b9ea313d1e..99b7c52914 100644 --- a/geode-memcached/src/test/resources/expected-pom.xml +++ b/geode-memcached/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> 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 4b50e9620a..8746c9027f 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 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-rebalancer/src/test/resources/expected-pom.xml b/geode-rebalancer/src/test/resources/expected-pom.xml index 2d94a93653..97e1bbedf3 100644 --- a/geode-rebalancer/src/test/resources/expected-pom.xml +++ b/geode-rebalancer/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> <exclusion> <artifactId>spring-beans</artifactId> <groupId>*</groupId> diff --git a/geode-serialization/src/test/resources/expected-pom.xml b/geode-serialization/src/test/resources/expected-pom.xml index 719336ecdb..5e7e272142 100644 --- a/geode-serialization/src/test/resources/expected-pom.xml +++ b/geode-serialization/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index 546fb91827..b0e712fd87 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -49,7 +49,12 @@ commons-io-2.19.0.jar micrometer-core-1.14.0.jar jakarta.resource-api-2.1.0.jar jetty-ee10-annotations-12.0.27.jar +spring-boot-starter-validation-3.3.5.jar +spring-boot-starter-3.3.5.jar jetty-ee10-plus-12.0.27.jar +jakarta.enterprise.cdi-api-4.0.1.jar +jakarta.interceptor-api-2.1.0.jar +jakarta.annotation-api-2.1.1.jar jakarta.transaction-api-2.0.1.jar shiro-core-1.13.0.jar jgroups-3.6.20.Final.jar @@ -65,8 +70,6 @@ jakarta.activation-api-2.1.3.jar istack-commons-runtime-4.1.1.jar spring-web-6.1.14.jar spring-shell-table-3.3.3.jar -spring-boot-starter-validation-3.3.5.jar -spring-boot-starter-3.3.5.jar spring-messaging-6.1.14.jar spring-boot-autoconfigure-3.3.5.jar spring-boot-3.3.5.jar @@ -86,9 +89,6 @@ commons-collections-3.2.2.jar commons-digester-2.1.jar commons-logging-1.3.5.jar HdrHistogram-2.2.2.jar -jakarta.enterprise.cdi-api-4.0.1.jar -jakarta.interceptor-api-2.1.0.jar -jakarta.annotation-api-2.1.1.jar jetty-ee10-webapp-12.0.27.jar jetty-ee10-servlet-12.0.27.jar jakarta.servlet-api-6.0.0.jar @@ -111,13 +111,13 @@ jetty-io-12.0.27.jar jetty-jndi-12.0.27.jar jetty-util-12.0.27.jar spring-boot-starter-logging-3.3.5.jar -logback-classic-1.5.11.jar jul-to-slf4j-2.0.16.jar slf4j-api-2.0.17.jar micrometer-observation-1.14.0.jar micrometer-commons-1.14.0.jar LatencyUtils-2.0.3.jar byte-buddy-1.14.9.jar +snakeyaml-2.2.jar spring-jcl-6.1.14.jar asm-commons-9.8.jar asm-tree-9.8.jar @@ -130,7 +130,6 @@ jline-reader-3.26.3.jar jline-style-3.26.3.jar jline-terminal-3.26.3.jar ST4-4.3.3.jar -snakeyaml-2.2.jar jakarta.enterprise.lang-model-4.0.1.jar reactive-streams-1.0.4.jar jline-native-3.26.3.jar @@ -142,4 +141,3 @@ jakarta.inject-api-2.0.1.jar jakarta.validation-api-3.0.2.jar jboss-logging-3.4.3.Final.jar classmate-1.5.1.jar -logback-core-1.5.11.jar diff --git a/geode-server-all/src/test/resources/expected-pom.xml b/geode-server-all/src/test/resources/expected-pom.xml index 7c572939f7..433544b9f5 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 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -132,6 +160,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -143,6 +175,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -154,6 +190,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -165,6 +205,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -176,6 +220,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -187,6 +235,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -198,6 +250,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -209,6 +265,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -220,6 +280,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -231,6 +295,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -242,6 +310,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -253,6 +325,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-tcp-server/src/test/resources/expected-pom.xml b/geode-tcp-server/src/test/resources/expected-pom.xml index e8b3e583a3..988bd23ac2 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 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/geode-unsafe/src/test/resources/expected-pom.xml b/geode-unsafe/src/test/resources/expected-pom.xml index a5533e9a7c..ef0bed734d 100644 --- a/geode-unsafe/src/test/resources/expected-pom.xml +++ b/geode-unsafe/src/test/resources/expected-pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with diff --git a/geode-wan/src/test/resources/expected-pom.xml b/geode-wan/src/test/resources/expected-pom.xml index cfc6b77738..ee3b978b74 100644 --- a/geode-wan/src/test/resources/expected-pom.xml +++ b/geode-wan/src/test/resources/expected-pom.xml @@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
