You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by am...@apache.org on 2017/01/19 22:20:00 UTC
[1/2] beam git commit: Add jackson specific version + shade only
relocate classes
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 <ks...@payapal.com>
Authored: Thu Jan 19 17:34:44 2017 +0200
Committer: Sela <an...@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) -->
[2/2] beam git commit: [BEAM-1214] This closes #1796
Posted by am...@apache.org.
[BEAM-1214] This closes #1796
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/42036708
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/42036708
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/42036708
Branch: refs/heads/master
Commit: 420367088ec3e118a37de62491d02ba0bf72ec96
Parents: b2d3008 224f520
Author: Sela <an...@paypal.com>
Authored: Fri Jan 20 00:06:50 2017 +0200
Committer: Sela <an...@paypal.com>
Committed: Fri Jan 20 00:06:50 2017 +0200
----------------------------------------------------------------------
runners/spark/pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------