You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2019/05/29 16:07:42 UTC
[pulsar] branch master updated: Use same activation dependency in
pulsar-client-admin and pulsar-client (#4256)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 59705a8 Use same activation dependency in pulsar-client-admin and pulsar-client (#4256)
59705a8 is described below
commit 59705a8ac6cc40c7950c83c42d94bb93a82638ac
Author: Kim Christian Gaarder <ki...@gmail.com>
AuthorDate: Wed May 29 18:07:37 2019 +0200
Use same activation dependency in pulsar-client-admin and pulsar-client (#4256)
* Use same activation dependency in pulsar-client-admin and pulsar-client
* Broker now resolve to same activation dependency as client
* Remove no-longer used activation entries from distribution license
* exclude conflicting activation dependency and update license
* com.sun.activation as only activation dependency in all pulsar modules
* Removed activation-1.1.1.jar reference from presto LICENSE
---
distribution/server/src/assemble/LICENSE.bin.txt | 2 --
pom.xml | 6 +++---
pulsar-broker/pom.xml | 10 ++++++++--
pulsar-client-admin/pom.xml | 24 +++++++++++++++---------
pulsar-discovery-service/pom.xml | 4 ++--
pulsar-proxy/pom.xml | 18 +++++++++---------
pulsar-sql/presto-distribution/LICENSE | 3 ---
pulsar-sql/presto-distribution/pom.xml | 4 ++++
8 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 8b81a87..f59e6c9 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -516,9 +516,7 @@ Protocol Buffers License
CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
* Java Annotations API
- javax.annotation-javax.annotation-api-1.2.jar
- - javax.activation-javax.activation-api-1.2.0.jar
- com.sun.activation-javax.activation-1.2.0.jar
- - javax.xml.bind-activation-1.0.2.jar
- javax.xml.bind-jaxb-api-2.3.1.jar
* Java Servlet API -- javax.servlet-javax.servlet-api-3.1.0.jar
* WebSocket Server API -- javax.websocket-javax.websocket-client-api-1.0.jar
diff --git a/pom.xml b/pom.xml
index 7c97e43..e0e01e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -976,9 +976,9 @@ flexible messaging model and an intuitive client API.</description>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>activation</artifactId>
- <version>1.0.2</version>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>1.2.0</version>
</dependency>
<dependency>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index c9f7e36..331f2d4 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -286,11 +286,17 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>activation</artifactId>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
</dependency>
</dependencies>
diff --git a/pulsar-client-admin/pom.xml b/pulsar-client-admin/pom.xml
index 430bf3b..b65d986 100644
--- a/pulsar-client-admin/pom.xml
+++ b/pulsar-client-admin/pom.xml
@@ -65,15 +65,21 @@
<artifactId>jersey-hk2</artifactId>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>activation</artifactId>
- </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/pulsar-discovery-service/pom.xml b/pulsar-discovery-service/pom.xml
index 10e1522..1d03e21 100644
--- a/pulsar-discovery-service/pom.xml
+++ b/pulsar-discovery-service/pom.xml
@@ -138,8 +138,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>activation</artifactId>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
</dependency>
<dependency>
diff --git a/pulsar-proxy/pom.xml b/pulsar-proxy/pom.xml
index 061ed93..51cbc60 100644
--- a/pulsar-proxy/pom.xml
+++ b/pulsar-proxy/pom.xml
@@ -99,15 +99,15 @@
<artifactId>jersey-hk2</artifactId>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>activation</artifactId>
- </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 9bf082c..1e4df50 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -504,9 +504,7 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
* Java Annotations API
- javax.annotation-api-1.2.jar
- javax.annotation-api-1.3.1.jar
- - javax.activation-api-1.2.0.jar
- javax.activation-1.2.0.jar
- - activation-1.0.2.jar
* HK2 - Dependency Injection Kernel
- hk2-api-2.5.0-b42.jar
- hk2-locator-2.5.0-b42.jar
@@ -520,7 +518,6 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
- jersey-media-jaxb-2.26.jar
- jersey-server-2.26.jar
- jersey-common-2.26.jar
- * JavaBeans(TM) Activation Framework -- activation-1.1.1.jar
* JAXB
- jaxb-api-2.2.6.jar
- jaxb-api-2.3.1.jar
diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml
index 15b4ab2..98347c5 100644
--- a/pulsar-sql/presto-distribution/pom.xml
+++ b/pulsar-sql/presto-distribution/pom.xml
@@ -64,6 +64,10 @@
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
</exclusions>
</dependency>