From c314bada6f631020cbf0a956c0b4d3ddd2c1b9cb Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 20 Nov 2024 16:25:24 +0100
Subject: [PATCH] deps: update dependency
 com.google.cloud:google-cloud-spanner-bom to v6.81.1 (#1821)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* deps: update dependency com.google.cloud:google-cloud-spanner-bom to v6.81.1

* deps: move common dep up

* deps: remove duplicate dependencies

* deps: remove deps that are already in java-spanner

---------

Co-authored-by: Knut Olav Løite <koloite@gmail.com>
---
 pom.xml                          | 33 ++++++++++++--------------------
 samples/spring-data-jdbc/pom.xml |  2 +-
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index cc596da0..65479d8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-spanner-bom</artifactId>
-        <version>6.80.1</version>
+        <version>6.81.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -200,38 +200,23 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- Add OpenTelemetry implementation and exporters for use in integration tests -->
-    <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-common</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-trace</artifactId>
-      <scope>test</scope>
-    </dependency>
+    <!-- Add OpenTelemetry implementation and exporters for use in integration tests. -->
     <dependency>
       <groupId>com.google.cloud.opentelemetry</groupId>
       <artifactId>exporter-trace</artifactId>
-      <version>0.33.0</version>
+      <version>0.32.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-trace</artifactId>
-      <version>2.53.0</version>
+      <version>2.52.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-trace-v1</artifactId>
-      <version>2.53.0</version>
+      <version>2.52.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -361,7 +346,7 @@
               <ignoredUsedUndeclaredDependency>com.google.api.grpc:grpc-google-cloud-spanner-v1</ignoredUsedUndeclaredDependency>
               <ignoredUsedUndeclaredDependency>com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1</ignoredUsedUndeclaredDependency>
               <ignoredUsedUndeclaredDependency>com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1</ignoredUsedUndeclaredDependency>
-              <ignoredUsedUndeclaredDependency>io.opentelemetry:opentelemetry-api-incubator</ignoredUsedUndeclaredDependency>
+              <ignoredUsedUndeclaredDependency>io.opentelemetry:*</ignoredUsedUndeclaredDependency>
             </ignoredUsedUndeclaredDependencies>
             <ignoredUnusedDeclaredDependencies>
               <!-- TODO: Remove grpc-alts from ignored list once it has been removed from java-spanner -->
@@ -371,7 +356,13 @@
               <ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-v1</ignoredDependency>
               <ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1</ignoredDependency>
               <ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1</ignoredDependency>
+              <ignoredDependency>io.opentelemetry:*</ignoredDependency>
             </ignoredUnusedDeclaredDependencies>
+            <ignoredNonTestScopedDependencies>
+              <ignoredDependency>io.opentelemetry:*</ignoredDependency>
+              <ignoredDependency>com.google.cloud:google-cloud-trace</ignoredDependency>
+              <ignoredDependency>com.google.cloud.opentelemetry:exporter-trace</ignoredDependency>
+            </ignoredNonTestScopedDependencies>
           </configuration>
         </plugin>
       </plugins>
diff --git a/samples/spring-data-jdbc/pom.xml b/samples/spring-data-jdbc/pom.xml
index a87ad50e..5882816e 100644
--- a/samples/spring-data-jdbc/pom.xml
+++ b/samples/spring-data-jdbc/pom.xml
@@ -30,7 +30,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-spanner-bom</artifactId>
-        <version>6.80.1</version>
+        <version>6.81.1</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>