This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-2.11 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit c2e893fb6a7db8dbe52b12b10b4fbea3c50a4703 Author: Zixuan Liu <[email protected]> AuthorDate: Mon Mar 18 22:14:11 2024 +0800 [improve][misc] Upgrade jersey to 2.41 (#22290) (cherry picked from commit 4ddcd497efa3fcaf377eec86090f98212932b6e5) --- distribution/server/src/assemble/LICENSE.bin.txt | 20 ++++++++++---------- distribution/shell/src/assemble/LICENSE.bin.txt | 14 +++++++------- pom.xml | 2 +- pulsar-sql/presto-distribution/LICENSE | 20 ++++++++++---------- pulsar-sql/presto-distribution/pom.xml | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index adb2b0e5495..b5764d7b87e 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -595,16 +595,16 @@ CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt - org.glassfish.hk2-osgi-resource-locator-1.0.3.jar - org.glassfish.hk2.external-aopalliance-repackaged-2.6.1.jar * Jersey - - org.glassfish.jersey.containers-jersey-container-servlet-2.34.jar - - org.glassfish.jersey.containers-jersey-container-servlet-core-2.34.jar - - org.glassfish.jersey.core-jersey-client-2.34.jar - - org.glassfish.jersey.core-jersey-common-2.34.jar - - org.glassfish.jersey.core-jersey-server-2.34.jar - - org.glassfish.jersey.ext-jersey-entity-filtering-2.34.jar - - org.glassfish.jersey.media-jersey-media-json-jackson-2.34.jar - - org.glassfish.jersey.media-jersey-media-multipart-2.34.jar - - org.glassfish.jersey.inject-jersey-hk2-2.34.jar - * Mimepull -- org.jvnet.mimepull-mimepull-1.9.13.jar + - org.glassfish.jersey.containers-jersey-container-servlet-2.41.jar + - org.glassfish.jersey.containers-jersey-container-servlet-core-2.41.jar + - org.glassfish.jersey.core-jersey-client-2.41.jar + - org.glassfish.jersey.core-jersey-common-2.41.jar + - org.glassfish.jersey.core-jersey-server-2.41.jar + - org.glassfish.jersey.ext-jersey-entity-filtering-2.41.jar + - org.glassfish.jersey.media-jersey-media-json-jackson-2.41.jar + - org.glassfish.jersey.media-jersey-media-multipart-2.41.jar + - org.glassfish.jersey.inject-jersey-hk2-2.41.jar + * Mimepull -- org.jvnet.mimepull-mimepull-1.9.15.jar Eclipse Distribution License 1.0 -- ../licenses/LICENSE-EDL-1.0.txt * Jakarta Activation diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt index 4eb5f0ade72..24a57ecd2b7 100644 --- a/distribution/shell/src/assemble/LICENSE.bin.txt +++ b/distribution/shell/src/assemble/LICENSE.bin.txt @@ -429,13 +429,13 @@ CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt - aopalliance-repackaged-2.6.1.jar - osgi-resource-locator-1.0.3.jar * Jersey - - jersey-client-2.34.jar - - jersey-common-2.34.jar - - jersey-entity-filtering-2.34.jar - - jersey-media-json-jackson-2.34.jar - - jersey-media-multipart-2.34.jar - - jersey-hk2-2.34.jar - * Mimepull -- mimepull-1.9.13.jar + - jersey-client-2.41.jar + - jersey-common-2.41.jar + - jersey-entity-filtering-2.41.jar + - jersey-media-json-jackson-2.41.jar + - jersey-media-multipart-2.41.jar + - jersey-hk2-2.41.jar + * Mimepull -- mimepull-1.9.15.jar Eclipse Distribution License 1.0 -- ../licenses/LICENSE-EDL-1.0.txt * Jakarta Activation diff --git a/pom.xml b/pom.xml index f2da42eb2a4..0c57b6de246 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ flexible messaging model and an intuitive client API.</description> <netty.version>4.1.100.Final</netty.version> <jetty.version>9.4.54.v20240208</jetty.version> <conscrypt.version>2.5.2</conscrypt.version> - <jersey.version>2.34</jersey.version> + <jersey.version>2.41</jersey.version> <athenz.version>1.10.50</athenz.version> <prometheus.version>0.16.0</prometheus.version> <vertx.version>3.9.8</vertx.version> diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 332f6390d0f..405ca53f551 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -544,15 +544,15 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt - aopalliance-repackaged-2.6.1.jar * Jersey - jaxrs-0.199.jar - - jersey-client-2.34.jar - - jersey-container-servlet-2.34.jar - - jersey-container-servlet-core-2.34.jar - - jersey-entity-filtering-2.34.jar - - jersey-hk2-2.34.jar - - jersey-media-json-jackson-2.34.jar - - jersey-media-multipart-2.34.jar - - jersey-server-2.34.jar - - jersey-common-2.34.jar + - jersey-client-2.41.jar + - jersey-common-2.41.jar + - jersey-container-servlet-2.41.jar + - jersey-container-servlet-core-2.41.jar + - jersey-entity-filtering-2.41.jar + - jersey-hk2-2.41.jar + - jersey-media-json-jackson-2.41.jar + - jersey-media-multipart-2.41.jar + - jersey-server-2.41.jar * JAXB - jaxb-api-2.3.1.jar * RXJava @@ -573,7 +573,7 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt * Logback Core Module - logback-core-1.2.3.jar * MIME Streaming Extension - - mimepull-1.9.13.jar + - mimepull-1.9.15.jar Eclipse Public License - v2.0 -- licenses/LICENSE-EPL-2.0.txt * jakarta.annotation-api-1.3.5.jar diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml index 5b0cd54486b..6f63c9a5585 100644 --- a/pulsar-sql/presto-distribution/pom.xml +++ b/pulsar-sql/presto-distribution/pom.xml @@ -33,7 +33,7 @@ <properties> <skipBuildDistribution>false</skipBuildDistribution> - <jersey.version>2.34</jersey.version> + <jersey.version>2.41</jersey.version> <objenesis.version>2.6</objenesis.version> <objectsize.version>0.0.12</objectsize.version> <maven.version>3.0.5</maven.version>
