Skip to content

Commit 6742564

Browse files
lhotarilhotari
committed
[fix][client] Exclude io.prometheus:simpleclient_caffeine from client-side dependencies (#24761)
(cherry picked from commit b11f05f)
1 parent 9d3e7d0 commit 6742564

11 files changed

Lines changed: 59 additions & 34 deletions

File tree

‎bouncy-castle/bc/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@
3737
<artifactId>pulsar-common</artifactId>
3838
<version>${project.version}</version>
3939
<scope>provided</scope>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>io.prometheus</groupId>
43+
<artifactId>simpleclient_caffeine</artifactId>
44+
</exclusion>
45+
</exclusions>
4046
</dependency>
4147

4248
<dependency>

‎bouncy-castle/bcfips/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@
3737
<artifactId>pulsar-common</artifactId>
3838
<version>${project.version}</version>
3939
<scope>provided</scope>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>io.prometheus</groupId>
43+
<artifactId>simpleclient_caffeine</artifactId>
44+
</exclusion>
45+
</exclusions>
4046
</dependency>
4147

4248
<dependency>

‎distribution/shell/src/assemble/LICENSE.bin.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,6 @@ The Apache Software License, Version 2.0
324324
- jackson-datatype-jdk8-2.17.2.jar
325325
- jackson-datatype-jsr310-2.17.2.jar
326326
- jackson-module-parameter-names-2.17.2.jar
327-
* Caffeine -- caffeine-3.2.1.jar
328-
* simpleclient_caffeine-0.16.0.jar
329327
* Conscrypt -- conscrypt-openjdk-uber-2.5.2.jar
330328
* Gson
331329
- gson-2.8.9.jar

‎pom.xml‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,38 +1102,16 @@ flexible messaging model and an intuitive client API.</description>
11021102

11031103
<dependency>
11041104
<groupId>io.prometheus</groupId>
1105-
<artifactId>simpleclient</artifactId>
1106-
<version>${prometheus.version}</version>
1107-
</dependency>
1108-
1109-
<dependency>
1110-
<groupId>io.prometheus</groupId>
1111-
<artifactId>simpleclient_hotspot</artifactId>
1112-
<version>${prometheus.version}</version>
1113-
</dependency>
1114-
1115-
<dependency>
1116-
<groupId>io.prometheus</groupId>
1117-
<artifactId>simpleclient_log4j2</artifactId>
1118-
<version>${prometheus.version}</version>
1119-
</dependency>
1120-
1121-
<dependency>
1122-
<groupId>io.prometheus</groupId>
1123-
<artifactId>simpleclient_servlet</artifactId>
1124-
<version>${prometheus.version}</version>
1125-
</dependency>
1126-
1127-
<dependency>
1128-
<groupId>io.prometheus</groupId>
1129-
<artifactId>simpleclient_jetty</artifactId>
1105+
<artifactId>simpleclient_bom</artifactId>
11301106
<version>${prometheus.version}</version>
1107+
<type>pom</type>
1108+
<scope>import</scope>
11311109
</dependency>
11321110

11331111
<dependency>
1134-
<groupId>io.prometheus</groupId>
1135-
<artifactId>simpleclient_caffeine</artifactId>
1136-
<version>${prometheus.version}</version>
1112+
<groupId>io.prometheus.jmx</groupId>
1113+
<artifactId>collector</artifactId>
1114+
<version>${prometheus-jmx.version}</version>
11371115
</dependency>
11381116

11391117
<dependency>

‎pulsar-client-messagecrypto-bc/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@
3939
<artifactId>pulsar-common</artifactId>
4040
<version>${project.parent.version}</version>
4141
<scope>provided</scope>
42+
<exclusions>
43+
<exclusion>
44+
<groupId>io.prometheus</groupId>
45+
<artifactId>simpleclient_caffeine</artifactId>
46+
</exclusion>
47+
</exclusions>
4248
</dependency>
4349

4450
<dependency>

‎pulsar-client/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
<groupId>${project.groupId}</groupId>
4343
<artifactId>pulsar-common</artifactId>
4444
<version>${project.parent.version}</version>
45+
<exclusions>
46+
<exclusion>
47+
<groupId>io.prometheus</groupId>
48+
<artifactId>simpleclient_caffeine</artifactId>
49+
</exclusion>
50+
</exclusions>
4551
</dependency>
4652

4753
<dependency>

‎pulsar-functions/instance/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,27 +175,28 @@
175175
<dependency>
176176
<groupId>io.prometheus</groupId>
177177
<artifactId>simpleclient</artifactId>
178-
<version>${prometheus.version}</version>
179178
</dependency>
180179

181180
<!-- Hotspot JVM metrics-->
182181
<dependency>
183182
<groupId>io.prometheus</groupId>
184183
<artifactId>simpleclient_hotspot</artifactId>
185-
<version>${prometheus.version}</version>
184+
</dependency>
185+
186+
<dependency>
187+
<groupId>io.prometheus</groupId>
188+
<artifactId>simpleclient_caffeine</artifactId>
186189
</dependency>
187190

188191
<!-- Exposition HTTPServer-->
189192
<dependency>
190193
<groupId>io.prometheus</groupId>
191194
<artifactId>simpleclient_httpserver</artifactId>
192-
<version>${prometheus.version}</version>
193195
</dependency>
194196

195197
<dependency>
196198
<groupId>io.prometheus.jmx</groupId>
197199
<artifactId>collector</artifactId>
198-
<version>${prometheus-jmx.version}</version>
199200
</dependency>
200201

201202
<dependency>

‎pulsar-functions/utils/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
<groupId>${project.groupId}</groupId>
3737
<artifactId>pulsar-common</artifactId>
3838
<version>${project.version}</version>
39+
<exclusions>
40+
<exclusion>
41+
<groupId>io.prometheus</groupId>
42+
<artifactId>simpleclient_caffeine</artifactId>
43+
</exclusion>
44+
</exclusions>
3945
</dependency>
4046

4147
<dependency>

‎pulsar-io/debezium/core/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@
5454
<groupId>${project.groupId}</groupId>
5555
<artifactId>pulsar-common</artifactId>
5656
<version>${project.version}</version>
57+
<exclusions>
58+
<exclusion>
59+
<groupId>io.prometheus</groupId>
60+
<artifactId>simpleclient_caffeine</artifactId>
61+
</exclusion>
62+
</exclusions>
5763
</dependency>
5864

5965
<dependency>

‎pulsar-io/kafka-connect-adaptor/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
<artifactId>pulsar-common</artifactId>
4545
<version>${project.version}</version>
4646
<scope>compile</scope>
47+
<exclusions>
48+
<exclusion>
49+
<groupId>io.prometheus</groupId>
50+
<artifactId>simpleclient_caffeine</artifactId>
51+
</exclusion>
52+
</exclusions>
4753
</dependency>
4854

4955
<dependency>

0 commit comments

Comments
 (0)