From 73c73c3aa29fdc32a55d74bbe30e8289f15f5ae4 Mon Sep 17 00:00:00 2001
From: Blake Li <blakeli@google.com>
Date: Fri, 9 Dec 2022 00:22:02 -0500
Subject: [PATCH 1/2] chore: Explicitly declare dependencies instead of using
 shared-dependencies-bom

---
 gapic-generator-java/pom.xml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml
index 9cee0d5c03..1bb277e782 100644
--- a/gapic-generator-java/pom.xml
+++ b/gapic-generator-java/pom.xml
@@ -13,14 +13,24 @@
     <sonar.projectBaseDir>..</sonar.projectBaseDir>
     <sonar.sources>../src/main/java,pom.xml</sonar.sources>
     <sonar.working.directory>../target/sonar</sonar.working.directory>
+    <gax.version>2.20.1</gax.version>
+    <grpc.version>1.51.0</grpc.version>
+    <protobuf.version>3.21.10</protobuf.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>3.0.6</version>
+        <groupId>com.google.api</groupId>
+        <artifactId>gax-bom</artifactId>
+        <version>${gax.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-bom</artifactId>
+        <version>${grpc.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -189,7 +199,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>0.6.1</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:3.21.7:exe:${os.detected.classifier}
+          <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
           </protocArtifact>
         </configuration>
         <executions>
@@ -306,6 +316,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
+      <version>31.1-jre</version>
     </dependency>
     <dependency>
       <groupId>com.google.api</groupId>
@@ -341,6 +352,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java-util</artifactId>
+      <version>${protobuf.version}</version>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
@@ -373,6 +385,7 @@
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
+      <version>1.3.2</version>
     </dependency>
 
     <dependency>

From d865d62dfe0845048f12de6bbc6a9a3a756be07b Mon Sep 17 00:00:00 2001
From: Blake Li <blakeli@google.com>
Date: Fri, 9 Dec 2022 00:31:50 -0500
Subject: [PATCH 2/2] update pom.xml

---
 gapic-generator-java/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml
index 1bb277e782..545e81df16 100644
--- a/gapic-generator-java/pom.xml
+++ b/gapic-generator-java/pom.xml
@@ -16,6 +16,7 @@
     <gax.version>2.20.1</gax.version>
     <grpc.version>1.51.0</grpc.version>
     <protobuf.version>3.21.10</protobuf.version>
+    <auto-value.version>1.10.1</auto-value.version>
   </properties>
 
   <dependencyManagement>
@@ -66,7 +67,7 @@
             <path>
               <groupId>com.google.auto.value</groupId>
               <artifactId>auto-value</artifactId>
-              <version>1.10.1</version>
+              <version>${auto-value.version}</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
@@ -348,6 +349,7 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>
+      <version>${auto-value.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>