merlimat closed pull request #1846: Fix grpc version conflicts in pulsar binary
distribution
URL: https://github.com/apache/incubator-pulsar/pull/1846
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/all/pom.xml b/all/pom.xml
index 0a9d289fde..23a386f28c 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -118,6 +118,12 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-functions-worker</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- runtime-all -->
@@ -127,6 +133,18 @@
<version>${project.version}</version>
<!-- make sure the api examples are compiled before assembly -->
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- grpc -->
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-all</artifactId>
</dependency>
</dependencies>
diff --git a/all/src/assemble/bin.xml b/all/src/assemble/bin.xml
index 317982aa1c..bdbbf1bf19 100644
--- a/all/src/assemble/bin.xml
+++ b/all/src/assemble/bin.xml
@@ -105,18 +105,20 @@
<excludes>
<!-- All these dependencies are already included in netty-all -->
+ <exclude>io.netty:netty-buffer</exclude>
<exclude>io.netty:netty-common</exclude>
- <exclude>io.netty:netty-resolver</exclude>
- <exclude>io.netty:netty-resolver-dns</exclude>
+ <exclude>io.netty:netty-codec</exclude>
<exclude>io.netty:netty-codec-dns</exclude>
- <exclude>io.netty:netty-transport-native-unix-common</exclude>
- <exclude>io.netty:netty-buffer</exclude>
<exclude>io.netty:netty-codec-http</exclude>
- <exclude>io.netty:netty-codec</exclude>
- <exclude>io.netty:netty-transport</exclude>
+ <exclude>io.netty:netty-codec-http2</exclude>
+ <exclude>io.netty:netty-codec-socks</exclude>
<exclude>io.netty:netty-handler</exclude>
+ <exclude>io.netty:netty-handler-proxy</exclude>
+ <exclude>io.netty:netty-resolver</exclude>
+ <exclude>io.netty:netty-resolver-dns</exclude>
+ <exclude>io.netty:netty-transport</exclude>
<exclude>io.netty:netty-transport-native-epoll</exclude>
- <exclude>io.netty:netty-codec-http</exclude>
+ <exclude>io.netty:netty-transport-native-unix-common</exclude>
<!-- Already included in pulsar-zookeeper instrumented jar -->
<exclude>org.apache.zookeeper:zookeeper</exclude>
diff --git a/pom.xml b/pom.xml
index a59c94f7fe..a63515a740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -718,6 +718,18 @@ flexible messaging model and an intuitive client
API.</description>
<version>${grpc.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf-lite</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
