From commits-return-7559-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org  Thu Jan 31 10:48:03 2019
Return-Path: <commits-return-7559-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id 1A0A1180648
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 31 Jan 2019 11:48:02 +0100 (CET)
Received: (qmail 50785 invoked by uid 500); 31 Jan 2019 10:48:02 -0000
Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@zookeeper.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@zookeeper.apache.org>
List-Post: <mailto:commits@zookeeper.apache.org>
List-Id: <commits.zookeeper.apache.org>
Reply-To: dev@zookeeper.apache.org
Delivered-To: mailing list commits@zookeeper.apache.org
Received: (qmail 50774 invoked by uid 99); 31 Jan 2019 10:48:02 -0000
Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jan 2019 10:48:02 +0000
Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33)
	id ACB2985744; Thu, 31 Jan 2019 10:48:01 +0000 (UTC)
Date: Thu, 31 Jan 2019 10:48:01 +0000
To: "commits@zookeeper.apache.org" <commits@zookeeper.apache.org>
Subject: [zookeeper] branch master updated: ZOOKEEPER-3251: Add new server
 metric types - fix Maven build
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Message-ID: <154893168155.17847.7319495687636192313@gitbox.apache.org>
From: andor@apache.org
X-Git-Host: gitbox.apache.org
X-Git-Repo: zookeeper
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 29f95b18d9539c3f8932fee31798ca7332cb2ec6
X-Git-Newrev: 4a85ce2dc31cba45f8cb961721c9eb66e1237ef4
X-Git-Rev: 4a85ce2dc31cba45f8cb961721c9eb66e1237ef4
X-Git-NotificationType: ref_changed_plus_diff
X-Git-Multimail-Version: 1.5.dev
Auto-Submitted: auto-generated

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 <eolivelli@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 <eolivelli@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>