Fix spanner dependency management Also minor cleanup alphabetization in root pom.xml
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/8871eadc Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/8871eadc Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/8871eadc Branch: refs/heads/master Commit: 8871eadcc8413dab906656806b54f3d73b24893d Parents: e53dc91 Author: Dan Halperin <dhalp...@google.com> Authored: Thu May 4 10:48:54 2017 -0700 Committer: Dan Halperin <dhalp...@google.com> Committed: Wed May 24 14:12:52 2017 -0700 ---------------------------------------------------------------------- pom.xml | 22 +++++++++++++++++++--- sdks/java/io/google-cloud-platform/pom.xml | 8 +++++--- 2 files changed, 24 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/8871eadc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3a6289d..c3a6b73 100644 --- a/pom.xml +++ b/pom.xml @@ -115,11 +115,13 @@ <dataflow.proto.version>0.5.160222</dataflow.proto.version> <datastore.client.version>1.4.0</datastore.client.version> <datastore.proto.version>1.3.0</datastore.proto.version> + <google-api-common.version>1.0.0-rc2</google-api-common.version> <google-auto-service.version>1.0-rc2</google-auto-service.version> <google-auto-value.version>1.4.1</google-auto-value.version> <google-auth.version>0.6.1</google-auth.version> <google-clients.version>1.22.0</google-clients.version> <google-cloud-bigdataoss.version>1.4.5</google-cloud-bigdataoss.version> + <google-cloud-core.version>1.0.2</google-cloud-core.version> <google-cloud-dataflow-java-proto-library-all.version>0.5.160304</google-cloud-dataflow-java-proto-library-all.version> <guava.version>20.0</guava.version> <grpc.version>1.2.0</grpc.version> @@ -132,18 +134,20 @@ <mockito.version>1.9.5</mockito.version> <netty.version>4.1.8.Final</netty.version> <netty.tcnative.version>1.1.33.Fork26</netty.tcnative.version> - <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version> <protobuf.version>3.2.0</protobuf.version> <pubsub.version>v1-rev10-1.22.0</pubsub.version> <slf4j.version>1.7.14</slf4j.version> + <spanner.version>0.16.0-beta</spanner.version> <spark.version>1.6.2</spark.version> + <spring.version>4.3.5.RELEASE</spring.version> <stax2.version>3.1.4</stax2.version> <storage.version>v1-rev71-1.22.0</storage.version> <woodstox.version>4.4.1</woodstox.version> - <spanner.version>0.16.0-beta</spanner.version> <spring.version>4.3.5.RELEASE</spring.version> - <groovy-maven-plugin.version>2.0</groovy-maven-plugin.version> <snappy-java.version>1.1.4-M3</snappy-java.version> + + <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version> + <groovy-maven-plugin.version>2.0</groovy-maven-plugin.version> <surefire-plugin.version>2.20</surefire-plugin.version> <failsafe-plugin.version>2.20</failsafe-plugin.version> <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version> @@ -611,6 +615,12 @@ </dependency> <dependency> + <groupId>com.google.api</groupId> + <artifactId>api-common</artifactId> + <version>${google-api-common.version}</version> + </dependency> + + <dependency> <groupId>com.google.api-client</groupId> <artifactId>google-api-client</artifactId> <version>${google-clients.version}</version> @@ -869,6 +879,12 @@ <dependency> <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-core</artifactId> + <version>${google-cloud-core.version}</version> + </dependency> + + <dependency> + <groupId>com.google.cloud</groupId> <artifactId>google-cloud-spanner</artifactId> <version>${spanner.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/beam/blob/8871eadc/sdks/java/io/google-cloud-platform/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml index 2181895..9143ccf 100644 --- a/sdks/java/io/google-cloud-platform/pom.xml +++ b/sdks/java/io/google-cloud-platform/pom.xml @@ -89,7 +89,6 @@ <dependency> <groupId>com.google.api.grpc</groupId> <artifactId>grpc-google-common-protos</artifactId> - <version>${grpc-google-common-protos.version}</version> </dependency> <dependency> @@ -100,7 +99,6 @@ <dependency> <groupId>com.google.api</groupId> <artifactId>api-common</artifactId> - <version>${api-common.version}</version> </dependency> <dependency> @@ -163,8 +161,12 @@ <dependency> <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-core</artifactId> + </dependency> + + <dependency> + <groupId>com.google.cloud</groupId> <artifactId>google-cloud-spanner</artifactId> - <version>${spanner.version}</version> </dependency> <dependency>