From f0c638a178e8ee02883f6570110f614f154f4814 Mon Sep 17 00:00:00 2001
From: Neenu Shaji <Neenu1995@users.noreply.github.com>
Date: Thu, 14 Oct 2021 10:23:56 -0400
Subject: [PATCH] deps: update dependency io.grpc:grpc-bom to v1.41.0 and
 com.google.guava:guava to v31 (#244)

* deps: update dependency io.grpc:grpc-bom to v1.41.0 and com.google.guava:guava to v31

* chore: exclude errorprone-annotation from dependencies check

* chore: exclude depndencies.sh
---
 .kokoro/dependencies.sh | 4 ++--
 pom.xml                 | 4 ++--
 synth.py                | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9a5105d7..f18c6b8d 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -68,11 +68,11 @@ function completenessCheck() {
   # This is stripped from the output as it is not present in the flattened pom.
   # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
   msg "Generating dependency list using original pom..."
-  mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
+  mvn dependency:list -f pom.xml -DexcludeArtifactIds=error_prone_annotations -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
 
   # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
   msg "Generating dependency list using flattened pom..."
-  mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
+  mvn dependency:list -f .flattened-pom.xml -DexcludeArtifactIds=error_prone_annotations -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
 
   # Compare two dependency lists
   msg "Comparing dependency lists..."
diff --git a/pom.xml b/pom.xml
index 79809bcf..d9fa64ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,8 +65,8 @@
     <site.installationModule>google-iam-parent</site.installationModule>
     <protobuf.version>3.18.1</protobuf.version>
     <junit.version>4.13.2</junit.version>
-    <grpc.version>1.38.1</grpc.version>
-    <guava.version>30.1-android</guava.version>
+    <grpc.version>1.41.0</grpc.version>
+    <guava.version>31.0.1-android</guava.version>
   </properties>
 
   <dependencyManagement>
diff --git a/synth.py b/synth.py
index bd68d39c..d90a71f7 100644
--- a/synth.py
+++ b/synth.py
@@ -106,4 +106,5 @@ def build_grpc(target):
   'README.md',
   'samples/*',
   '.github/workflows/samples.yaml',
+  '.kokoro/dependencies.sh',
 ])