This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.9
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.9 by this push:
new 64f5e4ef3 ZOOKEEPER-4820: Fix propagation of Logback dependencies
64f5e4ef3 is described below
commit 64f5e4ef3c452a1dba596c2ddb1cd54e8e7345c0
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Thu Sep 19 05:06:52 2024 +0200
ZOOKEEPER-4820: Fix propagation of Logback dependencies
Reviewers: ctubbsii, shoothzj, ctubbsii, kezhuw
Author: ppkarwasz
Closes #2155 from ppkarwasz/fix/4820_change_logback_scope
(cherry picked from commit ff2406d23990b9612f6c36a72863e5e339aca988)
Signed-off-by: Andor Molnar <[email protected]>
---
zookeeper-assembly/pom.xml | 4 ++++
zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml | 12 ++++--------
zookeeper-server/pom.xml | 6 ++----
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml
index f30d1b100..4385d9b83 100755
--- a/zookeeper-assembly/pom.xml
+++ b/zookeeper-assembly/pom.xml
@@ -103,6 +103,10 @@
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
index e9576f1b8..62f82bdd6 100755
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
@@ -91,13 +91,9 @@
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>logback-classic</artifactId>
+ <scope>runtime</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
@@ -121,4 +117,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 3c0214a65..550a69c86 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -79,13 +79,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <scope>runtime</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
