Repository: flink Updated Branches: refs/heads/master 5d2c465af -> 36c09b099
[FLINK-4306] [storm compatibility] Fix dependencies in flink-storm and flink-storm-examples - Flink dependencies are now 'provided' - flink-storm-examples has no direct storm-core dependency, but only depends through flink-storm Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8775189c Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8775189c Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8775189c Branch: refs/heads/master Commit: 8775189c2df6e30971e365e304fc25d1613c9cb8 Parents: 5d2c465 Author: Stephan Ewen <se...@apache.org> Authored: Tue Aug 2 14:20:08 2016 +0200 Committer: Stephan Ewen <se...@apache.org> Committed: Tue Aug 2 18:19:50 2016 +0200 ---------------------------------------------------------------------- flink-contrib/flink-storm-examples/pom.xml | 27 +++++++++++++++++++++++++ flink-contrib/flink-storm/pom.xml | 24 +++++++++++++++++----- 2 files changed, 46 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/8775189c/flink-contrib/flink-storm-examples/pom.xml ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-storm-examples/pom.xml b/flink-contrib/flink-storm-examples/pom.xml index ec46b94..a637fcd 100644 --- a/flink-contrib/flink-storm-examples/pom.xml +++ b/flink-contrib/flink-storm-examples/pom.xml @@ -34,6 +34,18 @@ under the License. <packaging>jar</packaging> + + <repositories> + <!-- This repository is needed as a stable source for some Clojure libraries --> + <repository> + <id>clojars</id> + <url>https://clojars.org/repo/</url> + <releases><enabled>true</enabled></releases> + <snapshots><enabled>false</enabled></snapshots> + </repository> + </repositories> + + <dependencies> <!-- core dependencies --> @@ -46,6 +58,12 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> + <artifactId>flink-streaming-java_2.10</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> <artifactId>flink-examples-batch_2.10</artifactId> <version>${project.version}</version> </dependency> @@ -54,6 +72,15 @@ under the License. <groupId>org.apache.storm</groupId> <artifactId>storm-starter</artifactId> <version>0.9.4</version> + + <!-- remove storm dependency - it should be drawn only (with proper + customization) via the 'flink-storm' dependency --> + <exclusions> + <exclusion> + <groupId>org.apache.storm</groupId> + <artifactId>storm-core</artifactId> + </exclusion> + </exclusions> </dependency> <!-- test dependencies --> http://git-wip-us.apache.org/repos/asf/flink/blob/8775189c/flink-contrib/flink-storm/pom.xml ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-storm/pom.xml b/flink-contrib/flink-storm/pom.xml index 50d0717..980e38c 100644 --- a/flink-contrib/flink-storm/pom.xml +++ b/flink-contrib/flink-storm/pom.xml @@ -34,7 +34,9 @@ under the License. <packaging>jar</packaging> + <repositories> + <!-- This repository is needed as a stable source for some Clojure libraries --> <repository> <id>clojars</id> <url>https://clojars.org/repo/</url> @@ -42,24 +44,30 @@ under the License. <snapshots><enabled>false</enabled></snapshots> </repository> </repositories> - + + <dependencies> <!-- core dependencies --> - <dependency> - <!-- Together with the dependency management section in flink-parent, this + <!-- Together with the dependency management section in flink-parent, this pins the Kryo version of transitive dependencies to the Flink Kryo version --> + <dependency> <groupId>com.esotericsoftware.kryo</groupId> <artifactId>kryo</artifactId> + <scope>provided</scope> </dependency> + <!-- Core streaming API --> <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-streaming-java_2.10</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> + <!-- we only need the Apache Storm API, not all the runtime and web UI functionality, + so we exclude many of the unnecessary and possibly conflicting dependencies --> <dependency> <groupId>org.apache.storm</groupId> <artifactId>storm-core</artifactId> @@ -121,8 +129,14 @@ under the License. <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> - - + <exclusion> + <groupId>clout</groupId> + <artifactId>clout</artifactId> + </exclusion> + <exclusion> + <groupId>hiccup</groupId> + <artifactId>hiccup</artifactId> + </exclusion> </exclusions> </dependency>
