Skip to content

Commit

Permalink
[FLINK-4921] Upgrade to Mesos 1.0.1
Browse files Browse the repository at this point in the history
- Shading fix for Guava, Fenzo, Mesos lib
  • Loading branch information
wrighe3 authored and mxm committed Dec 6, 2016
1 parent ba6b087 commit 0eb46eb
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions flink-mesos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,13 @@ under the License.
<groupId>com.netflix.fenzo</groupId>
<artifactId>fenzo-core</artifactId>
<version>0.9.3</version>
<exclusions>
<!-- exclude mesos here to override -->
<exclusion>
<groupId>org.apache.mesos</groupId>
<artifactId>mesos</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -265,6 +272,9 @@ under the License.
<includes combine.children="append">
<include>org.apache.flink:flink-shaded-curator-recipes</include>
<include>com.google.protobuf:*</include>
<include>com.google.guava:guava</include>
<include>org.apache.mesos:*</include>
<include>com.netflix.fenzo:*</include>
</includes>
</artifactSet>
<relocations combine.children="override">
Expand All @@ -273,8 +283,8 @@ under the License.
<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>
<pattern>com.google</pattern>
<shadedPattern>org.apache.flink.mesos.shaded.com.google</shadedPattern>
</relocation>
</relocations>
</configuration>
Expand Down

0 comments on commit 0eb46eb

Please sign in to comment.