flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [1/2] flink git commit: [FLINK-2651] Add Netty to dependency management
Date Wed, 23 Sep 2015 18:00:11 GMT
Repository: flink
Updated Branches:
  refs/heads/master 672979bac -> 721204258


[FLINK-2651] Add Netty to dependency management

Hadoop 2.7.0 pulls in an older Netty version, which clashes with our version.
This makes sure to only pull in our version.


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

Branch: refs/heads/master
Commit: 1e5b74a0e0628919a93875367b4265cc538f19b7
Parents: 672979b
Author: Ufuk Celebi <uce@apache.org>
Authored: Wed Sep 23 16:13:50 2015 +0200
Committer: Ufuk Celebi <uce@apache.org>
Committed: Wed Sep 23 19:59:15 2015 +0200

----------------------------------------------------------------------
 flink-runtime/pom.xml | 2 +-
 pom.xml               | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/1e5b74a0/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 1d98bfd..11ad1f2 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -102,7 +102,7 @@ under the License.
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
-			<version>4.0.27.Final</version>
+			<!-- Version is set in root POM -->
 		</dependency>
 
 		<!-- See: https://groups.google.com/forum/#!msg/netty/-aAPDBNUnDg/SkGOXL2Ma2QJ -->

http://git-wip-us.apache.org/repos/asf/flink/blob/1e5b74a0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b5cbc4f..f6d7376 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,6 +340,12 @@ under the License.
 				<artifactId>zookeeper</artifactId>
 				<version>${zookeeper.version}</version>
 			</dependency>
+
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.0.27.Final</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 


Mime
View raw message