Skip to content

Commit 6fac859

Browse files
authored
Upgrade Netty to 4.2.12.Final (#4744)
1 parent af117a6 commit 6fac859

File tree

14 files changed

+296
-284
lines changed

14 files changed

+296
-284
lines changed

bookkeeper-common/pom.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,17 @@
7373
<artifactId>commons-lang3</artifactId>
7474
</dependency>
7575
<dependency>
76-
<groupId>io.netty.incubator</groupId>
77-
<artifactId>netty-incubator-transport-native-io_uring</artifactId>
76+
<groupId>io.netty</groupId>
77+
<artifactId>netty-transport-classes-io_uring</artifactId>
78+
</dependency>
79+
<dependency>
80+
<groupId>io.netty</groupId>
81+
<artifactId>netty-transport-native-io_uring</artifactId>
7882
<classifier>linux-x86_64</classifier>
7983
</dependency>
8084
<dependency>
81-
<groupId>io.netty.incubator</groupId>
82-
<artifactId>netty-incubator-transport-native-io_uring</artifactId>
85+
<groupId>io.netty</groupId>
86+
<artifactId>netty-transport-native-io_uring</artifactId>
8387
<classifier>linux-aarch_64</classifier>
8488
</dependency>
8589
<dependency>

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

Lines changed: 56 additions & 55 deletions
Large diffs are not rendered by default.

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

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -216,26 +216,26 @@ Apache Software License, Version 2.
216216
- lib/commons-codec-commons-codec-1.18.0.jar [6]
217217
- lib/commons-io-commons-io-2.19.0.jar [8]
218218
- lib/commons-logging-commons-logging-1.3.5.jar [10]
219-
- lib/io.netty-netty-buffer-4.1.130.Final.jar [11]
220-
- lib/io.netty-netty-codec-4.1.130.Final.jar [11]
221-
- lib/io.netty-netty-common-4.1.130.Final.jar [11]
222-
- lib/io.netty-netty-handler-4.1.130.Final.jar [11]
223-
- lib/io.netty-netty-resolver-4.1.130.Final.jar [11]
224-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.74.Final.jar [11]
225-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.74.Final-linux-aarch_64.jar [11]
226-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.74.Final-linux-x86_64.jar [11]
227-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.74.Final-osx-aarch_64.jar [11]
228-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.74.Final-osx-x86_64.jar [11]
229-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.74.Final-windows-x86_64.jar [11]
230-
- lib/io.netty-netty-tcnative-classes-2.0.74.Final.jar [11]
231-
- lib/io.netty-netty-transport-4.1.130.Final.jar [11]
232-
- lib/io.netty-netty-transport-classes-epoll-4.1.130.Final.jar [11]
233-
- lib/io.netty-netty-transport-native-epoll-4.1.130.Final-linux-aarch_64.jar [11]
234-
- lib/io.netty-netty-transport-native-epoll-4.1.130.Final-linux-x86_64.jar [11]
235-
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar [11]
236-
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar [11]
237-
- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.26.Final.jar [11]
238-
- lib/io.netty-netty-transport-native-unix-common-4.1.130.Final.jar [11]
219+
- lib/io.netty-netty-buffer-4.2.12.Final.jar [11]
220+
- lib/io.netty-netty-codec-base-4.2.12.Final.jar [11]
221+
- lib/io.netty-netty-common-4.2.12.Final.jar [11]
222+
- lib/io.netty-netty-handler-4.2.12.Final.jar [11]
223+
- lib/io.netty-netty-resolver-4.2.12.Final.jar [11]
224+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.75.Final.jar [11]
225+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.75.Final-linux-aarch_64.jar [11]
226+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.75.Final-linux-x86_64.jar [11]
227+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.75.Final-osx-aarch_64.jar [11]
228+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.75.Final-osx-x86_64.jar [11]
229+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.75.Final-windows-x86_64.jar [11]
230+
- lib/io.netty-netty-tcnative-classes-2.0.75.Final.jar [11]
231+
- lib/io.netty-netty-transport-4.2.12.Final.jar [11]
232+
- lib/io.netty-netty-transport-classes-epoll-4.2.12.Final.jar [11]
233+
- lib/io.netty-netty-transport-classes-io_uring-4.2.12.Final.jar [11]
234+
- lib/io.netty-netty-transport-native-epoll-4.2.12.Final-linux-aarch_64.jar [11]
235+
- lib/io.netty-netty-transport-native-epoll-4.2.12.Final-linux-x86_64.jar [11]
236+
- lib/io.netty-netty-transport-native-io_uring-4.2.12.Final-linux-aarch_64.jar [11]
237+
- lib/io.netty-netty-transport-native-io_uring-4.2.12.Final-linux-x86_64.jar [11]
238+
- lib/io.netty-netty-transport-native-unix-common-4.2.12.Final.jar [11]
239239
- lib/org.apache.logging.log4j-log4j-api-2.23.1.jar [16]
240240
- lib/org.apache.logging.log4j-log4j-core-2.23.1.jar [16]
241241
- lib/org.apache.logging.log4j-log4j-slf4j2-impl-2.23.1.jar [16]
@@ -320,7 +320,7 @@ Apache Software License, Version 2.
320320
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0
321321
[9] Source available at https://github.com/apache/commons-lang/tree/LANG_2_6
322322
[10] Source available at https://github.com/apache/commons-logging/tree/commons-logging-1.3.5
323-
[11] Source available at https://github.com/netty/netty/tree/netty-4.1.130.Final
323+
[11] Source available at https://github.com/netty/netty/tree/netty-4.2.12.Final
324324
[16] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.23.1
325325
[18] Source available at https://github.com/apache/commons-collections/tree/collections-4.1
326326
[19] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6
@@ -356,9 +356,9 @@ Apache Software License, Version 2.
356356
[57] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
357357
[58] Source available at https://github.com/googleapis/sdk-platform-java/tree/v2.53.0/api-common-java
358358
------------------------------------------------------------------------------------
359-
lib/io.netty-netty-codec-4.1.130.Final.jar bundles some 3rd party dependencies
359+
lib/io.netty-netty-codec-base-4.2.12.Final.jar bundles some 3rd party dependencies
360360

361-
lib/io.netty-netty-codec-4.1.130.Final.jar contains the extensions to Java Collections Framework which has
361+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains the extensions to Java Collections Framework which has
362362
been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
363363

364364
* LICENSE:
@@ -367,31 +367,31 @@ been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
367367
* http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
368368
* http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
369369

370-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified version of Robert Harder's Public Domain
370+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified version of Robert Harder's Public Domain
371371
Base64 Encoder and Decoder, which can be obtained at:
372372

373373
* LICENSE:
374374
* deps/netty/LICENSE.base64.txt (Public Domain)
375375
* HOMEPAGE:
376376
* http://iharder.sourceforge.net/current/java/base64/
377377

378-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified portion of 'Webbit', an event based
378+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified portion of 'Webbit', an event based
379379
WebSocket and HTTP server, which can be obtained at:
380380

381381
* LICENSE:
382382
* deps/netty/LICENSE.webbit.txt (BSD License)
383383
* HOMEPAGE:
384384
* https://github.com/joewalnes/webbit
385385

386-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified portion of 'SLF4J', a simple logging
386+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified portion of 'SLF4J', a simple logging
387387
facade for Java, which can be obtained at:
388388

389389
* LICENSE:
390390
* deps/netty/LICENSE.slf4j.txt (MIT License)
391391
* HOMEPAGE:
392392
* http://www.slf4j.org/
393393

394-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified portion of 'Apache Harmony', an open source
394+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified portion of 'Apache Harmony', an open source
395395
Java SE, which can be obtained at:
396396

397397
* NOTICE:
@@ -401,15 +401,15 @@ Java SE, which can be obtained at:
401401
* HOMEPAGE:
402402
* http://archive.apache.org/dist/harmony/
403403

404-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression
404+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression
405405
and decompression library written by Matthew J. Francis. It can be obtained at:
406406

407407
* LICENSE:
408408
* deps/netty/LICENSE.jbzip2.txt (MIT License)
409409
* HOMEPAGE:
410410
* https://code.google.com/p/jbzip2/
411411

412-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct
412+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct
413413
the suffix array and the Burrows-Wheeler transformed string for any input string of
414414
a constant-size alphabet written by Yuta Mori. It can be obtained at:
415415

@@ -418,63 +418,63 @@ a constant-size alphabet written by Yuta Mori. It can be obtained at:
418418
* HOMEPAGE:
419419
* https://github.com/y-256/libdivsufsort
420420

421-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools',
421+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools',
422422
Java Concurrency Tools for the JVM, which can be obtained at:
423423

424424
* LICENSE:
425425
* deps/netty/LICENSE.jctools.txt (ASL2 License)
426426
* HOMEPAGE:
427427
* https://github.com/JCTools/JCTools
428428

429-
lib/io.netty-netty-codec-4.1.130.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in
429+
lib/io.netty-netty-codec-base-4.2.12.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in
430430
pure Java, which can be obtained at:
431431

432432
* LICENSE:
433433
* deps/netty/LICENSE.jzlib.txt (BSD style License)
434434
* HOMEPAGE:
435435
* http://www.jcraft.com/jzlib/
436436

437-
lib/io.netty-netty-codec-4.1.130.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and
437+
lib/io.netty-netty-codec-base-4.2.12.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and
438438
decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
439439

440440
* LICENSE:
441441
* deps/netty/LICENSE.compress-lzf.txt (Apache License 2.0)
442442
* HOMEPAGE:
443443
* https://github.com/ning/compress
444444

445-
lib/io.netty-netty-codec-4.1.130.Final.jar optionally depends on 'lz4-java', a LZ4 Java compression
445+
lib/io.netty-netty-codec-base-4.2.12.Final.jar optionally depends on 'lz4-java', a LZ4 Java compression
446446
and decompression library written by Adrien Grand. It can be obtained at:
447447

448448
* LICENSE:
449449
* deps/netty/LICENSE.lz4.txt (Apache License 2.0)
450450
* HOMEPAGE:
451451
* https://github.com/yawkat/lz4-java
452452

453-
lib/io.netty-netty-codec-4.1.130.Final.jar optionally depends on 'lzma-java', a LZMA Java compression
453+
lib/io.netty-netty-codec-base-4.2.12.Final.jar optionally depends on 'lzma-java', a LZMA Java compression
454454
and decompression library, which can be obtained at:
455455

456456
* LICENSE:
457457
* deps/netty/LICENSE.lzma-java.txt (Apache License 2.0)
458458
* HOMEPAGE:
459459
* https://github.com/jponge/lzma-java
460460

461-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression
461+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression
462462
and decompression library written by William Kinney. It can be obtained at:
463463

464464
* LICENSE:
465465
* deps/netty/LICENSE.jfastlz.txt (MIT License)
466466
* HOMEPAGE:
467467
* https://code.google.com/p/jfastlz/
468468

469-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers',
469+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers',
470470
Google's data interchange format, which can be obtained at:
471471

472472
* LICENSE:
473473
* deps/netty/LICENSE.protobuf.txt (New BSD License)
474474
* HOMEPAGE:
475475
* https://github.com/google/protobuf
476476

477-
lib/io.netty-netty-codec-4.1.130.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate
477+
lib/io.netty-netty-codec-base-4.2.12.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate
478478
a temporary self-signed X.509 certificate when the JVM does not provide the
479479
equivalent functionality. It can be obtained at:
480480

@@ -483,79 +483,79 @@ equivalent functionality. It can be obtained at:
483483
* HOMEPAGE:
484484
* http://www.bouncycastle.org/
485485

486-
lib/io.netty-netty-codec-4.1.130.Final.jar optionally depends on 'Snappy', a compression library produced
486+
lib/io.netty-netty-codec-base-4.2.12.Final.jar optionally depends on 'Snappy', a compression library produced
487487
by Google Inc, which can be obtained at:
488488

489489
* LICENSE:
490490
* deps/netty/LICENSE.snappy.txt (New BSD License)
491491
* HOMEPAGE:
492492
* https://github.com/google/snappy
493493

494-
lib/io.netty-netty-codec-4.1.130.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java
494+
lib/io.netty-netty-codec-base-4.2.12.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java
495495
serialization API, which can be obtained at:
496496

497497
* LICENSE:
498498
* deps/netty/LICENSE.jboss-marshalling.txt (Apache License 2.0)
499499
* HOMEPAGE:
500500
* https://github.com/jboss-remoting/jboss-marshalling
501501

502-
lib/io.netty-netty-codec-4.1.130.Final.jar optionally depends on 'Caliper', Google's micro-
502+
lib/io.netty-netty-codec-base-4.2.12.Final.jar optionally depends on 'Caliper', Google's micro-
503503
benchmarking framework, which can be obtained at:
504504

505505
* LICENSE:
506506
* deps/netty/LICENSE.caliper.txt (Apache License 2.0)
507507
* HOMEPAGE:
508508
* https://github.com/google/caliper
509509

510-
lib/io.netty-netty-codec-4.1.130.Final.jar optionally depends on 'Apache Commons Logging', a logging
510+
lib/io.netty-netty-codec-base-4.2.12.Final.jar optionally depends on 'Apache Commons Logging', a logging
511511
framework, which can be obtained at:
512512

513513
* LICENSE:
514514
* deps/netty/LICENSE.commons-logging.txt (Apache License 2.0)
515515
* HOMEPAGE:
516516
* http://commons.apache.org/logging/
517517

518-
lib/io.netty-netty-codec-4.1.130.Final.jar optionally depends on 'Apache Log4J', a logging framework, which
518+
lib/io.netty-netty-codec-base-4.2.12.Final.jar optionally depends on 'Apache Log4J', a logging framework, which
519519
can be obtained at:
520520

521521
* LICENSE:
522522
* deps/netty/LICENSE.log4j.txt (Apache License 2.0)
523523
* HOMEPAGE:
524524
* http://logging.apache.org/log4j/
525525

526-
lib/io.netty-netty-codec-4.1.130.Final.jar optionally depends on 'Aalto XML', an ultra-high performance
526+
lib/io.netty-netty-codec-base-4.2.12.Final.jar optionally depends on 'Aalto XML', an ultra-high performance
527527
non-blocking XML processor, which can be obtained at:
528528

529529
* LICENSE:
530530
* deps/netty/LICENSE.aalto-xml.txt (Apache License 2.0)
531531
* HOMEPAGE:
532532
* http://wiki.fasterxml.com/AaltoHome
533533

534-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified version of 'HPACK', a Java implementation of
534+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified version of 'HPACK', a Java implementation of
535535
the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
536536

537537
* LICENSE:
538538
* deps/netty/LICENSE.hpack.txt (Apache License 2.0)
539539
* HOMEPAGE:
540540
* https://github.com/twitter/hpack
541541

542-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified version of 'HPACK', a Java implementation of
542+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified version of 'HPACK', a Java implementation of
543543
the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at:
544544

545545
* LICENSE:
546546
* deps/netty/LICENSE.hyper-hpack.txt (MIT License)
547547
* HOMEPAGE:
548548
* https://github.com/python-hyper/hpack/
549549

550-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified version of 'HPACK', a Java implementation of
550+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified version of 'HPACK', a Java implementation of
551551
the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at:
552552

553553
* LICENSE:
554554
* deps/netty/LICENSE.nghttp2-hpack.txt (MIT License)
555555
* HOMEPAGE:
556556
* https://github.com/nghttp2/nghttp2/
557557

558-
lib/io.netty-netty-codec-4.1.130.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library
558+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library
559559
provides utilities for the java.lang API, which can be obtained at:
560560

561561
* LICENSE:
@@ -564,15 +564,15 @@ provides utilities for the java.lang API, which can be obtained at:
564564
* https://commons.apache.org/proper/commons-lang/
565565

566566

567-
lib/io.netty-netty-codec-4.1.130.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper',
567+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper',
568568
that provides an easy way to ensure a user has everything necessary to run the Maven build.
569569

570570
* LICENSE:
571571
* deps/netty/LICENSE.mvn-wrapper.txt (Apache License 2.0)
572572
* HOMEPAGE:
573573
* https://github.com/takari/maven-wrapper
574574

575-
lib/io.netty-netty-codec-4.1.130.Final.jar contains the dnsinfo.h header file,
575+
lib/io.netty-netty-codec-base-4.2.12.Final.jar contains the dnsinfo.h header file,
576576
that provides a way to retrieve the system DNS configuration on MacOS.
577577
This private header is also used by Apple's open source
578578
mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/).

0 commit comments

Comments
 (0)