Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 12 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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 -->
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/spring-data-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading