[arrow] branch master updated: ARROW-17101: [Java] Update protoc and protoc-gen-grpc-java (#13632)

[kou]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 461750a21e ARROW-17101: [Java] Update protoc and protoc-gen-grpc-java 
(#13632)
461750a21e is described below

commit 461750a21e54f47667b27d51b7b4dc8458096edd
Author: Kazuaki Ishizaki <ishiz...@jp.ibm.com>
AuthorDate: Tue Jul 19 01:47:42 2022 +0000

    ARROW-17101: [Java] Update protoc and protoc-gen-grpc-java (#13632)
    
    Update protoc-gen-grpc-java and protoc versions to 4.17.0 and 21.2.
    
    Authored-by: Kazuaki Ishizaki <ishiz...@jp.ibm.com>
    Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
 ci/scripts/java_build.sh | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh
index 7693bd883a..adfc021f04 100755
--- a/ci/scripts/java_build.sh
+++ b/ci/scripts/java_build.sh
@@ -36,41 +36,29 @@ if [[ "$(uname -s)" == "Linux" ]] && [[ "$(uname -m)" == 
"s390x" ]]; then
   artifactory_dir="protoc-binary"
   group="com.google.protobuf"
   artifact="protoc"
-  ver="3.7.1"
+  ver="21.2"
   classifier="linux-s390_64"
   extension="exe"
-  target=${artifact}-${ver}-${classifier}.${extension}
+  # target=${artifact}-${ver}-${classifier}.${extension}
+  target=${artifact}
   ${wget} ${artifactory_base_url}/${artifactory_dir}/${ver}/${target}
   ${mvn_install} -DgroupId=${group} -DartifactId=${artifact} -Dversion=${ver} 
-Dclassifier=${classifier} -Dpackaging=${extension} -Dfile=$(pwd)/${target}
-  # protoc requires libprotoc.so.18 libprotobuf.so.18
-  ${wget} ${artifactory_base_url}/${artifactory_dir}/${ver}/libprotoc.so.18
-  ${wget} ${artifactory_base_url}/${artifactory_dir}/${ver}/libprotobuf.so.18
+  # protoc requires libprotoc.so.* libprotobuf.so.*
+  libver="32"
+  ${wget} 
${artifactory_base_url}/${artifactory_dir}/${ver}/libprotoc.so.${libver}
+  ${wget} 
${artifactory_base_url}/${artifactory_dir}/${ver}/libprotobuf.so.${libver}
   mkdir -p ${ARROW_HOME}/lib
-  cp lib*.so.18 ${ARROW_HOME}/lib
+  cp lib*.so.${libver} ${ARROW_HOME}/lib
   export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${ARROW_HOME}/lib
 
   artifactory_dir="protoc-gen-grpc-java-binary"
   group="io.grpc"
   artifact="protoc-gen-grpc-java"
-  ver="1.30.2"
+  ver="1.47.0"
   classifier="linux-s390_64"
   extension="exe"
-  target=${artifact}-${ver}-${classifier}.${extension}
-  ${wget} ${artifactory_base_url}/${artifactory_dir}/${ver}/${target}
-  ${mvn_install} -DgroupId=${group} -DartifactId=${artifact} -Dversion=${ver} 
-Dclassifier=${classifier} -Dpackaging=${extension} -Dfile=$(pwd)/${target}
-
-  artifactory_dir="netty-binary"
-  group="io.netty"
-  artifact="netty-transport-native-unix-common"
-  ver="4.1.48.Final"
-  classifier="linux-s390_64"
-  extension="jar"
-  target=${artifact}-${ver}-${classifier}.${extension}
-  ${wget} ${artifactory_base_url}/${artifactory_dir}/${ver}/${target}
-  ${mvn_install} -DgroupId=${group} -DartifactId=${artifact} -Dversion=${ver} 
-Dclassifier=${classifier} -Dpackaging=${extension} -Dfile=$(pwd)/${target}
-  artifact="netty-transport-native-epoll"
-  extension="jar"
-  target=${artifact}-${ver}-${classifier}.${extension}
+  # target=${artifact}-${ver}-${classifier}.${extension}
+  target=${artifact}
   ${wget} ${artifactory_base_url}/${artifactory_dir}/${ver}/${target}
   ${mvn_install} -DgroupId=${group} -DartifactId=${artifact} -Dversion=${ver} 
-Dclassifier=${classifier} -Dpackaging=${extension} -Dfile=$(pwd)/${target}
 fi