Repository: flink
Updated Branches:
refs/heads/master a76de2860 -> b2b94632d
[hotfix] [build] Small improvements to the flink-mesos build
- The newer akka versions have no protobuf dependency and need no exclusion
any more
- The transitive dependency promotion is ineffective here, disabling it makes
it more robust against accidentally pulling in more dependencies in the
future
- Properly specifying the shaded dependencies is safer
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/9498f4fc
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/9498f4fc
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/9498f4fc
Branch: refs/heads/master
Commit: 9498f4fcb99e13128549b5b4674e41f2cea40057
Parents: 5ff7a0b
Author: Stephan Ewen <[email protected]>
Authored: Sun Oct 15 02:48:37 2017 +0200
Committer: Stephan Ewen <[email protected]>
Committed: Sun Oct 15 19:08:11 2017 +0200
----------------------------------------------------------------------
flink-mesos/pom.xml | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/9498f4fc/flink-mesos/pom.xml
----------------------------------------------------------------------
diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml
index 2ae59be..7ad7ffd 100644
--- a/flink-mesos/pom.xml
+++ b/flink-mesos/pom.xml
@@ -71,13 +71,6 @@ under the License.
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote_${scala.binary.version}</artifactId>
<scope>provided</scope>
- <exclusions>
- <!-- exclude the lower/wrong version of
Protobuf here -->
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -269,9 +262,7 @@ under the License.
</configuration>
</plugin>
- <!-- Relocate Mesos Protobuf dependency. Mesos 1.0.1
requires Protobuf 2.6.1 whereas
- Flakka pulls in Protobuf 2.5.0. It might be feasible
to set Protobuf to version 2.6.1,
- but we shade to be on the safe side. -->
+ <!-- Relocate Mesos Protobuf dependency. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -283,11 +274,10 @@ under the License.
<goal>shade</goal>
</goals>
<configuration>
-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes
combine.children="append">
-
<include>com.google.protobuf:*</include>
-
<include>org.apache.mesos:*</include>
+
<include>com.google.protobuf:protobuf-java</include>
+
<include>org.apache.mesos:mesos</include>
</includes>
</artifactSet>
<relocations
combine.children="append">
