From ce08e31c523a794633bf7cdbab7775417b326968 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 18 Nov 2024 12:39:28 +0000
Subject: [PATCH 1/4] deps: update dependency
 com.google.cloud:google-cloud-spanner-bom to v6.81.1

---
 pom.xml                          | 2 +-
 samples/spring-data-jdbc/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index cc596da03..b7581a103 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>
diff --git a/samples/spring-data-jdbc/pom.xml b/samples/spring-data-jdbc/pom.xml
index a87ad50e2..5882816eb 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>

From 1d89de55f3a60f4d217e6cb32ac9d1f3f5d77dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Mon, 18 Nov 2024 20:32:11 +0100
Subject: [PATCH 2/4] deps: move common dep up

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b7581a103..4e42ecfd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,12 +203,12 @@
     <!-- Add OpenTelemetry implementation and exporters for use in integration tests -->
     <dependency>
       <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk</artifactId>
+      <artifactId>opentelemetry-sdk-common</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-common</artifactId>
+      <artifactId>opentelemetry-sdk</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

From e6df56a259991fb266036d1ca5b4b7ba21da6e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Tue, 19 Nov 2024 18:58:33 +0100
Subject: [PATCH 3/4] deps: remove duplicate dependencies

---
 pom.xml                                       | 32 ++++++++++++-------
 .../spanner/jdbc/it/ITSingleJarTest.java      | 22 ++++++++++++-
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4e42ecfd1..091291dab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,39 +200,41 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- Add OpenTelemetry implementation and exporters for use in integration tests -->
+    <!--
+    Add OpenTelemetry implementation and exporters for use in integration tests.
+    They are added with compile scope, as the Spanner client requires these, and we do not want to
+    reduce the scope in the JDBC driver.
+     -->
     <dependency>
       <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-common</artifactId>
-      <scope>test</scope>
+      <artifactId>opentelemetry-context</artifactId>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk</artifactId>
-      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-common</artifactId>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-trace</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.cloud.opentelemetry</groupId>
       <artifactId>exporter-trace</artifactId>
-      <version>0.33.0</version>
-      <scope>test</scope>
+      <version>0.32.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-trace</artifactId>
-      <version>2.53.0</version>
-      <scope>test</scope>
+      <version>2.52.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-trace-v1</artifactId>
-      <version>2.53.0</version>
-      <scope>test</scope>
+      <version>2.52.0</version>
     </dependency>
 
   </dependencies>
@@ -361,7 +363,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 +373,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/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java b/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java
index 9ae8f6003..4b7890367 100644
--- a/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java
+++ b/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java
@@ -61,6 +61,7 @@ public void setup() {
 
   @Test
   public void testUseSingleJar() throws Exception {
+    // printDeps();
     buildSingleJar();
     buildMainClass();
     runTestApplication();
@@ -68,6 +69,7 @@ public void testUseSingleJar() throws Exception {
 
   @Test
   public void testUseShadedJar() throws Exception {
+    // printDeps();
     buildShadedJar();
     buildMainClass();
     runTestApplication();
@@ -91,6 +93,12 @@ private void runTestApplication() throws Exception {
     execute(builder);
   }
 
+  private void printDeps() throws Exception {
+    ProcessBuilder builder = new ProcessBuilder();
+    builder.command("mvn", "dependency:tree");
+    execute(builder, true);
+  }
+
   private void buildSingleJar() throws Exception {
     ProcessBuilder builder = new ProcessBuilder();
     builder.command("mvn", "clean", "package", "-DskipTests", "-Dalt.build.dir=./target/single");
@@ -116,11 +124,23 @@ private void buildMainClass() throws Exception {
   }
 
   private void execute(ProcessBuilder builder) throws Exception {
+    execute(builder, false);
+  }
+
+  private void execute(ProcessBuilder builder, boolean showOutput) throws Exception {
     Process process = builder.start();
-    String errors;
+    String errors, output = "";
     try (InputStreamReader reader = new InputStreamReader(process.getErrorStream())) {
       errors = CharStreams.toString(reader);
     }
+    if (showOutput) {
+      try (InputStreamReader reader = new InputStreamReader(process.getInputStream())) {
+        output = CharStreams.toString(reader);
+      }
+    }
     assertEquals(errors, 0, process.waitFor());
+    if (showOutput) {
+      System.out.print(output);
+    }
   }
 }

From c30d590ac7a43cfe00bc1999214f04050260c43f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Wed, 20 Nov 2024 14:28:41 +0100
Subject: [PATCH 4/4] deps: remove deps that are already in java-spanner

---
 pom.xml                                       | 25 +++----------------
 .../spanner/jdbc/it/ITSingleJarTest.java      | 22 +---------------
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/pom.xml b/pom.xml
index 091291dab..65479d8e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,41 +200,24 @@
       <scope>test</scope>
     </dependency>
 
-    <!--
-    Add OpenTelemetry implementation and exporters for use in integration tests.
-    They are added with compile scope, as the Spanner client requires these, and we do not want to
-    reduce the scope in the JDBC driver.
-     -->
-    <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-context</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-trace</artifactId>
-    </dependency>
+    <!-- Add OpenTelemetry implementation and exporters for use in integration tests. -->
     <dependency>
       <groupId>com.google.cloud.opentelemetry</groupId>
       <artifactId>exporter-trace</artifactId>
       <version>0.32.0</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-trace</artifactId>
       <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.52.0</version>
+      <scope>test</scope>
     </dependency>
 
   </dependencies>
diff --git a/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java b/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java
index 4b7890367..9ae8f6003 100644
--- a/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java
+++ b/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java
@@ -61,7 +61,6 @@ public void setup() {
 
   @Test
   public void testUseSingleJar() throws Exception {
-    // printDeps();
     buildSingleJar();
     buildMainClass();
     runTestApplication();
@@ -69,7 +68,6 @@ public void testUseSingleJar() throws Exception {
 
   @Test
   public void testUseShadedJar() throws Exception {
-    // printDeps();
     buildShadedJar();
     buildMainClass();
     runTestApplication();
@@ -93,12 +91,6 @@ private void runTestApplication() throws Exception {
     execute(builder);
   }
 
-  private void printDeps() throws Exception {
-    ProcessBuilder builder = new ProcessBuilder();
-    builder.command("mvn", "dependency:tree");
-    execute(builder, true);
-  }
-
   private void buildSingleJar() throws Exception {
     ProcessBuilder builder = new ProcessBuilder();
     builder.command("mvn", "clean", "package", "-DskipTests", "-Dalt.build.dir=./target/single");
@@ -124,23 +116,11 @@ private void buildMainClass() throws Exception {
   }
 
   private void execute(ProcessBuilder builder) throws Exception {
-    execute(builder, false);
-  }
-
-  private void execute(ProcessBuilder builder, boolean showOutput) throws Exception {
     Process process = builder.start();
-    String errors, output = "";
+    String errors;
     try (InputStreamReader reader = new InputStreamReader(process.getErrorStream())) {
       errors = CharStreams.toString(reader);
     }
-    if (showOutput) {
-      try (InputStreamReader reader = new InputStreamReader(process.getInputStream())) {
-        output = CharStreams.toString(reader);
-      }
-    }
     assertEquals(errors, 0, process.waitFor());
-    if (showOutput) {
-      System.out.print(output);
-    }
   }
 }