Skip to content

Commit

Permalink
[FLINK-4921] Upgrade to Mesos 1.0.1
Browse files Browse the repository at this point in the history
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 apache#2827.
  • Loading branch information
wrighe3 authored and mxm committed Nov 29, 2016
1 parent bcef8a3 commit 90acbe5
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions flink-mesos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ under the License.
<packaging>jar</packaging>

<properties>
<mesos.version>0.27.1</mesos.version>
<mesos.version>1.0.1</mesos.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -68,6 +68,13 @@ under the License.
<dependency>
<groupId>com.typesafe.akka</groupId>
<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>
Expand Down Expand Up @@ -253,15 +260,21 @@ under the License.
<goal>shade</goal>
</goals>
<configuration>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes combine.children="append">
<include>org.apache.flink:flink-shaded-curator-recipes</include>
<include>com.google.protobuf:*</include>
</includes>
</artifactSet>
<relocations combine.children="append">
<relocations combine.children="override">
<relocation>
<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>
</relocations>
</configuration>
Expand Down

0 comments on commit 90acbe5

Please sign in to comment.