You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2026/08/14 08:33:23 UTC
(pulsar) branch branch-4.2 updated: [improve][misc] Upgrade Conscrypt to 2.6.2 to restore the native library glibc baseline (#26315)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-4.2 by this push:
new e9040a393be9 [improve][misc] Upgrade Conscrypt to 2.6.2 to restore the native library glibc baseline (#26315)
e9040a393be9 is described below
commit e9040a393be92c7c40e65ef3bdf773a342a45343
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Thu Aug 13 07:39:27 2026 +0300
[improve][misc] Upgrade Conscrypt to 2.6.2 to restore the native library glibc baseline (#26315)
(cherry picked from commit 416d9d7c6435f8db67e8c66c1edefb8a0ba0ba86)
---
distribution/server/src/assemble/LICENSE.bin.txt | 2 +-
distribution/shell/src/assemble/LICENSE.bin.txt | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 8312b005a7a2..ea75119d8e69 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -261,7 +261,7 @@ The Apache Software License, Version 2.0
- com.fasterxml.jackson.datatype-jackson-datatype-jsr310-2.18.9.jar
- com.fasterxml.jackson.module-jackson-module-parameter-names-2.18.9.jar
* Caffeine -- com.github.ben-manes.caffeine-caffeine-3.2.4.jar
- * Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.6.1.jar
+ * Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.6.2.jar
* Fastutil -- it.unimi.dsi-fastutil-8.5.16.jar
* Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-2.59.2.jar
* Bitbucket -- org.bitbucket.b_c-jose4j-0.9.6.jar
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
index e508376a5494..59d59de42060 100644
--- a/distribution/shell/src/assemble/LICENSE.bin.txt
+++ b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -325,7 +325,7 @@ The Apache Software License, Version 2.0
- jackson-datatype-jsr310-2.18.9.jar
- jackson-module-parameter-names-2.18.9.jar
* Caffeine -- caffeine-3.2.4.jar
- * Conscrypt -- conscrypt-openjdk-uber-2.6.1.jar
+ * Conscrypt -- conscrypt-openjdk-uber-2.6.2.jar
* Gson
- gson-2.13.2.jar
* Guava
diff --git a/pom.xml b/pom.xml
index 33fea89c41b1..27b582c27d0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,7 +194,7 @@ flexible messaging model and an intuitive client API.</description>
<jetty.version>12.1.12</jetty.version>
<!-- Jetty 9 is used in tiered-storage/file-system tests and pulsar-io/alluxio -->
<jetty9.version>9.4.58.v20250814</jetty9.version>
- <conscrypt.version>2.6.1</conscrypt.version>
+ <conscrypt.version>2.6.2</conscrypt.version>
<jersey.version>2.42</jersey.version>
<athenz.version>1.10.62</athenz.version>
<prometheus.version>0.16.0</prometheus.version>