From 271919e87ac60f16f5c1e608abcc90cc8d5b3071 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 29 Oct 2021 01:11:06 +0000
Subject: [PATCH 1/2] deps: update dependency com.google.protobuf:protobuf-bom
 to v3.19.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 59c1a3c2..ca41e363 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-iam-parent</site.installationModule>
-    <protobuf.version>3.18.1</protobuf.version>
+    <protobuf.version>3.19.1</protobuf.version>
     <junit.version>4.13.2</junit.version>
     <grpc.version>1.41.0</grpc.version>
     <guava.version>31.0.1-android</guava.version>

From a24b35549c37a1b8fb1f4afd6df44372e75b11f7 Mon Sep 17 00:00:00 2001
From: Chanseok Oh <chanseok@google.com>
Date: Mon, 15 Nov 2021 16:53:30 -0500
Subject: [PATCH 2/2] build: fix JDK 17 failure

---
 .kokoro/dependencies.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index f18c6b8d..aadcae30 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -38,15 +38,12 @@ function determineMavenOpts() {
       | sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
   )
 
-  case $javaVersion in
-    "17")
-      # MaxPermSize is no longer supported as of jdk 17
-      echo -n "-Xmx1024m"
-      ;;
-    *)
-      echo -n "-Xmx1024m -XX:MaxPermSize=128m"
-      ;;
-  esac
+  if [[ $javaVersion == 17* ]]; then
+    # MaxPermSize now causes an error in jdk 17
+    echo -n "-Xmx1024m"
+  else
+    echo -n "-Xmx1024m -XX:MaxPermSize=128m"
+  fi
 }
 
 export MAVEN_OPTS=$(determineMavenOpts)