You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/03/01 19:47:01 UTC
[1/2] incubator-beam git commit: Exclude old version of Google API
client libraries
Repository: incubator-beam
Updated Branches:
refs/heads/apache/master [created] a2d86775f
Exclude old version of Google API client libraries
Our com.google.apis:google-api-services-datastore-protobuf dependency
has a transitive dependency on a very old Google API client library.
This change suppresses that dependency and replaces it by depending
on a version that matches our other API dependencies.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/d92e83a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/d92e83a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/d92e83a5
Branch: refs/heads/apache/master
Commit: d92e83a589724cc7d972f1f9e2b9395cb67dcf55
Parents: 211e76a
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon Feb 29 23:11:42 2016 -0800
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Feb 29 23:11:42 2016 -0800
----------------------------------------------------------------------
sdk/pom.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d92e83a5/sdk/pom.xml
----------------------------------------------------------------------
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 4995da0..c49c175 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -544,6 +544,28 @@
</exclusions>
</dependency>
+ <!-- Required by com.google.apis:google-api-services-datastore-protobuf,
+ but the version they depend on differs from our api-client versions -->
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-jackson</artifactId>
+ <version>${google-clients.version}</version>
+ <exclusions>
+ <!-- Exclude an old version of guava that is being pulled
+ in by a transitive dependency of google-api-client -->
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava-jdk5</artifactId>
+ </exclusion>
+ <!-- Exclude an old version of jackson-core-asl -->
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson2</artifactId>
@@ -559,6 +581,21 @@
</dependency>
<dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-protobuf</artifactId>
+ <version>${google-clients.version}</version>
+ <exclusions>
+ <!-- Exclude an old version of guava that is being pulled
+ in by a transitive dependency of google-api-client -->
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava-jdk5</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-java6</artifactId>
<version>${google-clients.version}</version>
@@ -597,6 +634,27 @@
<groupId>com.google.guava</groupId>
<artifactId>guava-jdk5</artifactId>
</exclusion>
+ <!-- Exclude old version of api client dependencies. -->
+ <exclusion>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api-client</groupId>
+ <artifactId>google-api-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.oauth-client</groupId>
+ <artifactId>google-oauth-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-jackson</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-protobuf</artifactId>
+ </exclusion>
</exclusions>
</dependency>
[2/2] incubator-beam git commit: This closes #7
Posted by lc...@apache.org.
This closes #7
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/a2d86775
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/a2d86775
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/a2d86775
Branch: refs/heads/apache/master
Commit: a2d86775f00ec03750e1c463f3adcc09c4e93e35
Parents: 211e76a d92e83a
Author: Luke Cwik <lc...@google.com>
Authored: Tue Mar 1 10:42:05 2016 -0800
Committer: Luke Cwik <lc...@google.com>
Committed: Tue Mar 1 10:42:05 2016 -0800
----------------------------------------------------------------------
sdk/pom.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
----------------------------------------------------------------------