This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 27f5a59cc RATIS-1776. Switch to slf4j-reload4j (#816)
27f5a59cc is described below
commit 27f5a59cc697ce51f1c5ab6d7b6c63eb58390b79
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Jan 23 12:53:17 2023 +0100
RATIS-1776. Switch to slf4j-reload4j (#816)
---
pom.xml | 9 +++++----
ratis-common/pom.xml | 2 +-
ratis-examples/pom.xml | 2 +-
ratis-experiments/pom.xml | 4 ++--
ratis-resource-bundle/src/main/resources/supplemental-models.xml | 6 +++---
ratis-server/pom.xml | 2 +-
ratis-test/pom.xml | 2 +-
7 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index da727d4e6..a63135097 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,6 +221,7 @@
<dropwizard.version>3.2.5</dropwizard.version>
<bouncycastle.version>1.70</bouncycastle.version>
+ <slf4j.version>1.7.36</slf4j.version>
</properties>
<dependencyManagement>
@@ -391,18 +392,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-common/pom.xml b/ratis-common/pom.xml
index a489a9f94..3f2f7ddba 100644
--- a/ratis-common/pom.xml
+++ b/ratis-common/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
diff --git a/ratis-examples/pom.xml b/ratis-examples/pom.xml
index e3cda9a1e..33f4b4ae8 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 22a30b6ba..c768243c7 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-server/pom.xml b/ratis-server/pom.xml
index ec649d8f8..3fcaa39ef 100644
--- a/ratis-server/pom.xml
+++ b/ratis-server/pom.xml
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
diff --git a/ratis-test/pom.xml b/ratis-test/pom.xml
index b6542ff1b..6f438917c 100644
--- a/ratis-test/pom.xml
+++ b/ratis-test/pom.xml
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
