diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index f39299b1bf950..c17b4e87df8d0 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -379,8 +379,8 @@ The Apache Software License, Version 2.0 * AirCompressor - io.airlift-aircompressor-0.27.jar * AsyncHttpClient - - org.asynchttpclient-async-http-client-2.12.1.jar - - org.asynchttpclient-async-http-client-netty-utils-2.12.1.jar + - org.asynchttpclient-async-http-client-2.12.4.jar + - org.asynchttpclient-async-http-client-netty-utils-2.12.4.jar * Jetty - org.eclipse.jetty-jetty-client-9.4.56.v20240826.jar - org.eclipse.jetty-jetty-continuation-9.4.56.v20240826.jar @@ -533,7 +533,7 @@ Protocol Buffers License CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt * Java Annotations API - - com.sun.activation-javax.activation-1.2.0.jar + - com.sun.activation-jakarta.activation-1.2.2.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 * HK2 - Dependency Injection Kernel diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt index de198ba2edc32..9b84163b9ae8a 100644 --- a/distribution/shell/src/assemble/LICENSE.bin.txt +++ b/distribution/shell/src/assemble/LICENSE.bin.txt @@ -396,8 +396,8 @@ The Apache Software License, Version 2.0 * AirCompressor - aircompressor-0.27.jar * AsyncHttpClient - - async-http-client-2.12.1.jar - - async-http-client-netty-utils-2.12.1.jar + - async-http-client-2.12.4.jar + - async-http-client-netty-utils-2.12.4.jar * Jetty - jetty-client-9.4.56.v20240826.jar - jetty-http-9.4.56.v20240826.jar @@ -427,7 +427,7 @@ MIT License CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt * Java Annotations API - - javax.activation-1.2.0.jar + - jakarta.activation-1.2.2.jar * WebSocket Server API -- javax.websocket-client-api-1.0.jar * HK2 - Dependency Injection Kernel - hk2-api-2.6.1.jar diff --git a/pom.xml b/pom.xml index b3fd9134b7db5..16879c0193bc6 100644 --- a/pom.xml +++ b/pom.xml @@ -212,7 +212,7 @@ flexible messaging model and an intuitive client API. 0.16.1 6.2.8 0.27 - 2.12.1 + 2.12.4 1.82 3.11 1.10 @@ -231,7 +231,6 @@ flexible messaging model and an intuitive client API. 1.18.32 1.3.5 2.3.1 - 1.2.0 1.2.2 2.3.3 2.0.2 @@ -1337,12 +1336,6 @@ flexible messaging model and an intuitive client API. ${jakarta.xml.bind.version} - - com.sun.activation - javax.activation - ${javax.activation.version} - - com.sun.activation jakarta.activation diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index 7cfccd3e59109..e9361c401c31d 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -414,7 +414,7 @@ com.sun.activation - javax.activation + jakarta.activation diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml index 46495dd3aa645..d1568cb4b3dfa 100644 --- a/pulsar-client-admin-shaded/pom.xml +++ b/pulsar-client-admin-shaded/pom.xml @@ -111,7 +111,7 @@ com.google.guava:guava com.spotify:completable-futures com.squareup.*:* - com.sun.activation:javax.activation + com.sun.activation:jakarta.activation com.typesafe.netty:netty-reactive-streams com.yahoo.datasketches:* com.yahoo.datasketches:sketches-core diff --git a/pulsar-client-admin/pom.xml b/pulsar-client-admin/pom.xml index 1a2eb5e2b2949..a35d97745d274 100644 --- a/pulsar-client-admin/pom.xml +++ b/pulsar-client-admin/pom.xml @@ -88,7 +88,7 @@ com.sun.activation - javax.activation + jakarta.activation runtime diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml index e733812b17736..aaf6601a099b1 100644 --- a/pulsar-client-all/pom.xml +++ b/pulsar-client-all/pom.xml @@ -152,7 +152,7 @@ com.google.j2objc:* com.spotify:completable-futures com.squareup.*:* - com.sun.activation:javax.activation + com.sun.activation:jakarta.activation com.thoughtworks.paranamer:paranamer com.typesafe.netty:netty-reactive-streams diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index 2c50007e41271..c31c25f5383f2 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -126,7 +126,7 @@ com.google.guava:* com.google.j2objc:* com.spotify:completable-futures - com.sun.activation:javax.activation + com.sun.activation:jakarta.activation com.thoughtworks.paranamer:paranamer com.typesafe.netty:netty-reactive-streams diff --git a/pulsar-proxy/pom.xml b/pulsar-proxy/pom.xml index 5111906152c6b..317e22c64545e 100644 --- a/pulsar-proxy/pom.xml +++ b/pulsar-proxy/pom.xml @@ -122,7 +122,7 @@ com.sun.activation - javax.activation + jakarta.activation diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index e1aaa447c105a..0508f25f92ce8 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -420,8 +420,8 @@ The Apache Software License, Version 2.0 * JCTools - jctools-core-2.1.2.jar * Asynchronous Http Client - - async-http-client-2.12.1.jar - - async-http-client-netty-utils-2.12.1.jar + - async-http-client-2.12.4.jar + - async-http-client-netty-utils-2.12.4.jar * Apache Bookkeeper - bookkeeper-common-4.16.6.jar - bookkeeper-common-allocator-4.16.6.jar @@ -528,7 +528,7 @@ CDDL - 1.0 CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt * Java Annotations API - - javax.activation-1.2.0.jar + - jakarta.activation-1.2.2.jar - javax.activation-api-1.2.0.jar * HK2 - Dependency Injection Kernel - hk2-api-2.6.1.jar diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml index 2dc1f52c9c42c..cf4ad7cbfbd34 100644 --- a/pulsar-sql/presto-distribution/pom.xml +++ b/pulsar-sql/presto-distribution/pom.xml @@ -38,7 +38,7 @@ 0.0.12 3.0.5 32.1.1-jre - 2.12.1 + 2.12.4 2.5.1 4.0.1 diff --git a/tiered-storage/jcloud/pom.xml b/tiered-storage/jcloud/pom.xml index 1d4aba721716e..96e22b0a53579 100644 --- a/tiered-storage/jcloud/pom.xml +++ b/tiered-storage/jcloud/pom.xml @@ -118,7 +118,7 @@ com.sun.activation - javax.activation + jakarta.activation runtime