pom.xml: upgrade to version 1.22.0 of the Google API client libs
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/2c3c464f Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/2c3c464f Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/2c3c464f Branch: refs/heads/master Commit: 2c3c464f72f5b6d4badc23a5509ca9d260e719ed Parents: 03e9954 Author: Dan Halperin <dhalp...@google.com> Authored: Thu May 5 14:49:42 2016 -0700 Committer: Dan Halperin <dhalp...@google.com> Committed: Mon May 9 09:28:06 2016 -0700 ---------------------------------------------------------------------- pom.xml | 41 ++++++++++++++++---- .../main/resources/archetype-resources/pom.xml | 8 ++-- 2 files changed, 37 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2c3c464f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fda7a24..946222f 100644 --- a/pom.xml +++ b/pom.xml @@ -101,15 +101,15 @@ <!-- If updating dependencies, please update any relevant javadoc offlineLinks --> <avro.version>1.7.7</avro.version> - <bigquery.version>v2-rev292-1.21.0</bigquery.version> + <bigquery.version>v2-rev295-1.22.0</bigquery.version> <pubsubgrpc.version>0.0.2</pubsubgrpc.version> - <clouddebugger.version>v2-rev6-1.21.0</clouddebugger.version> - <dataflow.version>v1b3-rev22-1.21.0</dataflow.version> + <clouddebugger.version>v2-rev8-1.22.0</clouddebugger.version> + <dataflow.version>v1b3-rev26-1.22.0</dataflow.version> <dataflow.proto.version>0.5.160222</dataflow.proto.version> <datastore.version>v1beta2-rev1-4.0.0</datastore.version> <google-auto-service.version>1.0-rc2</google-auto-service.version> <google-auto-value.version>1.1</google-auto-value.version> - <google-clients.version>1.21.0</google-clients.version> + <google-clients.version>1.22.0</google-clients.version> <google-cloud-bigdataoss.version>1.4.3</google-cloud-bigdataoss.version> <google-cloud-dataflow-java-proto-library-all.version>0.5.160304</google-cloud-dataflow-java-proto-library-all.version> <guava.version>19.0</guava.version> @@ -121,10 +121,10 @@ <junit.version>4.11</junit.version> <mockito.version>1.9.5</mockito.version> <protobuf.version>3.0.0-beta-1</protobuf.version> - <pubsub.version>v1-rev7-1.21.0</pubsub.version> + <pubsub.version>v1-rev10-1.22.0</pubsub.version> <slf4j.version>1.7.14</slf4j.version> <stax2.version>3.1.4</stax2.version> - <storage.version>v1-rev53-1.21.0</storage.version> + <storage.version>v1-rev71-1.22.0</storage.version> <woodstox.version>4.4.1</woodstox.version> </properties> @@ -292,6 +292,30 @@ </dependency> <dependency> + <groupId>com.google.api-client</groupId> + <artifactId>google-api-client-jackson2</artifactId> + <version>${google-clients.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava-jdk5</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.google.api-client</groupId> + <artifactId>google-api-client-java6</artifactId> + <version>${google-clients.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava-jdk5</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> <groupId>com.google.oauth-client</groupId> <artifactId>google-oauth-client</artifactId> <version>${google-clients.version}</version> @@ -460,12 +484,13 @@ <dependency> <groupId>com.google.cloud.bigdataoss</groupId> - <artifactId>util</artifactId> + <artifactId>gcsio</artifactId> <version>${google-cloud-bigdataoss.version}</version> </dependency> + <dependency> <groupId>com.google.cloud.bigdataoss</groupId> - <artifactId>gcsio</artifactId> + <artifactId>util</artifactId> <version>${google-cloud-bigdataoss.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2c3c464f/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml index d3686cf..81af2dc 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml @@ -108,7 +108,7 @@ <dependency> <groupId>com.google.api-client</groupId> <artifactId>google-api-client</artifactId> - <version>1.21.0</version> + <version>1.22.0</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client --> @@ -123,7 +123,7 @@ <dependency> <groupId>com.google.apis</groupId> <artifactId>google-api-services-bigquery</artifactId> - <version>v2-rev248-1.21.0</version> + <version>v2-rev295-1.22.0</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client --> @@ -137,7 +137,7 @@ <dependency> <groupId>com.google.http-client</groupId> <artifactId>google-http-client</artifactId> - <version>1.21.0</version> + <version>1.22.0</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client --> @@ -151,7 +151,7 @@ <dependency> <groupId>com.google.apis</groupId> <artifactId>google-api-services-pubsub</artifactId> - <version>v1-rev7-1.21.0</version> + <version>v1-rev10-1.22.0</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client -->