You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2019/01/31 10:48:01 UTC

[zookeeper] branch master updated: ZOOKEEPER-3251: Add new server metric types - fix Maven build

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 4a85ce2  ZOOKEEPER-3251: Add new server metric types - fix Maven build
4a85ce2 is described below

commit 4a85ce2dc31cba45f8cb961721c9eb66e1237ef4
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Thu Jan 31 11:47:58 2019 +0100

    ZOOKEEPER-3251: Add new server metric types - fix Maven build
    
    Add Dropwizard dependency on Maven configuration files in order to make the build work on Maven
    
    Author: Enrico Olivelli <eo...@apache.org>
    
    Reviewers: andor@apache.org
    
    Closes #793 from eolivelli/fix/fix-build-maven
---
 pom.xml                  | 12 ++++++++++++
 zookeeper-server/pom.xml |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/pom.xml b/pom.xml
index 573f5f9..b649ce1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -279,6 +279,7 @@
     <bouncycastle.version>1.60</bouncycastle.version>
     <commons-collections.version>3.2.2</commons-collections.version>
     <commons-lang.version>2.6</commons-lang.version>
+    <dropwizard.version>3.2.5</dropwizard.version>
     <spotbugsannotations.version>3.1.9</spotbugsannotations.version>
   </properties>
 
@@ -403,6 +404,17 @@
         <version>${jetty.version}</version>
       </dependency>
       <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-core</artifactId>
+        <version>${dropwizard.version}</version>
+        <exclusions>
+           <exclusion>
+              <groupId>org.slf4j</groupId>
+              <artifactId>slf4j-api</artifactId>
+           </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
         <version>${jackson.version}</version>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 90dff72..6e5c376 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -108,6 +108,10 @@
       <artifactId>jline</artifactId>
     </dependency>
     <dependency>
+       <groupId>io.dropwizard.metrics</groupId>
+       <artifactId>metrics-core</artifactId>
+    </dependency>
+    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>