diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 8b81a874523fa..f59e6c9eeffe5 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 7c97e432b6e1a..e0e01e2607267 100644 --- a/pom.xml +++ b/pom.xml @@ -976,9 +976,9 @@ flexible messaging model and an intuitive client API. - javax.xml.bind - activation - 1.0.2 + com.sun.activation + javax.activation + 1.2.0 diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index c9f7e364ea86b..331f2d484e0d0 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -286,11 +286,17 @@ javax.xml.bind jaxb-api + + + javax.activation + javax.activation-api + + - javax.xml.bind - activation + com.sun.activation + javax.activation diff --git a/pulsar-client-admin/pom.xml b/pulsar-client-admin/pom.xml index 430bf3b29c723..b65d986903c7f 100644 --- a/pulsar-client-admin/pom.xml +++ b/pulsar-client-admin/pom.xml @@ -65,15 +65,21 @@ jersey-hk2 - - javax.xml.bind - jaxb-api - - - - javax.xml.bind - activation - + + javax.xml.bind + jaxb-api + + + javax.activation + javax.activation-api + + + + + com.sun.activation + javax.activation + runtime + org.slf4j diff --git a/pulsar-discovery-service/pom.xml b/pulsar-discovery-service/pom.xml index 10e1522ecbd0b..1d03e21bd5312 100644 --- a/pulsar-discovery-service/pom.xml +++ b/pulsar-discovery-service/pom.xml @@ -138,8 +138,8 @@ - javax.xml.bind - activation + com.sun.activation + javax.activation diff --git a/pulsar-proxy/pom.xml b/pulsar-proxy/pom.xml index 061ed93ee9ef2..51cbc603b5e77 100644 --- a/pulsar-proxy/pom.xml +++ b/pulsar-proxy/pom.xml @@ -99,15 +99,15 @@ jersey-hk2 - - javax.xml.bind - jaxb-api - - - - javax.xml.bind - activation - + + javax.xml.bind + jaxb-api + + + + com.sun.activation + javax.activation + org.slf4j diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 9bf082c5eb1a0..1e4df50b7b2cb 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 15b4ab2df0010..98347c55fb274 100644 --- a/pulsar-sql/presto-distribution/pom.xml +++ b/pulsar-sql/presto-distribution/pom.xml @@ -64,6 +64,10 @@ com.sun tools + + javax.activation + activation +