This is an automated email from the ASF dual-hosted git repository.

andor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new ff2406d23 ZOOKEEPER-4820: Fix propagation of Logback dependencies
ff2406d23 is described below

commit ff2406d23990b9612f6c36a72863e5e339aca988
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
---
 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 37fb0eae0..160f9e1b9 100644
--- 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 778d03869..d8f75e551 100644
--- 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 615527d60..495e48479 100644
--- 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>

Reply via email to