From 3c078321e9509b23a0f21b7d168815a3554a7e87 Mon Sep 17 00:00:00 2001
From: Naresh Bhat <naresh.bhat@linaro.org>
Date: Wed, 8 Aug 2018 16:46:08 +0530
Subject: [PATCH] HIVE-20359: Update protobuf to v3.6.1

The AArch64 support is released from v3.5.0 onwords. Hence
update all the pom.xml files to use the latest available prtobuf
version.
v3.6.1: https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/

Signed-off-by: Naresh Bhat <naresh.bhat@linaro.org>
---
 pom.xml                                       | 2 +-
 standalone-metastore/metastore-common/pom.xml | 4 ++--
 standalone-metastore/metastore-server/pom.xml | 4 ++--
 standalone-metastore/pom.xml                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 908b68cecea3..c8f56e3a585f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,7 +192,7 @@
     <parquet.version>1.10.0</parquet.version>
     <pig.version>0.16.0</pig.version>
     <plexus.version>1.5.6</plexus.version>
-    <protobuf.version>2.5.0</protobuf.version>
+    <protobuf.version>3.6.1</protobuf.version>
     <stax.version>1.0.1</stax.version>
     <slf4j.version>1.7.10</slf4j.version>
     <ST4.version>4.0.4</ST4.version>
diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml
index b0d9eee927e7..f3eb0670e281 100644
--- a/standalone-metastore/metastore-common/pom.xml
+++ b/standalone-metastore/metastore-common/pom.xml
@@ -434,7 +434,7 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <protocArtifact>com.google.protobuf:protoc:2.5.0</protocArtifact>
+              <protocArtifact>com.google.protobuf:protoc:3.6.1</protocArtifact>
               <addSources>none</addSources>
               <inputDirectories>
                 <include>${basedir}/src/main/protobuf/org/apache/hadoop/hive/metastore</include>
@@ -623,4 +623,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml
index f2c10b08cf08..eb6f20d6e4be 100644
--- a/standalone-metastore/metastore-server/pom.xml
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -444,7 +444,7 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <protocArtifact>com.google.protobuf:protoc:2.5.0</protocArtifact>
+              <protocArtifact>com.google.protobuf:protoc:3.6.1</protocArtifact>
               <addSources>none</addSources>
               <inputDirectories>
                 <include>${basedir}/src/main/protobuf/org/apache/hadoop/hive/metastore</include>
@@ -681,4 +681,4 @@
   </build>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 99bf437e4c54..7a4f6e2ce875 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -88,7 +88,7 @@
     <log4j2.version>2.8.2</log4j2.version>
     <mockito-all.version>1.10.19</mockito-all.version>
     <orc.version>1.5.1</orc.version>
-    <protobuf.version>2.5.0</protobuf.version>
+    <protobuf.version>3.6.1</protobuf.version>
     <sqlline.version>1.3.0</sqlline.version>
     <storage-api.version>2.7.0-SNAPSHOT</storage-api.version>