Skip to content

Commit 3565d0e

Browse files
authored
Upgrade thrift to 0.23.0 to address CVE-2026-43869 (#4791)
1 parent 076fabd commit 3565d0e

4 files changed

Lines changed: 28 additions & 7 deletions

File tree

bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ Apache Software License, Version 2.
299299
- lib/org.jctools-jctools-core-jdk11-4.0.6.jar [38]
300300
- lib/org.apache.httpcomponents-httpclient-4.5.13.jar [39]
301301
- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [40]
302-
- lib/org.apache.thrift-libthrift-0.14.2.jar [41]
302+
- lib/org.apache.thrift-libthrift-0.23.0.jar [41]
303303
- lib/com.google.android-annotations-4.1.1.4.jar [42]
304304
- lib/com.google.j2objc-j2objc-annotations-2.8.jar [45]
305305
- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47]
@@ -377,7 +377,7 @@ Apache Software License, Version 2.
377377
[38] Source available at https://github.com/JCTools/JCTools/tree/v4.0.5
378378
[39] Source available at https://github.com/apache/httpcomponents-client/tree/rel/v4.5.13
379379
[40] Source available at https://github.com/apache/httpcomponents-core/tree/rel/v4.4.15
380-
[41] Source available at https://github.com/apache/thrift/tree/0.14.2
380+
[41] Source available at https://github.com/apache/thrift/tree/0.23.0
381381
[42] Source available at https://source.android.com/
382382
[45] Source available at https://github.com/google/j2objc/releases/tag/1.3
383383
[47] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1

bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ Apache Software License, Version 2.
266266
- lib/org.jctools-jctools-core-jdk11-4.0.6.jar [37]
267267
- lib/org.apache.httpcomponents-httpclient-4.5.13.jar [38]
268268
- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [39]
269-
- lib/org.apache.thrift-libthrift-0.14.2.jar [40]
269+
- lib/org.apache.thrift-libthrift-0.23.0.jar [40]
270270
- lib/com.google.android-annotations-4.1.1.4.jar [41]
271271
- lib/com.google.j2objc-j2objc-annotations-2.8.jar [44]
272272
- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [46]
@@ -301,7 +301,7 @@ Apache Software License, Version 2.
301301
[37] Source available at https://github.com/JCTools/JCTools/tree/v4.0.5
302302
[38] Source available at https://github.com/apache/httpcomponents-client/tree/rel/v4.5.13
303303
[39] Source available at https://github.com/apache/httpcomponents-core/tree/rel/v4.4.15
304-
[40] Source available at https://github.com/apache/thrift/tree/0.14.2
304+
[40] Source available at https://github.com/apache/thrift/tree/0.23.0
305305
[41] Source available at https://source.android.com/
306306
[44] Source available at https://github.com/google/j2objc/releases/tag/1.3
307307
[46] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1

bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ Apache Software License, Version 2.
299299
- lib/org.jctools-jctools-core-jdk11-4.0.6.jar [38]
300300
- lib/org.apache.httpcomponents-httpclient-4.5.13.jar [39]
301301
- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [40]
302-
- lib/org.apache.thrift-libthrift-0.14.2.jar [41]
302+
- lib/org.apache.thrift-libthrift-0.23.0.jar [41]
303303
- lib/com.google.android-annotations-4.1.1.4.jar [42]
304304
- lib/com.google.j2objc-j2objc-annotations-2.8.jar [45]
305305
- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47]
@@ -374,7 +374,7 @@ Apache Software License, Version 2.
374374
[38] Source available at https://github.com/JCTools/JCTools/tree/v4.0.5
375375
[39] Source available at https://github.com/apache/httpcomponents-client/tree/rel/v4.5.13
376376
[40] Source available at https://github.com/apache/httpcomponents-core/tree/rel/v4.4.15
377-
[41] Source available at https://github.com/apache/thrift/tree/0.14.2
377+
[41] Source available at https://github.com/apache/thrift/tree/0.23.0
378378
[42] Source available at https://source.android.com/
379379
[45] Source available at https://github.com/google/j2objc/releases/tag/1.3
380380
[47] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1

pom.xml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
<junit5.version>5.10.2</junit5.version>
175175
<assertj-core.version>3.27.7</assertj-core.version>
176176
<awaitility.version>4.2.0</awaitility.version>
177-
<libthrift.version>0.14.2</libthrift.version>
177+
<libthrift.version>0.23.0</libthrift.version>
178178
<lombok.version>1.18.42</lombok.version>
179179
<log4j.version>2.23.1</log4j.version>
180180
<lz4-java.version>1.10.2</lz4-java.version>
@@ -415,6 +415,7 @@
415415
<artifactId>libthrift</artifactId>
416416
<version>${libthrift.version}</version>
417417
<exclusions>
418+
<!-- Only TJSON/TMemory APIs are used; exclude HTTP/servlet transports and their transitives -->
418419
<exclusion>
419420
<groupId>org.apache.tomcat.embed</groupId>
420421
<artifactId>tomcat-embed-core</artifactId>
@@ -423,6 +424,26 @@
423424
<groupId>javax.annotation</groupId>
424425
<artifactId>javax.annotation-api</artifactId>
425426
</exclusion>
427+
<exclusion>
428+
<groupId>jakarta.annotation</groupId>
429+
<artifactId>jakarta.annotation-api</artifactId>
430+
</exclusion>
431+
<exclusion>
432+
<groupId>jakarta.servlet</groupId>
433+
<artifactId>jakarta.servlet-api</artifactId>
434+
</exclusion>
435+
<exclusion>
436+
<groupId>org.apache.httpcomponents.client5</groupId>
437+
<artifactId>httpclient5</artifactId>
438+
</exclusion>
439+
<exclusion>
440+
<groupId>org.apache.httpcomponents.core5</groupId>
441+
<artifactId>httpcore5</artifactId>
442+
</exclusion>
443+
<exclusion>
444+
<groupId>org.apache.httpcomponents.core5</groupId>
445+
<artifactId>httpcore5-h2</artifactId>
446+
</exclusion>
426447
</exclusions>
427448
</dependency>
428449

0 commit comments

Comments
 (0)