This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-4.1 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 67425640b74b18c7ab94f4eea485f7a23f01afa7 Author: Lari Hotari <[email protected]> AuthorDate: Fri Sep 19 18:53:24 2025 +0300 [fix][client] Exclude io.prometheus:simpleclient_caffeine from client-side dependencies (#24761) (cherry picked from commit b11f05feb7fcb08c8ad2c5f4ad301ef14d518490) --- bouncy-castle/bc/pom.xml | 6 +++++ bouncy-castle/bcfips/pom.xml | 6 +++++ distribution/shell/src/assemble/LICENSE.bin.txt | 2 -- pom.xml | 34 +++++-------------------- pulsar-client-messagecrypto-bc/pom.xml | 6 +++++ pulsar-client/pom.xml | 6 +++++ pulsar-functions/instance/pom.xml | 9 ++++--- pulsar-functions/utils/pom.xml | 6 +++++ pulsar-io/debezium/core/pom.xml | 6 +++++ pulsar-io/kafka-connect-adaptor/pom.xml | 6 +++++ pulsar-websocket/pom.xml | 6 +++++ 11 files changed, 59 insertions(+), 34 deletions(-) diff --git a/bouncy-castle/bc/pom.xml b/bouncy-castle/bc/pom.xml index c5b24f836f3..c3e2fee7309 100644 --- a/bouncy-castle/bc/pom.xml +++ b/bouncy-castle/bc/pom.xml @@ -37,6 +37,12 @@ <artifactId>pulsar-common</artifactId> <version>${project.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_caffeine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/bouncy-castle/bcfips/pom.xml b/bouncy-castle/bcfips/pom.xml index c3715906921..14203adae91 100644 --- a/bouncy-castle/bcfips/pom.xml +++ b/bouncy-castle/bcfips/pom.xml @@ -37,6 +37,12 @@ <artifactId>pulsar-common</artifactId> <version>${project.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_caffeine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt index aeff29513dd..5dd6d6edd7f 100644 --- a/distribution/shell/src/assemble/LICENSE.bin.txt +++ b/distribution/shell/src/assemble/LICENSE.bin.txt @@ -324,8 +324,6 @@ The Apache Software License, Version 2.0 - jackson-datatype-jdk8-2.17.2.jar - jackson-datatype-jsr310-2.17.2.jar - jackson-module-parameter-names-2.17.2.jar - * Caffeine -- caffeine-3.2.1.jar - * simpleclient_caffeine-0.16.0.jar * Conscrypt -- conscrypt-openjdk-uber-2.5.2.jar * Gson - gson-2.8.9.jar diff --git a/pom.xml b/pom.xml index e2eb1460dff..046883223a1 100644 --- a/pom.xml +++ b/pom.xml @@ -1102,38 +1102,16 @@ flexible messaging model and an intuitive client API.</description> <dependency> <groupId>io.prometheus</groupId> - <artifactId>simpleclient</artifactId> - <version>${prometheus.version}</version> - </dependency> - - <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient_hotspot</artifactId> - <version>${prometheus.version}</version> - </dependency> - - <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient_log4j2</artifactId> - <version>${prometheus.version}</version> - </dependency> - - <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient_servlet</artifactId> - <version>${prometheus.version}</version> - </dependency> - - <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient_jetty</artifactId> + <artifactId>simpleclient_bom</artifactId> <version>${prometheus.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient_caffeine</artifactId> - <version>${prometheus.version}</version> + <groupId>io.prometheus.jmx</groupId> + <artifactId>collector</artifactId> + <version>${prometheus-jmx.version}</version> </dependency> <dependency> diff --git a/pulsar-client-messagecrypto-bc/pom.xml b/pulsar-client-messagecrypto-bc/pom.xml index 4cedca6a81a..72f85f60978 100644 --- a/pulsar-client-messagecrypto-bc/pom.xml +++ b/pulsar-client-messagecrypto-bc/pom.xml @@ -39,6 +39,12 @@ <artifactId>pulsar-common</artifactId> <version>${project.parent.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_caffeine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml index 4e37d694a42..4f035dfa50d 100644 --- a/pulsar-client/pom.xml +++ b/pulsar-client/pom.xml @@ -42,6 +42,12 @@ <groupId>${project.groupId}</groupId> <artifactId>pulsar-common</artifactId> <version>${project.parent.version}</version> + <exclusions> + <exclusion> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_caffeine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/pulsar-functions/instance/pom.xml b/pulsar-functions/instance/pom.xml index 7065a4d7743..43ee5c595af 100644 --- a/pulsar-functions/instance/pom.xml +++ b/pulsar-functions/instance/pom.xml @@ -175,27 +175,28 @@ <dependency> <groupId>io.prometheus</groupId> <artifactId>simpleclient</artifactId> - <version>${prometheus.version}</version> </dependency> <!-- Hotspot JVM metrics--> <dependency> <groupId>io.prometheus</groupId> <artifactId>simpleclient_hotspot</artifactId> - <version>${prometheus.version}</version> + </dependency> + + <dependency> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_caffeine</artifactId> </dependency> <!-- Exposition HTTPServer--> <dependency> <groupId>io.prometheus</groupId> <artifactId>simpleclient_httpserver</artifactId> - <version>${prometheus.version}</version> </dependency> <dependency> <groupId>io.prometheus.jmx</groupId> <artifactId>collector</artifactId> - <version>${prometheus-jmx.version}</version> </dependency> <dependency> diff --git a/pulsar-functions/utils/pom.xml b/pulsar-functions/utils/pom.xml index cb8b1753efb..2206e3be039 100644 --- a/pulsar-functions/utils/pom.xml +++ b/pulsar-functions/utils/pom.xml @@ -36,6 +36,12 @@ <groupId>${project.groupId}</groupId> <artifactId>pulsar-common</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_caffeine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/pulsar-io/debezium/core/pom.xml b/pulsar-io/debezium/core/pom.xml index 13821980f11..3154f4b1d5e 100644 --- a/pulsar-io/debezium/core/pom.xml +++ b/pulsar-io/debezium/core/pom.xml @@ -54,6 +54,12 @@ <groupId>${project.groupId}</groupId> <artifactId>pulsar-common</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_caffeine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/pulsar-io/kafka-connect-adaptor/pom.xml b/pulsar-io/kafka-connect-adaptor/pom.xml index 4d2f7016d69..9931d1aa48c 100644 --- a/pulsar-io/kafka-connect-adaptor/pom.xml +++ b/pulsar-io/kafka-connect-adaptor/pom.xml @@ -44,6 +44,12 @@ <artifactId>pulsar-common</artifactId> <version>${project.version}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_caffeine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/pulsar-websocket/pom.xml b/pulsar-websocket/pom.xml index d3e4d876c11..b17b1b0fbd0 100644 --- a/pulsar-websocket/pom.xml +++ b/pulsar-websocket/pom.xml @@ -38,6 +38,12 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pulsar-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>pulsar-client-original</artifactId>
