Add temporary version overrides for com.google.api.grpc:proto-google-…

…common-protos, com.google.api:gax & com.google.api:gax-grpc (cherry picked from commit 3c7c94b)
quarkusio · Aug 16, 2023 · f3bb063 · f3bb063
1 parent 2cf2d4f
commit f3bb063
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/generated-platform-project/quarkus-google-cloud-services/bom/pom.xml b/generated-platform-project/quarkus-google-cloud-services/bom/pom.xml
@@ -2777,17 +2777,17 @@
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gapic-generator-java</artifactId>
-        <version>2.23.0</version>
+        <version>2.23.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>2.23.0</version>
+        <version>2.31.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>2.23.0</version>
+        <version>2.31.1</version>
         <classifier>testlib</classifier>
       </dependency>
       <dependency>
@@ -2804,12 +2804,12 @@
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax</artifactId>
-        <version>2.23.0</version>
+        <version>2.31.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax</artifactId>
-        <version>2.23.0</version>
+        <version>2.31.1</version>
         <classifier>testlib</classifier>
       </dependency>
       <dependency>

diff --git a/generated-platform-project/quarkus-universe/bom/pom.xml b/generated-platform-project/quarkus-universe/bom/pom.xml
@@ -3571,17 +3571,17 @@
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gapic-generator-java</artifactId>
-        <version>2.23.0</version>
+        <version>2.23.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>2.23.0</version>
+        <version>2.31.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>2.23.0</version>
+        <version>2.31.1</version>
         <classifier>testlib</classifier>
       </dependency>
       <dependency>
@@ -3598,12 +3598,12 @@
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax</artifactId>
-        <version>2.23.0</version>
+        <version>2.31.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax</artifactId>
-        <version>2.23.0</version>
+        <version>2.31.1</version>
         <classifier>testlib</classifier>
       </dependency>
       <dependency>

diff --git a/generated-platform-project/quarkus/bom/pom.xml b/generated-platform-project/quarkus/bom/pom.xml
@@ -511,6 +511,16 @@
         <artifactId>proto-google-common-protos</artifactId>
         <version>2.23.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.api</groupId>
+        <artifactId>gax-grpc</artifactId>
+        <version>2.31.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.api</groupId>
+        <artifactId>gax</artifactId>
+        <version>2.31.1</version>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -188,6 +188,11 @@
                                     <dependency>io.quarkiverse.vault:quarkus-vault:${quarkus-vault.version}</dependency>
                                     <dependency>io.quarkiverse.vault:quarkus-vault-deployment:${quarkus-vault.version}</dependency>
                                     <dependency>io.quarkiverse.vault:quarkus-vault-model:${quarkus-vault.version}</dependency>
+                                    <!-- temporary enforce 2.23.0 until https://github.com/quarkusio/quarkus/pull/35283 makes its way in -->
+                                    <dependency>com.google.api.grpc:proto-google-common-protos:2.23.0</dependency>
+                                    <!-- temporary override of gax / gax-grpc versions to prevent it being aligned to the same version as proto-google-common-protos -->
+                                    <dependency>com.google.api:gax:2.31.1</dependency>
+                                    <dependency>com.google.api:gax-grpc:2.31.1</dependency>
                                 </dependencyManagement>
                                 <extensionGroupIds>
                                     <groupId>io.quarkus</groupId>