You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2016/12/13 20:45:28 UTC
[2/3] incubator-beam git commit: Fix version of Kryo in examples/java
jenkins-precommit profile
Fix version of Kryo in examples/java jenkins-precommit profile
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/f32f156a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/f32f156a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/f32f156a
Branch: refs/heads/master
Commit: f32f156ad9443ff63664dc62e49f6e48ad81baeb
Parents: ddef438
Author: Kenneth Knowles <kl...@google.com>
Authored: Tue Dec 13 10:34:47 2016 -0800
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 13 12:27:46 2016 -0800
----------------------------------------------------------------------
examples/java/pom.xml | 18 ++++++++++++++++++
pom.xml | 1 +
runners/apex/pom.xml | 2 +-
3 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f32f156a/examples/java/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index 01d1695..e541edb 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -131,6 +131,24 @@
<skipITs>false</skipITs>
<skipDefaultIT>true</skipDefaultIT>
</properties>
+
+ <dependencies>
+ <!--
+ This profile requires -P apex-runner and -P spark-runner already. When they are both
+ included, the Spark runner's Kryo dependency will pull in a version that is insufficiently
+ recent for the Apex runner.
+
+ This dependency makes the Apex runner version "closer" by Maven resolution rules,
+ so it will not be overridden.
+ -->
+ <dependency>
+ <groupId>com.esotericsoftware.kryo</groupId>
+ <artifactId>kryo</artifactId>
+ <version>${apex.kryo.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f32f156a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 35a055c..32bcab0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,7 @@
<beamSurefireArgline />
<!-- If updating dependencies, please update any relevant javadoc offlineLinks -->
+ <apex.kryo.version>2.24.0</apex.kryo.version>
<avro.version>1.8.1</avro.version>
<bigquery.version>v2-rev295-1.22.0</bigquery.version>
<cloudresourcemanager.version>v1-rev6-1.22.0</cloudresourcemanager.version>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f32f156a/runners/apex/pom.xml
----------------------------------------------------------------------
diff --git a/runners/apex/pom.xml b/runners/apex/pom.xml
index 9f1455a..6c23f52 100644
--- a/runners/apex/pom.xml
+++ b/runners/apex/pom.xml
@@ -221,7 +221,7 @@
<ignoredUsedUndeclaredDependency>org.apache.apex:apex-api:jar:3.5.0</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.apache.commons:commons-lang3::3.1</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>commons-io:commons-io:jar:2.4</ignoredUsedUndeclaredDependency>
- <ignoredUsedUndeclaredDependency>com.esotericsoftware.kryo:kryo::2.24.0</ignoredUsedUndeclaredDependency>
+ <ignoredUsedUndeclaredDependency>com.esotericsoftware.kryo:kryo::${apex.kryo.version}</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>com.datatorrent:netlet::1.3.0</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.slf4j:slf4j-api:jar:1.7.14</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.apache.hadoop:hadoop-common:jar:2.6.0</ignoredUsedUndeclaredDependency>