From 652abe2f63fa6a797221cea48000ec3e662fa1e0 Mon Sep 17 00:00:00 2001
From: Ben McCann <ben@connectifier.com>
Date: Wed, 13 May 2015 10:12:38 -0700
Subject: [PATCH] Simplify the build instructions now that Netty can be fetched
 from Maven

---
 .gitmodules                       |  3 ---
 README.md                         | 10 ----------
 buildscripts/make_dependencies.sh | 18 ------------------
 lib/netty                         |  1 -
 4 files changed, 32 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 lib/netty

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index bfd7c9c20a..0000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "lib/netty"]
-	path = lib/netty
-	url = https://github.com/netty/netty.git
diff --git a/README.md b/README.md
index c8e4413387..c2aa9abd6a 100644
--- a/README.md
+++ b/README.md
@@ -116,16 +116,6 @@ How to Build
 ------------
 This section is only necessary if you are making changes to gRPC-Java.
 
-### Build Netty
-grpc-java requires Netty 4.1, which is still in flux. The version we need can be
-found in the lib/netty submodule, which requires Maven 3.2 or higher to build:
-```
-$ git submodule update --init
-$ cd lib/netty
-$ mvn install -pl codec-http2 -am -DskipTests=true
-```
-
-### Build gRPC
 Building requires JDK 8, as our tests use TLS.
 
 grpc-java has a C++ code generation plugin for protoc. Since many Java
diff --git a/buildscripts/make_dependencies.sh b/buildscripts/make_dependencies.sh
index 1bf68522a8..094b5d6776 100755
--- a/buildscripts/make_dependencies.sh
+++ b/buildscripts/make_dependencies.sh
@@ -17,21 +17,3 @@ else
   make install
   popd
 fi
-
-# Make and install netty
-pushd lib/netty
-BUILD_NETTY=1
-NETTY_REV_FILE="$HOME/.m2/repository/io/netty/netty-ver"
-REV="$(git rev-parse HEAD)"
-if [ -f "$NETTY_REV_FILE" ]; then
-  REV_LAST="$(cat "$NETTY_REV_FILE")"
-  if [ z"$REV" = z"$REV_LAST" ]; then
-    BUILD_NETTY=0
-    echo "Not building Netty; already at $REV"
-  fi
-fi
-if [ $BUILD_NETTY = 1 ]; then
-  mvn install -pl codec-http2 -am -DskipTests=true
-  echo "$REV" > "$NETTY_REV_FILE"
-fi
-popd
diff --git a/lib/netty b/lib/netty
deleted file mode 160000
index 871ce43b1f..0000000000
--- a/lib/netty
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 871ce43b1f431536e08a36d420875494ef3e9451