提交 90acbe51 编写于 作者: W wrighe3 提交者: Maximilian Michels

[FLINK-4921] Upgrade to Mesos 1.0.1

Updated the Mesos dependency, to unlock some new features (notably the
ability to fetch into sandbox sub-directories).

Shaded the protobuf dependency because the new Mesos library depends on
a newer version than does akka-remoting.

This closes #2827.
上级 bcef8a3f
...@@ -32,7 +32,7 @@ under the License. ...@@ -32,7 +32,7 @@ under the License.
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<mesos.version>0.27.1</mesos.version> <mesos.version>1.0.1</mesos.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -68,6 +68,13 @@ under the License. ...@@ -68,6 +68,13 @@ under the License.
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote_${scala.binary.version}</artifactId> <artifactId>akka-remote_${scala.binary.version}</artifactId>
<exclusions>
<!-- exclude protobuf here to allow the mesos library to provide it -->
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -253,15 +260,21 @@ under the License. ...@@ -253,15 +260,21 @@ under the License.
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration> <configuration>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet> <artifactSet>
<includes combine.children="append"> <includes combine.children="append">
<include>org.apache.flink:flink-shaded-curator-recipes</include> <include>org.apache.flink:flink-shaded-curator-recipes</include>
<include>com.google.protobuf:*</include>
</includes> </includes>
</artifactSet> </artifactSet>
<relocations combine.children="append"> <relocations combine.children="override">
<relocation> <relocation>
<pattern>org.apache.curator</pattern> <pattern>org.apache.curator</pattern>
<shadedPattern>org.apache.flink.shaded.org.apache.curator</shadedPattern> <shadedPattern>org.apache.flink.mesos.shaded.org.apache.curator</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.protobuf</pattern>
<shadedPattern>org.apache.flink.mesos.shaded.com.google.protobuf</shadedPattern>
</relocation> </relocation>
</relocations> </relocations>
</configuration> </configuration>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册