Repository: flink Updated Branches: refs/heads/master 4f12356eb -> b2aa1d9e3
[FLINK-3145][storm] pin Kryo version of transitive dependencies This closes #1441. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b2aa1d9e Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b2aa1d9e Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b2aa1d9e Branch: refs/heads/master Commit: b2aa1d9e3741c77230d300d6c777d3eabe98d0ac Parents: e28b62e Author: Maximilian Michels <m...@apache.org> Authored: Tue Dec 8 18:51:31 2015 +0100 Committer: Maximilian Michels <m...@apache.org> Committed: Wed Dec 9 15:48:30 2015 +0100 ---------------------------------------------------------------------- docs/apis/storm_compatibility.md | 2 ++ flink-contrib/flink-storm/pom.xml | 7 +++++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/b2aa1d9e/docs/apis/storm_compatibility.md ---------------------------------------------------------------------- diff --git a/docs/apis/storm_compatibility.md b/docs/apis/storm_compatibility.md index fe6bf35..ccc7d78 100644 --- a/docs/apis/storm_compatibility.md +++ b/docs/apis/storm_compatibility.md @@ -49,6 +49,8 @@ Add the following dependency to your `pom.xml` if you want to execute Storm code </dependency> ~~~ +**Please note**: Do not add `storm-core` as a dependency. It is already included via `flink-storm`. + **Please note**: `flink-storm` is not part of the provided binary Flink distribution. Thus, you need to include `flink-storm` classes (and their dependencies) in your program jar that is submitted to Flink's JobManager. See *WordCount Storm* within `flink-storm-examples/pom.xml` for an example how to package a jar correctly. http://git-wip-us.apache.org/repos/asf/flink/blob/b2aa1d9e/flink-contrib/flink-storm/pom.xml ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-storm/pom.xml b/flink-contrib/flink-storm/pom.xml index 072ee75..5695ca5 100644 --- a/flink-contrib/flink-storm/pom.xml +++ b/flink-contrib/flink-storm/pom.xml @@ -36,6 +36,13 @@ under the License. <dependencies> <dependency> + <!-- Together with the dependency management section in flink-parent, this + pins the Kryo version of transitive dependencies to the Flink Kryo version --> + <groupId>com.esotericsoftware.kryo</groupId> + <artifactId>kryo</artifactId> + </dependency> + + <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-streaming-java</artifactId> <version>${project.version}</version>
