Return-Path: <commits-return-20229-archive-asf-public=cust-asf.ponee.io@beam.apache.org>
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 07B89200C01
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 19 Jan 2017 23:20:02 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 04981160B57; Thu, 19 Jan 2017 22:20:02 +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 558C7160B3A
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 19 Jan 2017 23:20:01 +0100 (CET)
Received: (qmail 65992 invoked by uid 500); 19 Jan 2017 22:20:00 -0000
Mailing-List: contact commits-help@beam.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@beam.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@beam.apache.org>
List-Post: <mailto:commits@beam.apache.org>
List-Id: <commits.beam.apache.org>
Reply-To: dev@beam.apache.org
Delivered-To: mailing list commits@beam.apache.org
Received: (qmail 65983 invoked by uid 99); 19 Jan 2017 22:20:00 -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; Thu, 19 Jan 2017 22:20:00 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 6AE16DFB0E; Thu, 19 Jan 2017 22:20:00 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: amitsela@apache.org
To: commits@beam.apache.org
Date: Thu, 19 Jan 2017 22:20:00 -0000
Message-Id: <2d0b4423ba364b14be88937ff93b62a4@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] beam git commit: Add jackson specific version + shade only
 relocate classes
archived-at: Thu, 19 Jan 2017 22:20:02 -0000

Repository: beam
Updated Branches:
  refs/heads/master b2d300858 -> 420367088


Add jackson specific version + shade only relocate classes


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

Branch: refs/heads/master
Commit: 224f5208efc14862ddba8da25523bcb449fd5e06
Parents: b2d3008
Author: ksalant <ksalant@payapal.com>
Authored: Thu Jan 19 17:34:44 2017 +0200
Committer: Sela <ansela@paypal.com>
Committed: Fri Jan 20 00:04:40 2017 +0200

----------------------------------------------------------------------
 runners/spark/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/224f5208/runners/spark/pom.xml
----------------------------------------------------------------------
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index 84e92fe..196b5bb 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -37,6 +37,7 @@
     <spark.version>1.6.3</spark.version>
     <hadoop.version>2.2.0</hadoop.version>
     <kafka.version>0.9.0.1</kafka.version>
+    <jackson.version>2.4.4</jackson.version>
     <dropwizard.metrics.version>3.1.2</dropwizard.metrics.version>
   </properties>
 
@@ -157,14 +158,17 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
+      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
+      <version>${jackson.version}</version>
     </dependency>
       <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
+        <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.avro</groupId>
@@ -368,6 +372,11 @@
                 <goal>shade</goal>
               </goals>
               <configuration>
+                <artifactSet>
+                  <includes>
+                    <include>com.google.guava:guava</include>
+                  </includes>
+                </artifactSet>
                 <relocations>
                   <!-- relocate Guava used by Beam (v18) since it conflicts with
                     version used by Hadoop (v11) -->