Repository: beam Updated Branches: refs/heads/master 6fedd7fba -> d565f12ed
[BEAM-1881] Exclude protobuf-lite and replace with protobuf-java They are not compatible; protobuf-lite is only intended for use with Android. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/852ee762 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/852ee762 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/852ee762 Branch: refs/heads/master Commit: 852ee76249f11d9e9eeb72619d42446ead8d37fb Parents: 6fedd7f Author: Dan Halperin <[email protected]> Authored: Wed Apr 5 09:05:11 2017 -0700 Committer: Dan Halperin <[email protected]> Committed: Wed Apr 5 14:37:22 2017 -0700 ---------------------------------------------------------------------- pom.xml | 17 +++++++++++------ runners/google-cloud-dataflow-java/pom.xml | 6 ------ sdks/java/core/pom.xml | 8 +------- sdks/java/harness/pom.xml | 5 ----- sdks/java/io/google-cloud-platform/pom.xml | 5 ----- sdks/java/io/hbase/pom.xml | 13 +------------ 6 files changed, 13 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/852ee762/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5e1da8f..4ecfdd7 100644 --- a/pom.xml +++ b/pom.xml @@ -534,12 +534,12 @@ <groupId>io.grpc</groupId> <artifactId>grpc-protobuf-lite</artifactId> <version>${grpc.version}</version> - </dependency> - - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-lite</artifactId> - <version>3.0.1</version> + <exclusions> + <exclusion> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-lite</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -1537,6 +1537,11 @@ <!-- Keep aligned with preqrequisite section below. --> <version>[3.2,)</version> </requireMavenVersion> + <bannedDependencies> + <excludes> + <exclude>com.google.protobuf:protobuf-lite</exclude> + </excludes> + </bannedDependencies> </rules> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/beam/blob/852ee762/runners/google-cloud-dataflow-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml index 4d25ecf..fe531c7 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -256,12 +256,6 @@ </dependency> <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-lite</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/beam/blob/852ee762/sdks/java/core/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index 40da374..d117d5a 100644 --- a/sdks/java/core/pom.xml +++ b/sdks/java/core/pom.xml @@ -169,13 +169,7 @@ <dependency> <groupId>io.grpc</groupId> - <artifactId>grpc-protobuf-lite</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-lite</artifactId> + <artifactId>grpc-protobuf</artifactId> <scope>runtime</scope> </dependency> http://git-wip-us.apache.org/repos/asf/beam/blob/852ee762/sdks/java/harness/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/harness/pom.xml b/sdks/java/harness/pom.xml index 84eef5e..3d14401 100644 --- a/sdks/java/harness/pom.xml +++ b/sdks/java/harness/pom.xml @@ -115,11 +115,6 @@ <dependency> <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-lite</artifactId> - </dependency> - - <dependency> - <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/beam/blob/852ee762/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 0d4f023..f784e27 100644 --- a/sdks/java/io/google-cloud-platform/pom.xml +++ b/sdks/java/io/google-cloud-platform/pom.xml @@ -149,11 +149,6 @@ </dependency> <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-lite</artifactId> - </dependency> - - <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-core</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/beam/blob/852ee762/sdks/java/io/hbase/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/hbase/pom.xml b/sdks/java/io/hbase/pom.xml index 612742b..1561600 100644 --- a/sdks/java/io/hbase/pom.xml +++ b/sdks/java/io/hbase/pom.xml @@ -81,17 +81,6 @@ <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-sdks-java-core</artifactId> - <exclusions> - <!-- exclude beam version of protobuf --> - <exclusion> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-lite</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -112,7 +101,7 @@ <dependency> <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-lite</artifactId> + <artifactId>protobuf-java</artifactId> </dependency> <dependency>
