chore: http-client version deduplication (#1810)

googleapis · Jul 18, 2023 · c821635 · c821635
1 parent 392ad57
commit c821635
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml
@@ -29,6 +29,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.http-client</groupId>
+        <artifactId>google-http-client-bom</artifactId>
+        <version>${google.http-client.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>

diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
@@ -29,6 +29,7 @@
     <auto-value.version>1.10.1</auto-value.version>
     <grpc.version>1.55.3</grpc.version>
     <google.auth.version>1.19.0</google.auth.version>
+    <google.http-client.version>1.43.3</google.http-client.version>
     <gson.version>2.10.1</gson.version>
     <guava.version>32.1.1-jre</guava.version>
     <!--  On next protobuf upgrade (to 3.23.3 or higher),

diff --git a/gax-java/pom.xml b/gax-java/pom.xml
@@ -147,7 +147,7 @@
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-bom</artifactId>
-        <version>1.43.3</version>
+        <version>${google.http-client.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml
@@ -24,7 +24,6 @@
     <site.installationModule>${project.artifactId}</site.installationModule>
     <grpc-gcp.version>1.4.1</grpc-gcp.version>
     <gson.version>2.10.1</gson.version>
-    <google.http-client.version>1.43.3</google.http-client.version>
     <google.oauth-client.version>1.34.1</google.oauth-client.version>
     <google.api-client.version>2.2.0</google.api-client.version>
   </properties>
@@ -56,13 +55,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-bom</artifactId>
-        <version>${google.http-client.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client-bom</artifactId>