You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mx...@apache.org on 2016/11/29 17:49:10 UTC
flink git commit: [FLINK-4921] Upgrade to Mesos 1.0.1
Repository: flink
Updated Branches:
refs/heads/master bcef8a3f8 -> 90acbe517
[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.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/90acbe51
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/90acbe51
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/90acbe51
Branch: refs/heads/master
Commit: 90acbe5174c3a9aa7f12a2e08ee29ca29f6f0a77
Parents: bcef8a3
Author: wrighe3 <er...@emc.com>
Authored: Thu Nov 17 11:33:40 2016 -0800
Committer: Maximilian Michels <mx...@apache.org>
Committed: Tue Nov 29 18:50:03 2016 +0100
----------------------------------------------------------------------
flink-mesos/pom.xml | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/90acbe51/flink-mesos/pom.xml
----------------------------------------------------------------------
diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml
index a6edc0b..8814762 100644
--- a/flink-mesos/pom.xml
+++ b/flink-mesos/pom.xml
@@ -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>
@@ -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>
@@ -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>