From e24a80d61c84010b607b72de86eac734a94690c7 Mon Sep 17 00:00:00 2001
From: Martin Grigorov <martin-g@users.noreply.github.com>
Date: Mon, 21 Feb 2022 11:10:00 +0200
Subject: [PATCH] Build and test on Linux ARM64 at TravisCI (#7777)

Update Grpc to 1.26.0. This is the first version with aarch_64 support
in protoc-gen-grpc-java
(https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.26.0/)

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
---
 .travis.yml | 6 ++++++
 pom.xml     | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1b597b4b52d..537fd75e201 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,12 @@ matrix:
     # On Linux, run with specific JDKs only.
     - os: linux
       env: CUSTOM_JDK="oraclejdk8"
+    - name: Linux aarch64
+      dist: focal
+      arch: arm64-graviton2
+      group: edge
+      virt: vm
+
 
 jdk:
   - openjdk11
diff --git a/pom.xml b/pom.xml
index 6643371c7ec..11953d7afdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,10 +154,10 @@
         <guava.version>30.1-jre</guava.version>
         <javatuples.version>1.2</javatuples.version>
         <commonOkHttp.version>0.4.1</commonOkHttp.version>
-        <grpc-java.version>1.24.0</grpc-java.version>
+        <grpc-java.version>1.26.0</grpc-java.version>
         <proto-google-common-protos.version>1.17.0</proto-google-common-protos.version>
         <protobuf-java.version>3.16.1</protobuf-java.version>
-        <protoc-gen-grpc-java.version>1.24.0</protoc-gen-grpc-java.version>
+        <protoc-gen-grpc-java.version>${grpc-java.version}</protoc-gen-grpc-java.version>
         <hessian.version>4.0.63</hessian.version>
         <reflections.version>0.9.11</reflections.version>
         <mockito-all.version>1.10.19</mockito-all.version>