This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-4.0 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit cf214b08af33a33967534f5db8f4a726a541b39f Author: Lari Hotari <[email protected]> AuthorDate: Fri May 22 17:08:33 2026 +0300 [improve][build] Remove kotlin-stdlib override; upgrade okhttp3 5.3.2 and okio 3.17.0 (#25855) (cherry picked from commit 842785e0d3b629126a84b27c699fa541ae805c85) --- distribution/server/src/assemble/LICENSE.bin.txt | 13 ++++++------- pom.xml | 23 ++--------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index d54bb299e77..46579719f5f 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -434,16 +434,15 @@ The Apache Software License, Version 2.0 * Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.45.0.jar * Apache Thrift - org.apache.thrift-libthrift-0.23.0.jar * OkHttp3 - - com.squareup.okhttp3-logging-interceptor-5.3.1.jar - - com.squareup.okhttp3-okhttp-5.3.1.jar - - com.squareup.okhttp3-okhttp-jvm-5.3.1.jar + - com.squareup.okhttp3-logging-interceptor-5.3.2.jar + - com.squareup.okhttp3-okhttp-5.3.2.jar + - com.squareup.okhttp3-okhttp-jvm-5.3.2.jar * Okio - - com.squareup.okio-okio-3.16.3.jar - - com.squareup.okio-okio-jvm-3.16.3.jar + - com.squareup.okio-okio-3.17.0.jar + - com.squareup.okio-okio-jvm-3.17.0.jar * Javassist -- org.javassist-javassist-3.25.0-GA.jar * Kotlin Standard Lib - - org.jetbrains.kotlin-kotlin-stdlib-1.8.20.jar - - org.jetbrains.kotlin-kotlin-stdlib-common-1.8.20.jar + - org.jetbrains.kotlin-kotlin-stdlib-2.2.21.jar - org.jetbrains-annotations-13.0.jar * gRPC - io.grpc-grpc-all-1.75.0.jar diff --git a/pom.xml b/pom.xml index eab0ffcf36f..e911ac4320b 100644 --- a/pom.xml +++ b/pom.xml @@ -286,11 +286,9 @@ flexible messaging model and an intuitive client API.</description> <jna.version>5.18.1</jna.version> <kubernetesclient.version>18.0.0</kubernetesclient.version> <jose4j.version>0.9.6</jose4j.version> - <okhttp3.version>5.3.1</okhttp3.version> + <okhttp3.version>5.3.2</okhttp3.version> <!-- use okio version that matches the okhttp3 version --> - <okio.version>3.16.3</okio.version> - <!-- override kotlin-stdlib used by okio in order to address CVE-2020-29582 --> - <kotlin-stdlib.version>1.8.20</kotlin-stdlib.version> + <okio.version>3.17.0</okio.version> <nsq-client.version>1.0</nsq-client.version> <cron-utils.version>9.1.6</cron-utils.version> <spring.version>6.2.12</spring.version> @@ -1657,23 +1655,6 @@ flexible messaging model and an intuitive client API.</description> <scope>import</scope> </dependency> - <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-stdlib</artifactId> - <version>${kotlin-stdlib.version}</version> - </dependency> - <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-stdlib-common</artifactId> - <version>${kotlin-stdlib.version}</version> - </dependency> - - <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-stdlib-jdk8</artifactId> - <version>${kotlin-stdlib.version}</version> - </dependency> - <dependency> <groupId>com.github.luben</groupId> <artifactId>zstd-jni</artifactId>
