From 0ba0089b2d4ec8b6c37051b981ea213804618bac Mon Sep 17 00:00:00 2001
From: Neenu1995 <neenushaji@google.com>
Date: Thu, 14 Oct 2021 09:58:35 -0400
Subject: [PATCH 1/3] deps: update dependency io.grpc:grpc-bom to v1.41.0 and
 com.google.guava:guava to v31

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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>

From 454ffc05db31ffd36b7e34429d2bf426d229dcf5 Mon Sep 17 00:00:00 2001
From: Neenu1995 <neenushaji@google.com>
Date: Thu, 14 Oct 2021 10:16:18 -0400
Subject: [PATCH 2/3] chore: exclude errorprone-annotation from dependencies
 check

---
 .kokoro/dependencies.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 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..."

From e374d6350430fb16f34c7c30e25ac1b966aeaf6f Mon Sep 17 00:00:00 2001
From: Neenu1995 <neenushaji@google.com>
Date: Thu, 14 Oct 2021 10:18:38 -0400
Subject: [PATCH 3/3] chore: exclude depndencies.sh

---
 synth.py | 1 +
 1 file changed, 1 insertion(+)

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',
 ])