HBASE-20410 update protoc to 3.5.1-1 for rhel6

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

Branch: refs/heads/HBASE-19064
Commit: da7776d428fa8590ce9bd3654080434963dcc0ba
Parents: 2f74afd
Author: Mike Drob <md...@apache.org>
Authored: Fri Apr 13 09:44:59 2018 -0500
Committer: Mike Drob <md...@apache.org>
Committed: Fri Apr 13 13:09:20 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/da7776d4/hbase-protocol-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 25443e1..ba4fa2d 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>

http://git-wip-us.apache.org/repos/asf/hbase/blob/da7776d4/src/main/asciidoc/_chapters/developer.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/developer.adoc 
b/src/main/asciidoc/_chapters/developer.adoc
index 7cbf404..92b4e65 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.
 

Reply via email to