You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by ad...@apache.org on 2023/01/22 10:23:32 UTC
[ratis] branch master updated: RATIS-1776. Switch to slf4j-reload4j (#814)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 05815777c RATIS-1776. Switch to slf4j-reload4j (#814)
05815777c is described below
commit 05815777c6a61453699a0b269530c66d52e5ebcb
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Sun Jan 22 11:23:27 2023 +0100
RATIS-1776. Switch to slf4j-reload4j (#814)
---
pom.xml | 9 +++++----
ratis-examples/pom.xml | 2 +-
ratis-experiments/pom.xml | 4 ++--
ratis-resource-bundle/src/main/resources/supplemental-models.xml | 6 +++---
ratis-test/pom.xml | 2 +-
5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 21641b4db..f00f047b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,6 +220,7 @@
<testsThreadCount>4</testsThreadCount>
<bouncycastle.version>1.70</bouncycastle.version>
+ <slf4j.version>1.7.36</slf4j.version>
</properties>
<dependencyManagement>
@@ -400,18 +401,18 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.29</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.29</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
- <version>1.7.29</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
diff --git a/ratis-examples/pom.xml b/ratis-examples/pom.xml
index 9fa6c841b..2f4eb2c72 100644
--- a/ratis-examples/pom.xml
+++ b/ratis-examples/pom.xml
@@ -108,7 +108,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>runtime</scope>
</dependency>
diff --git a/ratis-experiments/pom.xml b/ratis-experiments/pom.xml
index d621fe5ee..aff34d9e7 100644
--- a/ratis-experiments/pom.xml
+++ b/ratis-experiments/pom.xml
@@ -39,8 +39,8 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>compile</scope>
+ <artifactId>slf4j-reload4j</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
diff --git a/ratis-resource-bundle/src/main/resources/supplemental-models.xml b/ratis-resource-bundle/src/main/resources/supplemental-models.xml
index 369217d47..587ca5070 100644
--- a/ratis-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/ratis-resource-bundle/src/main/resources/supplemental-models.xml
@@ -284,8 +284,8 @@ under the License.
<supplement>
<project>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <name>SLF4J LOG4J-12 Binding</name>
+ <artifactId>slf4j-reload4j</artifactId>
+ <name>SLF4J Reload4j Binding</name>
<licenses>
<license>
@@ -293,7 +293,7 @@ under the License.
<url>http://www.opensource.org/licenses/mit-license.php</url>
<distribution>repo</distribution>
<comments>
- Copyright (c) 2004-2008 QOS.ch
+ Copyright (c) 2004-2017 QOS.ch
</comments>
</license>
</licenses>
diff --git a/ratis-test/pom.xml b/ratis-test/pom.xml
index b1a08f775..df5c1ca65 100644
--- a/ratis-test/pom.xml
+++ b/ratis-test/pom.xml
@@ -116,7 +116,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>