Skip to content

Commit 291189c

Browse files
authored
deps: upgrade to latest bom and remove dependency exclusions (#168)
* deps: upgrade to latest bom + Spanner * deps: spanner dependency first * deps: remove ignored deps * deps: libraries-bom-8
1 parent 9e52d88 commit 291189c

File tree

1 file changed

+1
-41
lines changed

1 file changed

+1
-41
lines changed

pom.xml

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<properties>
6060
<site.installationModule>google-cloud-spanner-jdbc</site.installationModule>
6161
<junit.version>4.13</junit.version>
62-
<spanner.test.version>1.53.0</spanner.test.version>
6362
<findbugs.version>3.0.2</findbugs.version>
6463
<threeten.version>1.4.4</threeten.version>
6564
<truth.version>1.0.1</truth.version>
@@ -72,7 +71,7 @@
7271
<dependency>
7372
<groupId>com.google.cloud</groupId>
7473
<artifactId>libraries-bom</artifactId>
75-
<version>7.0.1</version>
74+
<version>8.0.0</version>
7675
<type>pom</type>
7776
<scope>import</scope>
7877
</dependency>
@@ -101,17 +100,6 @@
101100
<dependency>
102101
<groupId>com.google.cloud</groupId>
103102
<artifactId>google-cloud-spanner</artifactId>
104-
<!-- Excluded to prevent version conflicts -->
105-
<exclusions>
106-
<exclusion>
107-
<groupId>io.grpc</groupId>
108-
<artifactId>grpc-api</artifactId>
109-
</exclusion>
110-
<exclusion>
111-
<groupId>com.google.cloud</groupId>
112-
<artifactId>google-cloud-core-grpc</artifactId>
113-
</exclusion>
114-
</exclusions>
115103
</dependency>
116104
<dependency>
117105
<groupId>com.google.protobuf</groupId>
@@ -166,33 +154,8 @@
166154
<dependency>
167155
<groupId>com.google.cloud</groupId>
168156
<artifactId>google-cloud-spanner</artifactId>
169-
<version>${spanner.test.version}</version>
170157
<type>test-jar</type>
171158
<scope>test</scope>
172-
<!-- TODO: remove when Spanner 1.55.2 is released -->
173-
<exclusions>
174-
<exclusion>
175-
<groupId>io.opencensus</groupId>
176-
<artifactId>opencensus-api</artifactId>
177-
</exclusion>
178-
<exclusion>
179-
<groupId>io.opencensus</groupId>
180-
<artifactId>opencensus-contrib-grpc-util</artifactId>
181-
</exclusion>
182-
</exclusions>
183-
</dependency>
184-
<!-- TODO: remove when Spanner 1.55.2 is released -->
185-
<dependency>
186-
<groupId>io.opencensus</groupId>
187-
<artifactId>opencensus-api</artifactId>
188-
<version>0.24.0</version>
189-
<scope>test</scope>
190-
</dependency>
191-
<dependency>
192-
<groupId>io.opencensus</groupId>
193-
<artifactId>opencensus-contrib-grpc-util</artifactId>
194-
<version>0.24.0</version>
195-
<scope>test</scope>
196159
</dependency>
197160
<dependency>
198161
<groupId>com.google.api.grpc</groupId>
@@ -352,9 +315,6 @@
352315
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-v1</ignoredDependency>
353316
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1</ignoredDependency>
354317
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1</ignoredDependency>
355-
<!-- TODO: remove when Spanner 1.55.2 is released -->
356-
<ignoredDependency>io.opencensus:opencensus-api</ignoredDependency>
357-
<ignoredDependency>io.opencensus:opencensus-contrib-grpc-util</ignoredDependency>
358318
</ignoredUnusedDeclaredDependencies>
359319
</configuration>
360320
</plugin>

0 commit comments

Comments
 (0)