Repository: flink Updated Branches: refs/heads/master ba6b08794 -> 0eb46eba8
[FLINK-4921] Upgrade to Mesos 1.0.1 - Shading fix for Guava, Fenzo, Mesos lib Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/0eb46eba Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/0eb46eba Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/0eb46eba Branch: refs/heads/master Commit: 0eb46eba8dbd447db56d86f09f99d5a878f5c242 Parents: ba6b087 Author: wrighe3 <eron.wri...@emc.com> Authored: Tue Dec 6 01:15:38 2016 -0800 Committer: Maximilian Michels <m...@apache.org> Committed: Tue Dec 6 18:44:09 2016 +0100 ---------------------------------------------------------------------- flink-mesos/pom.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/0eb46eba/flink-mesos/pom.xml ---------------------------------------------------------------------- diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml index bf60f07..55e0472 100644 --- a/flink-mesos/pom.xml +++ b/flink-mesos/pom.xml @@ -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> @@ -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"> @@ -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>
