You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/08/11 13:50:41 UTC
[activemq-artemis] 03/03: Revert "add commons-logging -> SLF4J bridge and exclude commons-logging, suppresses unconfigured log spam from beanutils etc"
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 4f1717afe332450416c87f3b09153acc82d9bcd6
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Aug 11 12:39:45 2022 +0100
Revert "add commons-logging -> SLF4J bridge and exclude commons-logging, suppresses unconfigured log spam from beanutils etc"
This reverts commit f276e44561cced5164a040e2177405129eea1092.
---
artemis-commons/pom.xml | 5 -----
artemis-jdbc-store/pom.xml | 5 -----
artemis-rest/pom.xml | 5 -----
artemis-server/pom.xml | 5 -----
pom.xml | 42 ++++++++++--------------------------------
5 files changed, 10 insertions(+), 52 deletions(-)
diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml
index f03d52f8aa..be58082428 100644
--- a/artemis-commons/pom.xml
+++ b/artemis-commons/pom.xml
@@ -87,11 +87,6 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
- <dependency>
- <!-- Needed to replace commons-logging for commons-beanutils -->
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/artemis-jdbc-store/pom.xml b/artemis-jdbc-store/pom.xml
index 0852e6e581..46f5ce0e03 100644
--- a/artemis-jdbc-store/pom.xml
+++ b/artemis-jdbc-store/pom.xml
@@ -64,11 +64,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
</dependency>
- <dependency>
- <!-- Needed to replace commons-logging for commons-dbcp2 -->
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
<!-- Database driver support -->
<dependency>
diff --git a/artemis-rest/pom.xml b/artemis-rest/pom.xml
index 9841bf72d2..26ab9ef4a2 100644
--- a/artemis-rest/pom.xml
+++ b/artemis-rest/pom.xml
@@ -149,11 +149,6 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
- <dependency>
- <!-- Needed to replace commons-logging for httpclient -->
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index 546c1a06ea..50c0f1c62d 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -158,11 +158,6 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
- <dependency>
- <!-- Needed to replace commons-logging for commons-beanutils -->
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
diff --git a/pom.xml b/pom.xml
index e9e74e0f4b..8db045b9b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -495,16 +495,10 @@
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>${commons.config.version}</version>
- <!-- License: Apache 2.0 -->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>${commons.config.version}</version>
+ <!-- License: Apache 2.0 -->
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -792,18 +786,14 @@
<artifactId>commons-beanutils</artifactId>
<version>${commons.beanutils.version}</version>
<!-- License: Apache 2.0 -->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
- <!-- needed to replace commons-logging for commons-beanutils etc -->
+
+ <!-- needed by commons-beanutils-->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.2</version>
+ <!-- License: Apache 2.0 -->
</dependency>
<!-- needed by artemis-selector -->
@@ -824,12 +814,6 @@
<artifactId>commons-dbcp2</artifactId>
<version>${commons.dbcp2.version}</version>
<!-- license Apache 2 -->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- used by commons-dbcp2 -->
<dependency>
@@ -1078,12 +1062,6 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${apache.httpclient.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>