From ea331d4bb0738660a3e6e8de3c946219c2d7e36c Mon Sep 17 00:00:00 2001
From: Mike Prieto <michaelpri10@gmail.com>
Date: Wed, 27 Nov 2024 20:40:45 +0000
Subject: [PATCH 1/3] chore: Update OpenTelemetry semantic convention packages
 in the shared dependencies

---
 java-shared-dependencies/third-party-dependencies/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
index b8b06afc9a..4f914a262d 100644
--- a/java-shared-dependencies/third-party-dependencies/pom.xml
+++ b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -140,10 +140,15 @@
         <version>${opentelemetry-grpc-instrumentation.version}</version>
       </dependency>
       <dependency>
-        <groupId>io.opentelemetry</groupId>
+        <groupId>io.opentelemetry.semconv</groupId>
         <artifactId>opentelemetry-semconv</artifactId>
         <version>${opentelemetry-semconv.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.opentelemetry.semconv</groupId>
+        <artifactId>opentelemetry-semconv-incubating</artifactId>
+        <version>${opentelemetry-semconv.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud.opentelemetry</groupId>
         <artifactId>exporter-metrics</artifactId>

From 5bbeba5532552e2fcfdfc9987ff4335a2ac34925 Mon Sep 17 00:00:00 2001
From: Mike Prieto <mikeprieto@google.com>
Date: Fri, 24 Jan 2025 17:51:08 +0000
Subject: [PATCH 2/3] chore: Remove non-GA opentelemetry-semconv-incubating
 dependency

---
 java-shared-dependencies/third-party-dependencies/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
index 4f914a262d..f92e825197 100644
--- a/java-shared-dependencies/third-party-dependencies/pom.xml
+++ b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -144,11 +144,6 @@
         <artifactId>opentelemetry-semconv</artifactId>
         <version>${opentelemetry-semconv.version}</version>
       </dependency>
-      <dependency>
-        <groupId>io.opentelemetry.semconv</groupId>
-        <artifactId>opentelemetry-semconv-incubating</artifactId>
-        <version>${opentelemetry-semconv.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.cloud.opentelemetry</groupId>
         <artifactId>exporter-metrics</artifactId>

From 5d7e6fa6b21c00c0ae5c278a18acbbd26f634846 Mon Sep 17 00:00:00 2001
From: Mike Prieto <mikeprieto@google.com>
Date: Fri, 24 Jan 2025 18:09:33 +0000
Subject: [PATCH 3/3] chore: Re-add old semconv package dependency since the
 Pub/Sub library currently uses it

---
 java-shared-dependencies/third-party-dependencies/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
index 2606d75857..e2e7541d75 100644
--- a/java-shared-dependencies/third-party-dependencies/pom.xml
+++ b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -144,6 +144,11 @@
         <artifactId>opentelemetry-semconv</artifactId>
         <version>${opentelemetry-semconv.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-semconv</artifactId>
+        <version>${opentelemetry-semconv.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud.opentelemetry</groupId>
         <artifactId>exporter-metrics</artifactId>