You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2020/10/14 07:29:28 UTC
[pulsar] 02/04: Exclude vertx from bookkeeper-http package (#7997)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit b4b3eccd62c412b420e6eaa941af082366fbd4f1
Author: 冉小龙 <rx...@apache.org>
AuthorDate: Tue Sep 8 16:05:39 2020 +0800
Exclude vertx from bookkeeper-http package (#7997)
Signed-off-by: xiaolong.ran <rx...@apache.org>
### Motivation
```
$ mvn dependency:tree|grep vertx
```
Output:
```
[INFO] +- org.apache.bookkeeper.http:vertx-http-server:jar:4.10.0:compile
[INFO] +- io.vertx:vertx-core:jar:3.5.3:compile
[INFO] +- io.vertx:vertx-web:jar:3.5.3:compile
[INFO] | +- io.vertx:vertx-auth-common:jar:3.5.3:compile
[INFO] | \- io.vertx:vertx-bridge-common:jar:3.5.3:compile
[INFO] | +- org.apache.bookkeeper.http:vertx-http-server:jar:4.10.0:provided
[INFO] | +- io.vertx:vertx-core:jar:3.5.3:provided
[INFO] | \- io.vertx:vertx-web:jar:3.5.3:provided
[INFO] | +- io.vertx:vertx-auth-common:jar:3.5.3:provided
[INFO] | \- io.vertx:vertx-bridge-common:jar:3.5.3:provided
```
### Modifications
- exclude `vertx` from bookkeeper-http package and include vertx of `3.5.3` to `vertx-http-server`
(cherry picked from commit 98233c097fe0f07d637223c918c2c4a04c77b7f4)
---
distribution/server/pom.xml | 33 ++++++++++++++++++++++++
distribution/server/src/assemble/LICENSE.bin.txt | 7 ++---
pom.xml | 1 +
3 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
index 2088c13..042575a 100644
--- a/distribution/server/pom.xml
+++ b/distribution/server/pom.xml
@@ -192,8 +192,41 @@
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <!--TODO: When pulsar uses https://github.com/apache/bookkeeper/pull/2410 in -->
+ <!-- the next bk version, please remove the following content.-->
+ <exclusion>
+ <groupId>io.vertx</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--TODO: When pulsar uses https://github.com/apache/bookkeeper/pull/2410 in -->
+ <!-- the next bk version, please remove the following content.-->
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-core</artifactId>
+ <version>${vertx.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-web</artifactId>
+ <version>${vertx.version}</version>
+ </dependency>
+
</dependencies>
<build>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 632c604..a273f43 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -502,9 +502,10 @@ The Apache Software License, Version 2.0
* JCTools - Java Concurrency Tools for the JVM
- org.jctools-jctools-core-2.1.2.jar
* Vertx
- - io.vertx-vertx-auth-common-3.4.1.jar
- - io.vertx-vertx-core-3.4.1.jar
- - io.vertx-vertx-web-3.4.1.jar
+ - io.vertx-vertx-auth-common-3.5.3.jar
+ - io.vertx-vertx-bridge-common-3.5.3.jar
+ - io.vertx-vertx-core-3.5.3.jar
+ - io.vertx-vertx-web-3.5.3.jar
* Apache ZooKeeper
- org.apache.zookeeper-zookeeper-jute-3.5.7.jar
diff --git a/pom.xml b/pom.xml
index a984502..d828d2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,6 +165,7 @@ flexible messaging model and an intuitive client API.</description>
<athenz.version>1.8.38</athenz.version>
<prometheus.version>0.5.0</prometheus.version>
<aspectj.version>1.9.2</aspectj.version>
+ <vertx.version>3.5.3</vertx.version>
<rocksdb.version>5.13.3</rocksdb.version>
<slf4j.version>1.7.25</slf4j.version>
<commons.collections.version>3.2.2</commons.collections.version>