Skip to content

Commit

Permalink
deps: upgrade to latest bom and remove dependency exclusions (#168)
Browse files Browse the repository at this point in the history
* deps: upgrade to latest bom + Spanner

* deps: spanner dependency first

* deps: remove ignored deps

* deps: libraries-bom-8
  • Loading branch information
olavloite committed Jun 25, 2020
1 parent 9e52d88 commit 291189c
Showing 1 changed file with 1 addition and 41 deletions.
42 changes: 1 addition & 41 deletions pom.xml
Expand Up @@ -59,7 +59,6 @@
<properties>
<site.installationModule>google-cloud-spanner-jdbc</site.installationModule>
<junit.version>4.13</junit.version>
<spanner.test.version>1.53.0</spanner.test.version>
<findbugs.version>3.0.2</findbugs.version>
<threeten.version>1.4.4</threeten.version>
<truth.version>1.0.1</truth.version>
Expand All @@ -72,7 +71,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>7.0.1</version>
<version>8.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -101,17 +100,6 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner</artifactId>
<!-- Excluded to prevent version conflicts -->
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core-grpc</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
Expand Down Expand Up @@ -166,33 +154,8 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner</artifactId>
<version>${spanner.test.version}</version>
<type>test-jar</type>
<scope>test</scope>
<!-- TODO: remove when Spanner 1.55.2 is released -->
<exclusions>
<exclusion>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
</exclusion>
<exclusion>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-util</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- TODO: remove when Spanner 1.55.2 is released -->
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
<version>0.24.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-util</artifactId>
<version>0.24.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
Expand Down Expand Up @@ -352,9 +315,6 @@
<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>
<!-- TODO: remove when Spanner 1.55.2 is released -->
<ignoredDependency>io.opencensus:opencensus-api</ignoredDependency>
<ignoredDependency>io.opencensus:opencensus-contrib-grpc-util</ignoredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
Expand Down

0 comments on commit 291189c

Please sign in to comment.