From commits-return-10753-archive-asf-public=cust-asf.ponee.io@carbondata.apache.org  Sun May  6 05:02:24 2018
Return-Path: <commits-return-10753-archive-asf-public=cust-asf.ponee.io@carbondata.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 0035B180671
	for <archive-asf-public@cust-asf.ponee.io>; Sun,  6 May 2018 05:02:23 +0200 (CEST)
Received: (qmail 57678 invoked by uid 500); 6 May 2018 03:02:23 -0000
Mailing-List: contact commits-help@carbondata.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@carbondata.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@carbondata.apache.org>
List-Post: <mailto:commits@carbondata.apache.org>
List-Id: <commits.carbondata.apache.org>
Reply-To: dev@carbondata.apache.org
Delivered-To: mailing list commits@carbondata.apache.org
Received: (qmail 57665 invoked by uid 99); 6 May 2018 03:02: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; Sun, 06 May 2018 03:02:23 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id E46ECDFB8E; Sun,  6 May 2018 03:02:22 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jackylk@apache.org
To: commits@carbondata.apache.org
Message-Id: <6e52e2a15d944fe7900f1aa0e173fc71@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: carbondata git commit: [CARBONDATA-2439][Pom] upgrade guava version
 for bloom datamap
Date: Sun,  6 May 2018 03:02:22 +0000 (UTC)

Repository: carbondata
Updated Branches:
  refs/heads/master 7a697fd3c -> f2fb06806


[CARBONDATA-2439][Pom] upgrade guava version for bloom datamap

upgrade guava version from 11.0.2(provided by hadoop) to 14.0.1(provided by spark)

The dependency scope in carbon-bloom is compile, because provide scope will cause Class/MethodNotFound failure during tests. But never mind, we remove the guava dependency in carbon-assembly.

This closes #2271


Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/f2fb0680
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/f2fb0680
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/f2fb0680

Branch: refs/heads/master
Commit: f2fb06806a2c336d06c089ed9087bca672742fc7
Parents: 7a697fd
Author: xuchuanyin <xuchuanyin@hust.edu.cn>
Authored: Fri May 4 21:52:16 2018 +0800
Committer: Jacky Li <jacky.likun@qq.com>
Committed: Sun May 6 11:00:30 2018 +0800

----------------------------------------------------------------------
 datamap/bloom/pom.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/f2fb0680/datamap/bloom/pom.xml
----------------------------------------------------------------------
diff --git a/datamap/bloom/pom.xml b/datamap/bloom/pom.xml
index 6ba856a..b7db969 100644
--- a/datamap/bloom/pom.xml
+++ b/datamap/bloom/pom.xml
@@ -22,6 +22,20 @@
       <groupId>org.apache.carbondata</groupId>
       <artifactId>carbondata-core</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <!--ignore guava 11.0.2 introduced by hadoop-->
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <!--note: guava 14.0.1 is omitted during assembly.
+    The compile scope here is for building and running test-->
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>