Skip to content

Commit 2d529dc

Browse files
chore(deps): update dependency com.google.cloud:libraries-bom to v6 (#156)
* chore(deps): update dependency com.google.cloud:libraries-bom to v6 * deps: also update Spanner test version * deps: exclude opencensus-api from test jar dep Exclude the opencensus-api dependency from the test-jar for now, until the test jar version is included in the bom (from Spanner version 1.55.2). * deps: exclude all opencensus deps from test-jar * deps: list all exclusions * deps: exclude transitive dep and add specific * deps: add ignore unused dependencies Co-authored-by: Knut Olav Løite <[email protected]>
1 parent 9b53df4 commit 2d529dc

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

pom.xml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>com.google.cloud</groupId>
7474
<artifactId>libraries-bom</artifactId>
75-
<version>5.3.0</version>
75+
<version>6.0.0</version>
7676
<type>pom</type>
7777
<scope>import</scope>
7878
</dependency>
@@ -168,6 +168,30 @@
168168
<version>${spanner.test.version}</version>
169169
<type>test-jar</type>
170170
<scope>test</scope>
171+
<!-- TODO: remove when Spanner 1.55.2 is released -->
172+
<exclusions>
173+
<exclusion>
174+
<groupId>io.opencensus</groupId>
175+
<artifactId>opencensus-api</artifactId>
176+
</exclusion>
177+
<exclusion>
178+
<groupId>io.opencensus</groupId>
179+
<artifactId>opencensus-contrib-grpc-util</artifactId>
180+
</exclusion>
181+
</exclusions>
182+
</dependency>
183+
<!-- TODO: remove when Spanner 1.55.2 is released -->
184+
<dependency>
185+
<groupId>io.opencensus</groupId>
186+
<artifactId>opencensus-api</artifactId>
187+
<version>0.24.0</version>
188+
<scope>test</scope>
189+
</dependency>
190+
<dependency>
191+
<groupId>io.opencensus</groupId>
192+
<artifactId>opencensus-contrib-grpc-util</artifactId>
193+
<version>0.24.0</version>
194+
<scope>test</scope>
171195
</dependency>
172196
<dependency>
173197
<groupId>com.google.api.grpc</groupId>
@@ -322,6 +346,9 @@
322346
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-v1</ignoredDependency>
323347
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1</ignoredDependency>
324348
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1</ignoredDependency>
349+
<!-- TODO: remove when Spanner 1.55.2 is released -->
350+
<ignoredDependency>io.opencensus:opencensus-api</ignoredDependency>
351+
<ignoredDependency>io.opencensus:opencensus-contrib-grpc-util</ignoredDependency>
325352
</ignoredUnusedDeclaredDependencies>
326353
</configuration>
327354
</plugin>

samples/snippets/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>libraries-bom</artifactId>
33-
<version>5.4.0</version>
33+
<version>6.0.0</version>
3434
<type>pom</type>
3535
<scope>import</scope>
3636
</dependency>

0 commit comments

Comments
 (0)