You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by uc...@apache.org on 2015/09/23 20:00:11 UTC
[1/2] flink git commit: [FLINK-2651] Add Netty to dependency
management
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 <uc...@apache.org>
Authored: Wed Sep 23 16:13:50 2015 +0200
Committer: Ufuk Celebi <uc...@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>
[2/2] flink git commit: Bump Netty version to 4.0.31.Final
Posted by uc...@apache.org.
Bump Netty version to 4.0.31.Final
This closes #1174
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/72120425
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/72120425
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/72120425
Branch: refs/heads/master
Commit: 721204258139e0e523e05c0c6d70c7bd2ec5a3e4
Parents: 1e5b74a
Author: Ufuk Celebi <uc...@apache.org>
Authored: Wed Sep 23 19:58:17 2015 +0200
Committer: Ufuk Celebi <uc...@apache.org>
Committed: Wed Sep 23 19:59:37 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/72120425/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f6d7376..6603e81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,7 +344,7 @@ under the License.
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.27.Final</version>
+ <version>4.0.31.Final</version>
</dependency>
</dependencies>
</dependencyManagement>