From 1e8de860adb9ce44cb7b246923633626fa36d18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Sun, 19 Feb 2023 07:24:24 +0100 Subject: [PATCH] [AMQ-9223] Upgrade to slf4j 2.0.6 --- activemq-all/pom.xml | 6 +++--- activemq-amqp/pom.xml | 2 +- activemq-broker/pom.xml | 2 +- activemq-client/pom.xml | 2 +- activemq-console/pom.xml | 2 +- activemq-http/pom.xml | 2 +- activemq-jaas/pom.xml | 2 +- activemq-jdbc-store/pom.xml | 7 ++++++- activemq-jms-pool/pom.xml | 2 +- activemq-kahadb-store/pom.xml | 7 ++++++- activemq-karaf-itest/pom.xml | 2 +- activemq-karaf/pom.xml | 2 +- activemq-log4j-appender/pom.xml | 2 +- activemq-mqtt/pom.xml | 2 +- activemq-osgi/pom.xml | 2 +- activemq-partition/pom.xml | 2 +- activemq-pool/pom.xml | 2 +- activemq-ra/pom.xml | 7 ++++++- activemq-rar/pom.xml | 2 +- activemq-runtime-config/pom.xml | 2 +- activemq-shiro/pom.xml | 2 +- activemq-spring/pom.xml | 2 +- activemq-stomp/pom.xml | 2 +- activemq-unit-tests/pom.xml | 2 +- activemq-web-console/pom.xml | 2 +- activemq-web-demo/pom.xml | 2 +- activemq-web/pom.xml | 2 +- assembly/pom.xml | 2 +- assembly/src/main/descriptors/common-bin.xml | 2 +- pom.xml | 4 ++-- 30 files changed, 48 insertions(+), 33 deletions(-) diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml index 561eafb16a..925a7e9429 100644 --- a/activemq-all/pom.xml +++ b/activemq-all/pom.xml @@ -61,7 +61,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl @@ -105,7 +105,7 @@ org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec org.apache.geronimo.specs:geronimo-annotation_1.3_spec org.slf4j:slf4j-api - org.apache.logging.log4j:log4j-slf4j-impl + org.apache.logging.log4j:log4j-slf4j2-impl org.slf4j:jcl-over-slf4j org.springframework:spring-core org.springframework:spring-beans @@ -343,7 +343,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl ${log4j-version} sources true diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml index 87c1cb693d..fa294417f2 100644 --- a/activemq-amqp/pom.xml +++ b/activemq-amqp/pom.xml @@ -134,7 +134,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml index 2b421a2a87..3f66bf12e2 100644 --- a/activemq-broker/pom.xml +++ b/activemq-broker/pom.xml @@ -82,7 +82,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml index 96f9880e95..55b3e63cab 100644 --- a/activemq-client/pom.xml +++ b/activemq-client/pom.xml @@ -81,7 +81,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml index 202d408feb..6bdde70cec 100644 --- a/activemq-console/pom.xml +++ b/activemq-console/pom.xml @@ -105,7 +105,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml index 6c0c6abde8..be0f7ea6c1 100644 --- a/activemq-http/pom.xml +++ b/activemq-http/pom.xml @@ -116,7 +116,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml index 3dec8e8b2c..33b7bdd132 100644 --- a/activemq-jaas/pom.xml +++ b/activemq-jaas/pom.xml @@ -116,7 +116,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml index f0565523e6..4dc1efdbee 100644 --- a/activemq-jdbc-store/pom.xml +++ b/activemq-jdbc-store/pom.xml @@ -80,7 +80,12 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-core + test + + + org.apache.logging.log4j + log4j-slf4j2-impl test diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml index 4233842d2f..c6bacfe951 100644 --- a/activemq-jms-pool/pom.xml +++ b/activemq-jms-pool/pom.xml @@ -90,7 +90,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml index afe1d5eef8..8177901f9e 100644 --- a/activemq-kahadb-store/pom.xml +++ b/activemq-kahadb-store/pom.xml @@ -123,7 +123,12 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-core + test + + + org.apache.logging.log4j + log4j-slf4j2-impl test diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml index 668a117f08..26e483f0c2 100644 --- a/activemq-karaf-itest/pom.xml +++ b/activemq-karaf-itest/pom.xml @@ -143,7 +143,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml index af4c09d59e..a9eff56879 100644 --- a/activemq-karaf/pom.xml +++ b/activemq-karaf/pom.xml @@ -58,7 +58,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-log4j-appender/pom.xml b/activemq-log4j-appender/pom.xml index 2047db989c..c0d03e6d7d 100644 --- a/activemq-log4j-appender/pom.xml +++ b/activemq-log4j-appender/pom.xml @@ -51,7 +51,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml index ed98a6079a..e61f3d7220 100644 --- a/activemq-mqtt/pom.xml +++ b/activemq-mqtt/pom.xml @@ -149,7 +149,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index a3dbe7bbd9..aa2330dd79 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -508,7 +508,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl ${log4j-version} sources true diff --git a/activemq-partition/pom.xml b/activemq-partition/pom.xml index 40b239a3f5..6106892474 100644 --- a/activemq-partition/pom.xml +++ b/activemq-partition/pom.xml @@ -51,7 +51,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl org.linkedin diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml index 3fe683ba14..5dac8f5746 100644 --- a/activemq-pool/pom.xml +++ b/activemq-pool/pom.xml @@ -83,7 +83,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml index f5b81de575..d8d9694a14 100644 --- a/activemq-ra/pom.xml +++ b/activemq-ra/pom.xml @@ -76,7 +76,12 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-core + test + + + org.apache.logging.log4j + log4j-slf4j2-impl test diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml index 192ca906ac..ddfafac6c5 100644 --- a/activemq-rar/pom.xml +++ b/activemq-rar/pom.xml @@ -341,7 +341,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl runtime diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml index 193b542471..bda757305c 100644 --- a/activemq-runtime-config/pom.xml +++ b/activemq-runtime-config/pom.xml @@ -83,7 +83,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-shiro/pom.xml b/activemq-shiro/pom.xml index ba77894b0d..0bbe619d9b 100644 --- a/activemq-shiro/pom.xml +++ b/activemq-shiro/pom.xml @@ -95,7 +95,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml index dab34964a5..768e6021e5 100644 --- a/activemq-spring/pom.xml +++ b/activemq-spring/pom.xml @@ -180,7 +180,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml index a82f1b2655..a385962353 100644 --- a/activemq-stomp/pom.xml +++ b/activemq-stomp/pom.xml @@ -91,7 +91,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml index 4bae3b5ee4..fd054bdc16 100644 --- a/activemq-unit-tests/pom.xml +++ b/activemq-unit-tests/pom.xml @@ -190,7 +190,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index a7a70471e1..6a16402a5b 100644 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -264,7 +264,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl org.apache.logging.log4j diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml index b73c65efba..61c13814fa 100644 --- a/activemq-web-demo/pom.xml +++ b/activemq-web-demo/pom.xml @@ -192,7 +192,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml index 12bf96eaf4..52a39e6fa2 100644 --- a/activemq-web/pom.xml +++ b/activemq-web/pom.xml @@ -137,7 +137,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/assembly/pom.xml b/assembly/pom.xml index ca8459e951..dcc1742866 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -360,7 +360,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl org.slf4j diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml index 55ea978f74..f0d3929f9e 100644 --- a/assembly/src/main/descriptors/common-bin.xml +++ b/assembly/src/main/descriptors/common-bin.xml @@ -193,7 +193,7 @@ org.apache.commons:commons-pool2 commons-codec:commons-codec org.apache.commons:commons-lang3 - org.apache.logging.log4j:log4j-slf4j-impl + org.apache.logging.log4j:log4j-slf4j2-impl org.apache.logging.log4j:log4j-api org.apache.logging.log4j:log4j-core org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec diff --git a/pom.xml b/pom.xml index 1f088aec0b..85035a4063 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ 1.4 1.18.0 1.11.0 - 1.7.36 + 2.0.6 1.1.2 5.3.25 1.2.5 @@ -746,7 +746,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl ${log4j-version}