Skip to content

Commit c314bad

Browse files
deps: update dependency com.google.cloud:google-cloud-spanner-bom to v6.81.1 (googleapis#1821)
* 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 <[email protected]>
1 parent 2b5eb11 commit c314bad

File tree

2 files changed

+13
-22
lines changed

2 files changed

+13
-22
lines changed

pom.xml

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>com.google.cloud</groupId>
6363
<artifactId>google-cloud-spanner-bom</artifactId>
64-
<version>6.80.1</version>
64+
<version>6.81.1</version>
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>
@@ -200,38 +200,23 @@
200200
<scope>test</scope>
201201
</dependency>
202202

203-
<!-- Add OpenTelemetry implementation and exporters for use in integration tests -->
204-
<dependency>
205-
<groupId>io.opentelemetry</groupId>
206-
<artifactId>opentelemetry-sdk</artifactId>
207-
<scope>test</scope>
208-
</dependency>
209-
<dependency>
210-
<groupId>io.opentelemetry</groupId>
211-
<artifactId>opentelemetry-sdk-common</artifactId>
212-
<scope>test</scope>
213-
</dependency>
214-
<dependency>
215-
<groupId>io.opentelemetry</groupId>
216-
<artifactId>opentelemetry-sdk-trace</artifactId>
217-
<scope>test</scope>
218-
</dependency>
203+
<!-- Add OpenTelemetry implementation and exporters for use in integration tests. -->
219204
<dependency>
220205
<groupId>com.google.cloud.opentelemetry</groupId>
221206
<artifactId>exporter-trace</artifactId>
222-
<version>0.33.0</version>
207+
<version>0.32.0</version>
223208
<scope>test</scope>
224209
</dependency>
225210
<dependency>
226211
<groupId>com.google.cloud</groupId>
227212
<artifactId>google-cloud-trace</artifactId>
228-
<version>2.53.0</version>
213+
<version>2.52.0</version>
229214
<scope>test</scope>
230215
</dependency>
231216
<dependency>
232217
<groupId>com.google.api.grpc</groupId>
233218
<artifactId>proto-google-cloud-trace-v1</artifactId>
234-
<version>2.53.0</version>
219+
<version>2.52.0</version>
235220
<scope>test</scope>
236221
</dependency>
237222

@@ -361,7 +346,7 @@
361346
<ignoredUsedUndeclaredDependency>com.google.api.grpc:grpc-google-cloud-spanner-v1</ignoredUsedUndeclaredDependency>
362347
<ignoredUsedUndeclaredDependency>com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1</ignoredUsedUndeclaredDependency>
363348
<ignoredUsedUndeclaredDependency>com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1</ignoredUsedUndeclaredDependency>
364-
<ignoredUsedUndeclaredDependency>io.opentelemetry:opentelemetry-api-incubator</ignoredUsedUndeclaredDependency>
349+
<ignoredUsedUndeclaredDependency>io.opentelemetry:*</ignoredUsedUndeclaredDependency>
365350
</ignoredUsedUndeclaredDependencies>
366351
<ignoredUnusedDeclaredDependencies>
367352
<!-- TODO: Remove grpc-alts from ignored list once it has been removed from java-spanner -->
@@ -371,7 +356,13 @@
371356
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-v1</ignoredDependency>
372357
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1</ignoredDependency>
373358
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1</ignoredDependency>
359+
<ignoredDependency>io.opentelemetry:*</ignoredDependency>
374360
</ignoredUnusedDeclaredDependencies>
361+
<ignoredNonTestScopedDependencies>
362+
<ignoredDependency>io.opentelemetry:*</ignoredDependency>
363+
<ignoredDependency>com.google.cloud:google-cloud-trace</ignoredDependency>
364+
<ignoredDependency>com.google.cloud.opentelemetry:exporter-trace</ignoredDependency>
365+
</ignoredNonTestScopedDependencies>
375366
</configuration>
376367
</plugin>
377368
</plugins>

samples/spring-data-jdbc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>com.google.cloud</groupId>
3232
<artifactId>google-cloud-spanner-bom</artifactId>
33-
<version>6.80.1</version>
33+
<version>6.81.1</version>
3434
<scope>import</scope>
3535
<type>pom</type>
3636
</dependency>

0 commit comments

Comments
 (0)