Repository: flink Updated Branches: refs/heads/master 747288f11 -> 1602bc3ca
[FLINK-8009][build][runtime] Remove transitive dependency promotion This closes #4972. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1602bc3c Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1602bc3c Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1602bc3c Branch: refs/heads/master Commit: 1602bc3ca06836fc9bb87c84858233989ada0df5 Parents: 747288f Author: zentol <ches...@apache.org> Authored: Tue Nov 7 16:58:53 2017 +0100 Committer: zentol <ches...@apache.org> Committed: Wed Nov 8 11:21:31 2017 +0100 ---------------------------------------------------------------------- flink-runtime/pom.xml | 16 ++++++++++++++-- pom.xml | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/1602bc3c/flink-runtime/pom.xml ---------------------------------------------------------------------- diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml index 9837687..4ae7e2b 100644 --- a/flink-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -130,6 +130,20 @@ under the License. <artifactId>akka-remote_${scala.binary.version}</artifactId> </dependency> + <!-- Transitive dependency of akka-remote that we explicitly define to keep it + visible after the shading (without relocation!) of akka-remote --> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-stream_${scala.binary.version}</artifactId> + </dependency> + + <!-- Transitive dependency of akka-remote that we explicitly define to keep it + visible after the shading (without relocation!) of akka-remote --> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-protobuf_${scala.binary.version}</artifactId> + </dependency> + <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-slf4j_${scala.binary.version}</artifactId> @@ -429,8 +443,6 @@ under the License. <goal>shade</goal> </goals> <configuration> - <!-- we need this to avoid having to specify all of akka's dependencies --> - <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <artifactSet> <includes combine.children="append"> <include>org.apache.flink:flink-shaded-curator</include> http://git-wip-us.apache.org/repos/asf/flink/blob/1602bc3c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 86b1c89..a05833a 100644 --- a/pom.xml +++ b/pom.xml @@ -437,6 +437,22 @@ under the License. </exclusions> </dependency> + <!-- Transitive dependency of akka-remote that we explicitly define to keep it + visible after the shading (without relocation!) of akka-remote --> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-stream_${scala.binary.version}</artifactId> + <version>${akka.version}</version> + </dependency> + + <!-- Transitive dependency of akka-remote that we explicitly define to keep it + visible after the shading (without relocation!) of akka-remote --> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-protobuf_${scala.binary.version}</artifactId> + <version>${akka.version}</version> + </dependency> + <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
