From 42f2536deca7e844d46e54388092c9daae21064b Mon Sep 17 00:00:00 2001
From: Chris Rankin <chris.rankin@r3.com>
Date: Fri, 10 Mar 2017 15:57:31 +0000
Subject: [PATCH] Ensure Node uses only a single version of Netty. (#343)

* Ensure Node uses only a single version of Netty.

* Use string version of Gradle dependency.
---
 build.gradle      |  1 +
 node/build.gradle | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index efd52641fa..fba4305d3e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,6 +24,7 @@ buildscript {
     ext.guava_version = '19.0'
     ext.quickcheck_version = '0.7'
     ext.okhttp_version = '3.5.0'
+    ext.netty_version = '4.1.5.Final'
     ext.typesafe_config_version = '1.3.1'
     ext.junit_version = '4.12'
     ext.jopt_simple_version = '5.0.2'
diff --git a/node/build.gradle b/node/build.gradle
index 3fa6816db5..0ae6437e49 100644
--- a/node/build.gradle
+++ b/node/build.gradle
@@ -23,6 +23,12 @@ configurations {
     // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
     runtime.exclude module: 'isolated'
 
+    compile {
+        // We don't need these because we already include netty-all.
+        exclude group: 'io.netty', module: 'netty-transport'
+        exclude group: 'io.netty', module: 'netty-handler'
+    }
+
     integrationTestCompile.extendsFrom testCompile
     integrationTestRuntime.extendsFrom testRuntime
 }
@@ -145,7 +151,10 @@ dependencies {
     // Java Atomix: RAFT library
     compile 'io.atomix.copycat:copycat-client:1.1.4'
     compile 'io.atomix.copycat:copycat-server:1.1.4'
-    compile 'io.atomix.catalyst:catalyst-netty:1.1.1'
+    compile 'io.atomix.catalyst:catalyst-netty:1.1.2'
+
+    // Netty: All of it.
+    compile "io.netty:netty-all:$netty_version"
 
     // OkHTTP: Simple HTTP library.
     compile "com.squareup.okhttp3:okhttp:$okhttp_version"