You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by va...@apache.org on 2023/02/09 10:23:30 UTC
[qpid-broker-j] branch main updated: QPID-8613 - [Broker-J] Update slf4j / logback dependencies (#170)
This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new fed13fe01c QPID-8613 - [Broker-J] Update slf4j / logback dependencies (#170)
fed13fe01c is described below
commit fed13fe01c81db64a178f8fa5365d66b0503f367
Author: Daniil Kirilyuk <da...@gmail.com>
AuthorDate: Thu Feb 9 11:23:25 2023 +0100
QPID-8613 - [Broker-J] Update slf4j / logback dependencies (#170)
* QPID-8613 - [Broker-J] Update slf4j / logback dependencies
* QPID-8613 - [Broker-J] Fixed merge conflict
---------
Co-authored-by: vavrtom <va...@gmail.com>
---
.../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE | 6 +++---
.../org/apache/qpid/server/logging/logback/NoopConfigurator.java | 3 ++-
.../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE | 6 +++---
pom.xml | 4 ++--
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index 79f6b60e5a..081692ac2f 100644
--- a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -71,15 +71,15 @@ From: 'OW2' (http://www.ow2.org/)
License: BSD-3-Clause (https://asm.ow2.io/license.html)
From: 'QOS.ch' (http://www.qos.ch)
- - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.2.11
+ - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.4.5
License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.2.11
+ - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.4.5
License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- Logback DBAppender Classic Module (http://logback.qos.ch/logback-classic-db) ch.qos.logback.db:logback-classic-db:jar:1.2.11.1
License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- Logback DBAppender Core Module (http://logback.qos.ch/logback-core-db) ch.qos.logback.db:logback-core-db:jar:1.2.11.1
License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.36
+ - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:2.0.6
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
From: 'The Apache Software Foundation' (https://www.apache.org/)
diff --git a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/NoopConfigurator.java b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/NoopConfigurator.java
index 7a21c87b79..9929f7f10c 100644
--- a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/NoopConfigurator.java
+++ b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/NoopConfigurator.java
@@ -27,8 +27,9 @@ import ch.qos.logback.core.spi.ContextAwareBase;
public class NoopConfigurator extends ContextAwareBase implements Configurator
{
@Override
- public void configure(LoggerContext loggerContext)
+ public ExecutionStatus configure(LoggerContext loggerContext)
{
// no-op
+ return ExecutionStatus.NEUTRAL;
}
}
diff --git a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index cc78c979cc..e05522edfb 100644
--- a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -45,11 +45,11 @@ From: 'FasterXML' (http://fasterxml.com/)
License: The Apache Software License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'QOS.ch' (http://www.qos.ch)
- - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.2.11
+ - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.4.5
License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.2.11
+ - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.4.5
License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.36
+ - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:2.0.6
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
From: 'The Apache Software Foundation' (http://www.apache.org/)
diff --git a/pom.xml b/pom.xml
index a44df66db0..f31be56e54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,12 +104,12 @@
<bdb-version>7.4.5</bdb-version>
<derby-version>10.14.2.0</derby-version>
- <logback-version>1.2.11</logback-version>
+ <logback-version>1.4.5</logback-version>
<logback-db-version>1.2.11.1</logback-db-version>
<guava-version>31.1-jre</guava-version>
<fasterxml-jackson-version>2.14.1</fasterxml-jackson-version>
<fasterxml-jackson-databind-version>2.14.1</fasterxml-jackson-databind-version>
- <slf4j-version>1.7.36</slf4j-version>
+ <slf4j-version>2.0.6</slf4j-version>
<jetty-version>9.4.49.v20220914</jetty-version>
<!-- dependency version numbers -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org