Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9F131200B39 for ; Sat, 25 Jun 2016 00:19:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9D93E160A5A; Fri, 24 Jun 2016 22:19:27 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E55BB160A58 for ; Sat, 25 Jun 2016 00:19:26 +0200 (CEST) Received: (qmail 12962 invoked by uid 500); 24 Jun 2016 22:19:25 -0000 Mailing-List: contact commits-help@ranger.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ranger.incubator.apache.org Delivered-To: mailing list commits@ranger.incubator.apache.org Received: (qmail 12952 invoked by uid 99); 24 Jun 2016 22:19:25 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jun 2016 22:19:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 127D0C0290 for ; Fri, 24 Jun 2016 22:19:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id qh3JT2__XjaC for ; Fri, 24 Jun 2016 22:19:24 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 35D5D5F21F for ; Fri, 24 Jun 2016 22:19:24 +0000 (UTC) Received: (qmail 12943 invoked by uid 99); 24 Jun 2016 22:19:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jun 2016 22:19:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E179E049D; Fri, 24 Jun 2016 22:19:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: madhan@apache.org To: commits@ranger.incubator.apache.org Message-Id: <306c40fecc944c509a55ed8fe0f9a477@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ranger git commit: RANGER-1062 : Remove conflicting jars from Ranger Atlas plugin (fix: earlier commit removed one additional library) Date: Fri, 24 Jun 2016 22:19:23 +0000 (UTC) archived-at: Fri, 24 Jun 2016 22:19:27 -0000 Repository: incubator-ranger Updated Branches: refs/heads/master 437e10a90 -> e7ef59995 RANGER-1062 : Remove conflicting jars from Ranger Atlas plugin (fix: earlier commit removed one additional library) Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/e7ef5999 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/e7ef5999 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/e7ef5999 Branch: refs/heads/master Commit: e7ef5999559065e55dbf6e14ca9c529a8620d528 Parents: 437e10a Author: Madhan Neethiraj Authored: Fri Jun 24 15:16:09 2016 -0700 Committer: Madhan Neethiraj Committed: Fri Jun 24 15:17:44 2016 -0700 ---------------------------------------------------------------------- src/main/assembly/plugin-atlas.xml | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e7ef5999/src/main/assembly/plugin-atlas.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-atlas.xml b/src/main/assembly/plugin-atlas.xml index 7fd1330..6c0a82c 100644 --- a/src/main/assembly/plugin-atlas.xml +++ b/src/main/assembly/plugin-atlas.xml @@ -53,6 +53,7 @@ org.eclipse.persistence:javax.persistence com.sun.jersey:jersey-bundle com.google.guava:guava:jar:${guava.version} + org.codehaus.jackson:jackson-jaxrs org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version} org.apache.solr:solr-solrj