You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2018/06/07 06:07:26 UTC

[bookkeeper] branch master updated: ISSUE #1491: fix GLIBC_2.14 dep issue for protoc-3.5.1-linux-x86_64

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new dc30f49  ISSUE #1491: fix GLIBC_2.14 dep issue for protoc-3.5.1-linux-x86_64
dc30f49 is described below

commit dc30f4938664cbfe07f061e35007c37871ad6b28
Author: Ethan Li <et...@gmail.com>
AuthorDate: Wed Jun 6 23:06:23 2018 -0700

    ISSUE #1491: fix GLIBC_2.14 dep issue for protoc-3.5.1-linux-x86_64
    
    Descriptions of the changes in this PR:
    
    I tried to build the bookkeeper branch-4.7 on RHEL6 and ran into:
    
    ```
     /lib64/libc.so.6: version `GLIBC_2.14' not found (required by bookkeeper-proto/target/protoc-plugins/protoc-3.5.1-linux-x86_64.exe)
    ```
    This is similar to google/protobuf#4109 and it's related to google/protobuf#4138
    
    We can take advantage of pulsar's fix apache/incubator-pulsar#1914 here
    
    Master Issue:  https://github.com/apache/bookkeeper/issues/1491
    
    Author: Ethan Li <et...@gmail.com>
    
    Reviewers: Enrico Olivelli <eo...@gmail.com>, Jia Zhai <None>, Sijie Guo <si...@apache.org>
    
    This closes #1492 from Ethanlm/ISSUE-1491, closes #1491
---
 bookkeeper-proto/pom.xml    | 2 +-
 pom.xml                     | 1 +
 stream/proto/pom.xml        | 2 +-
 stream/statelib/pom.xml     | 2 +-
 stream/tests-common/pom.xml | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml
index 76c45de..b6440ec 100644
--- a/bookkeeper-proto/pom.xml
+++ b/bookkeeper-proto/pom.xml
@@ -50,7 +50,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>${protobuf-maven-plugin.version}</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:${protoc3.version}:exe:${os.detected.classifier}</protocArtifact>
           <checkStaleness>true</checkStaleness>
         </configuration>
         <executions>
diff --git a/pom.xml b/pom.xml
index 8b326b0..45d876f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,6 +146,7 @@
     <prometheus.version>0.0.21</prometheus.version>
     <datasketches.version>0.8.3</datasketches.version>
     <protobuf.version>3.5.1</protobuf.version>
+    <protoc3.version>3.5.1-1</protoc3.version>
     <protoc-gen-grpc-java.version>1.12.0</protoc-gen-grpc-java.version>
     <rocksdb.version>5.13.1</rocksdb.version>
     <shrinkwrap.version>3.0.1</shrinkwrap.version>
diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml
index 0d8f690..0fdb8d4 100644
--- a/stream/proto/pom.xml
+++ b/stream/proto/pom.xml
@@ -79,7 +79,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>${protobuf-maven-plugin.version}</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:${protoc3.version}:exe:${os.detected.classifier}</protocArtifact>
           <pluginId>grpc-java</pluginId>
           <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.version}:exe:${os.detected.classifier}</pluginArtifact>
           <checkStaleness>true</checkStaleness>
diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml
index 331340d..d384d05 100644
--- a/stream/statelib/pom.xml
+++ b/stream/statelib/pom.xml
@@ -87,7 +87,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>${protobuf-maven-plugin.version}</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:${protoc3.version}:exe:${os.detected.classifier}</protocArtifact>
         </configuration>
         <executions>
           <execution>
diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml
index 0f6cc10..3460d79 100644
--- a/stream/tests-common/pom.xml
+++ b/stream/tests-common/pom.xml
@@ -68,7 +68,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>${protobuf-maven-plugin.version}</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:${protoc3.version}:exe:${os.detected.classifier}</protocArtifact>
           <pluginId>grpc-java</pluginId>
           <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.version}:exe:${os.detected.classifier}</pluginArtifact>
           <checkStaleness>true</checkStaleness>

-- 
To stop receiving notification emails like this one, please contact
sijie@apache.org.