flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/3] flink git commit: [hotfix] [build] Converge Kryo dependency
Date Wed, 24 Jan 2018 17:12:37 GMT
Repository: flink
Updated Branches:
  refs/heads/master 1856edf23 -> c869eb9d1


[hotfix] [build] Converge Kryo dependency

Previously, the Kryo dependency was diverging between the flink-core dependency
and the chill dependency.

[INFO] +- org.apache.flink:flink-java:jar:1.4.0:compile
[INFO] |  +- org.apache.flink:flink-core:jar:1.4.0:compile
[INFO] |  |  +- com.esotericsoftware.kryo:kryo:jar:2.24.0:compile
....
[INFO] +- org.apache.flink:flink-streaming-java_2.11:jar:1.4.0:compile
[INFO] |  +- (org.apache.flink:flink-core:jar:1.4.0:compile - omitted for
duplicate)
[INFO] |  +- org.apache.flink:flink-runtime_2.11:jar:1.4.0:compile
[INFO] |  |  +- com.twitter:chill_2.11:jar:0.7.4:compile
[INFO] |  |  |  +- com.twitter:chill-java:jar:0.7.4:compile
[INFO] |  |  |  |  \- (com.esotericsoftware.kryo:kryo:jar:2.21:compile -
omitted for conflict with 2.24.0)
[INFO] |  |  |  \- (com.esotericsoftware.kryo:kryo:jar:2.21:compile -
omitted for conflict with 2.24.0)


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/012413cb
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/012413cb
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/012413cb

Branch: refs/heads/master
Commit: 012413cbc7319d643db8fa0a67b0605bbcd03a25
Parents: 1856edf
Author: Stephan Ewen <sewen@apache.org>
Authored: Wed Jan 24 10:02:00 2018 +0100
Committer: Stephan Ewen <sewen@apache.org>
Committed: Wed Jan 24 17:47:56 2018 +0100

----------------------------------------------------------------------
 flink-runtime/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/012413cb/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index ad2c974..7c6db01 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -180,6 +180,13 @@ under the License.
 			<groupId>com.twitter</groupId>
 			<artifactId>chill_${scala.binary.version}</artifactId>
 			<version>${chill.version}</version>
+			<exclusions>
+				<!-- Remove Kryo dependency to force using Flink's own Kryo dependency -->
+				<exclusion>
+					<groupId>com.esotericsoftware.kryo</groupId>
+					<artifactId>kryo</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- Curator and ZooKeeper - we explicitly add ZooKeeper here as


Mime
View raw message