提交 8775189c 编写于 作者: S Stephan Ewen

[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
上级 5d2c465a
...@@ -34,6 +34,18 @@ under the License. ...@@ -34,6 +34,18 @@ under the License.
<packaging>jar</packaging> <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> <dependencies>
<!-- core dependencies --> <!-- core dependencies -->
...@@ -44,6 +56,12 @@ under the License. ...@@ -44,6 +56,12 @@ under the License.
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.flink</groupId> <groupId>org.apache.flink</groupId>
<artifactId>flink-examples-batch_2.10</artifactId> <artifactId>flink-examples-batch_2.10</artifactId>
...@@ -54,6 +72,15 @@ under the License. ...@@ -54,6 +72,15 @@ under the License.
<groupId>org.apache.storm</groupId> <groupId>org.apache.storm</groupId>
<artifactId>storm-starter</artifactId> <artifactId>storm-starter</artifactId>
<version>0.9.4</version> <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> </dependency>
<!-- test dependencies --> <!-- test dependencies -->
......
...@@ -34,7 +34,9 @@ under the License. ...@@ -34,7 +34,9 @@ under the License.
<packaging>jar</packaging> <packaging>jar</packaging>
<repositories> <repositories>
<!-- This repository is needed as a stable source for some Clojure libraries -->
<repository> <repository>
<id>clojars</id> <id>clojars</id>
<url>https://clojars.org/repo/</url> <url>https://clojars.org/repo/</url>
...@@ -43,23 +45,29 @@ under the License. ...@@ -43,23 +45,29 @@ under the License.
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<!-- core 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 --> pins the Kryo version of transitive dependencies to the Flink Kryo version -->
<dependency>
<groupId>com.esotericsoftware.kryo</groupId> <groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId> <artifactId>kryo</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- Core streaming API -->
<dependency> <dependency>
<groupId>org.apache.flink</groupId> <groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_2.10</artifactId> <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope>
</dependency> </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> <dependency>
<groupId>org.apache.storm</groupId> <groupId>org.apache.storm</groupId>
<artifactId>storm-core</artifactId> <artifactId>storm-core</artifactId>
...@@ -121,8 +129,14 @@ under the License. ...@@ -121,8 +129,14 @@ under the License.
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>clout</groupId>
<artifactId>clout</artifactId>
</exclusion>
<exclusion>
<groupId>hiccup</groupId>
<artifactId>hiccup</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册