From 89ee8228ac242e6b6441d79e8cb32f1df96ce869 Mon Sep 17 00:00:00 2001 From: Vikas Kedia <vikas.kedia@gmail.com> Date: Thu, 15 Feb 2018 15:01:27 -0800 Subject: [PATCH 1/2] Depend on shaded spanner --- spanner/cloud-client/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml index 9a7bc82d9c8..d56b2eb9d57 100644 --- a/spanner/cloud-client/pom.xml +++ b/spanner/cloud-client/pom.xml @@ -52,7 +52,8 @@ limitations under the License. <dependency> <groupId>com.google.cloud</groupId> <artifactId>google-cloud-spanner</artifactId> - <version>0.26.0-beta</version> + <version>0.34.1-beta-SNAPSHOT</version> + <classifier>shaded</classifier> <exclusions> <exclusion> <!-- exclude an old version of Guava --> <groupId>com.google.guava</groupId> From bd9e2ced50e72b7fde5b576015d42cf60504ff3e Mon Sep 17 00:00:00 2001 From: Vikas Kedia <vikas.kedia@gmail.com> Date: Fri, 16 Feb 2018 16:47:15 -0800 Subject: [PATCH 2/2] Use google-cloud bom --- spanner/cloud-client/pom.xml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml index e1ca15a302b..cc8c367efeb 100644 --- a/spanner/cloud-client/pom.xml +++ b/spanner/cloud-client/pom.xml @@ -40,8 +40,6 @@ limitations under the License. <dependency> <groupId>com.google.cloud</groupId> <artifactId>google-cloud-spanner</artifactId> - <version>0.34.1-beta-SNAPSHOT</version> - <classifier>shaded</classifier> <exclusions> <exclusion> <groupId>com.google.guava</groupId> @@ -79,17 +77,37 @@ limitations under the License. <groupId>io.opencensus</groupId> <artifactId>opencensus-exporter-trace-stackdriver</artifactId> <version>${opencensus.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-trace</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>io.opencensus</groupId> <artifactId>opencensus-exporter-stats-stackdriver</artifactId> <version>${opencensus.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-monitoring</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>io.opencensus</groupId> <artifactId>opencensus-contrib-grpc-metrics</artifactId> <version>${opencensus.version}</version> </dependency> + <dependency> + <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-trace</artifactId> + </dependency> + <dependency> + <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-monitoring</artifactId> + </dependency> <!-- Test dependencies --> <dependency> @@ -104,9 +122,18 @@ limitations under the License. <version>0.39</version> <scope>test</scope> </dependency> - </dependencies> - + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-bom</artifactId> + <version>0.34.0-alpha</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> <build> <plugins> <plugin>