From 8cd1201afe7be865f68506bb8de0a40c99853dbc Mon Sep 17 00:00:00 2001
From: Mike Drob <mdrob@apache.org>
Date: Fri, 13 Apr 2018 09:44:59 -0500
Subject: [PATCH] HBASE-20410 update protoc to 3.5.1-1 for rhel6

---
 hbase-protocol-shaded/pom.xml              |  4 +++-
 src/main/asciidoc/_chapters/developer.adoc | 12 ------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index ee7d54b9654..3598afbc0ce 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -33,8 +33,10 @@
     <maven.javadoc.skip>true</maven.javadoc.skip>
     <!--Version of protobuf that hbase uses internally (we shade our pb)
          Must match what is out in hbase-thirdparty include.
+         3.5.1-1 is the same as 3.5.1 except includes corrected binaries for el6
+         to work around https://github.com/google/protobuf/issues/4109
            -->
-    <internal.protobuf.version>3.5.1</internal.protobuf.version>
+    <internal.protobuf.version>3.5.1-1</internal.protobuf.version>
   </properties>
   <build>
     <resources>
diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc
index 40701e96e3d..8505ba19b46 100644
--- a/src/main/asciidoc/_chapters/developer.adoc
+++ b/src/main/asciidoc/_chapters/developer.adoc
@@ -433,18 +433,6 @@ convenience; however, the plugin may not be able to retrieve appropriate binarie
 on a platform where protoc fails, you will have to compile protoc from source, and run it independent of our maven build.
 You can disable the inline code generation by specifying `-Dprotoc.skip` in your maven arguments, allowing your build to proceed further.
 
-A similar failure relates to the stock CentOS 6 docker image providing a too old version of glibc for the version of protoc that we use.
-In this case, you would have to install glibc 2.14 and protoc 3.5.1 manually, then execute something like:
-
-[source,bourne]
-----
-cd hbase-protocol-shaded
-LD_LIBRARY_PATH=/opt/glibc-2.14/lib protoc \
-  --proto_path=src/main/protobuf \
-  --java_out=target/generated-sources/protobuf/java \
-  src/main/protobuf/*.proto
-----
-
 [NOTE]
 If you need to manually generate your protobuf files, you should not use `clean` in subsequent maven calls, as that will delete the newly generated files.