From 37337cc337be296eeb3deb2f63ef1d58f443011c Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Sun, 5 May 2024 22:24:41 -0400
Subject: [PATCH] fix: opentelemetry-bom to be in third-party-dependencies BOM

Importing opentelemetry-bom in gapic-generator-java-bom wrongly
implies that we (Google) publish the OpenTelemetry artifacts.

https://jlbp.dev/JLBP-15 states:
  Your project's BOM should not include any of your dependencies
  on other libraries.

In this change, the opentelemetry-bom is declared in the third-
party-dependencies BOM and thus will be excluded in the Google
Cloud Libraries BOM.
---
 gapic-generator-java-bom/pom.xml                    |  7 -------
 .../third-party-dependencies/pom.xml                | 13 ++++++++++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml
index 5f42b26a91..ea55047998 100644
--- a/gapic-generator-java-bom/pom.xml
+++ b/gapic-generator-java-bom/pom.xml
@@ -70,13 +70,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>io.opentelemetry</groupId>
-        <artifactId>opentelemetry-bom</artifactId>
-        <version>${opentelemetry.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
 
       <!-- Libraries published from this repositories -->
       <dependency>
diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
index 49b0078784..e6dccf5fd2 100644
--- a/java-shared-dependencies/third-party-dependencies/pom.xml
+++ b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -125,9 +125,16 @@
         <version>${codec.version}</version>
       </dependency>
       <dependency>
-       <groupId>io.opentelemetry.instrumentation</groupId>
-       <artifactId>opentelemetry-grpc-1.6</artifactId>
-       <version>${opentelemetry-grpc-instrumentation.version}</version>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-bom</artifactId>
+        <version>${opentelemetry.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.opentelemetry.instrumentation</groupId>
+        <artifactId>opentelemetry-grpc-1.6</artifactId>
+        <version>${opentelemetry-grpc-instrumentation.version}</version>
       </dependency>
 
       <!-- TODO: replace with opencensus-bom when available -->