This is an automated email from the ASF dual-hosted git repository. merlimat pushed a commit to branch branch-4.18 in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit a692129beaf489e136c0593189ca2f6eee90855b Author: Suraj Rajan <[email protected]> AuthorDate: Thu Sep 10 09:21:11 2026 +0530 Bump Jetty to 12.1.10 and fix binary license metadata (#4871) * build(deps-dev): bump org.eclipse.jetty:jetty-server Bumps org.eclipse.jetty:jetty-server from 12.1.7 to 12.1.10. --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-server dependency-version: 12.1.10 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * Fix Jetty 12.1.10 binary license metadata --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../src/main/resources/LICENSE-all.bin.txt | 20 ++++++++++---------- .../src/main/resources/LICENSE-server.bin.txt | 20 ++++++++++---------- .../src/main/resources/NOTICE-all.bin.txt | 18 +++++++++--------- .../src/main/resources/NOTICE-server.bin.txt | 18 +++++++++--------- pom.xml | 2 +- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index cc07dd36ce..5303acfaea 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -267,15 +267,15 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.9.5.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.9.5.jar [21] - lib/org.apache.zookeeper-zookeeper-3.9.5-tests.jar [21] -- lib/org.eclipse.jetty-jetty-http-12.1.7.jar [22] -- lib/org.eclipse.jetty-jetty-io-12.1.7.jar [22] -- lib/org.eclipse.jetty-jetty-security-12.1.7.jar [22] -- lib/org.eclipse.jetty-jetty-server-12.1.7.jar [22] -- lib/org.eclipse.jetty-jetty-session-12.1.7.jar [22] -- lib/org.eclipse.jetty-jetty-util-12.1.7.jar [22] -- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.1.7.jar [22] -- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.1.7.jar [22] -- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.7.jar [22] +- lib/org.eclipse.jetty-jetty-http-12.1.10.jar [22] +- lib/org.eclipse.jetty-jetty-io-12.1.10.jar [22] +- lib/org.eclipse.jetty-jetty-security-12.1.10.jar [22] +- lib/org.eclipse.jetty-jetty-server-12.1.10.jar [22] +- lib/org.eclipse.jetty-jetty-session-12.1.10.jar [22] +- lib/org.eclipse.jetty-jetty-util-12.1.10.jar [22] +- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.1.10.jar [22] +- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.1.10.jar [22] +- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.10.jar [22] - lib/org.eclipse.jetty.toolchain-jetty-servlet-api-4.0.9.jar [22] - lib/org.rocksdb-rocksdbjni-9.9.3.jar [23] - lib/com.beust-jcommander-1.82.jar [24] @@ -363,7 +363,7 @@ Apache Software License, Version 2. [19] Source available at https://github.com/apache/commons-collections/tree/collections-4.1 [20] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6 [21] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0 -[22] Source available at https://github.com/jetty/jetty.project/tree/jetty-12.1.7 +[22] Source available at https://github.com/jetty/jetty.project/tree/jetty-12.1.10 [23] Source available at https://github.com/facebook/rocksdb/tree/v9.9.3 [24] Source available at https://github.com/cbeust/jcommander/tree/1.82 [25] Source available at https://github.com/apache/datasketches-java/tree/7.0.1 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index fa4c98e952..cb150321f7 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -267,15 +267,15 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.9.5.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.9.5.jar [21] - lib/org.apache.zookeeper-zookeeper-3.9.5-tests.jar [21] -- lib/org.eclipse.jetty-jetty-http-12.1.7.jar [22] -- lib/org.eclipse.jetty-jetty-io-12.1.7.jar [22] -- lib/org.eclipse.jetty-jetty-security-12.1.7.jar [22] -- lib/org.eclipse.jetty-jetty-server-12.1.7.jar [22] -- lib/org.eclipse.jetty-jetty-session-12.1.7.jar [22] -- lib/org.eclipse.jetty-jetty-util-12.1.7.jar [22] -- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.1.7.jar [22] -- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.1.7.jar [22] -- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.7.jar [22] +- lib/org.eclipse.jetty-jetty-http-12.1.10.jar [22] +- lib/org.eclipse.jetty-jetty-io-12.1.10.jar [22] +- lib/org.eclipse.jetty-jetty-security-12.1.10.jar [22] +- lib/org.eclipse.jetty-jetty-server-12.1.10.jar [22] +- lib/org.eclipse.jetty-jetty-session-12.1.10.jar [22] +- lib/org.eclipse.jetty-jetty-util-12.1.10.jar [22] +- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.1.10.jar [22] +- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.1.10.jar [22] +- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.10.jar [22] - lib/org.eclipse.jetty.toolchain-jetty-servlet-api-4.0.9.jar [22] - lib/org.rocksdb-rocksdbjni-9.9.3.jar [23] - lib/com.beust-jcommander-1.82.jar [24] @@ -359,7 +359,7 @@ Apache Software License, Version 2. [19] Source available at https://github.com/apache/commons-collections/tree/collections-4.1 [20] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6 [21] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0 -[22] Source available at https://github.com/jetty/jetty.project/tree/jetty-12.1.7 +[22] Source available at https://github.com/jetty/jetty.project/tree/jetty-12.1.10 [23] Source available at https://github.com/facebook/rocksdb/tree/v9.9.3 [24] Source available at https://github.com/cbeust/jcommander/tree/1.82 [25] Source available at https://github.com/apache/datasketches-java/tree/7.0.1 diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index 276d7ad3f0..3cfa00eac3 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -95,15 +95,15 @@ SoundCloud Ltd. (http://soundcloud.com/). This product includes software developed as part of the Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). ------------------------------------------------------------------------------------ -- lib/org.eclipse.jetty-jetty-http-12.1.7.jar -- lib/org.eclipse.jetty-jetty-io-12.1.7.jar -- lib/org.eclipse.jetty-jetty-security-12.1.7.jar -- lib/org.eclipse.jetty-jetty-server-12.1.7.jar -- lib/org.eclipse.jetty-jetty-session-12.1.7.jar -- lib/org.eclipse.jetty-jetty-util-12.1.7.jar -- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.1.7.jar -- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.1.7.jar -- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.7.jar +- lib/org.eclipse.jetty-jetty-http-12.1.10.jar +- lib/org.eclipse.jetty-jetty-io-12.1.10.jar +- lib/org.eclipse.jetty-jetty-security-12.1.10.jar +- lib/org.eclipse.jetty-jetty-server-12.1.10.jar +- lib/org.eclipse.jetty-jetty-session-12.1.10.jar +- lib/org.eclipse.jetty-jetty-util-12.1.10.jar +- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.1.10.jar +- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.1.10.jar +- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.10.jar - lib/org.eclipse.jetty.toolchain-jetty-servlet-api-4.0.9.jar ============================================================== diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt index bcbb3249b6..3078a4181b 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -77,15 +77,15 @@ SoundCloud Ltd. (http://soundcloud.com/). This product includes software developed as part of the Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). ------------------------------------------------------------------------------------ -- lib/org.eclipse.jetty-jetty-http-12.1.7.jar -- lib/org.eclipse.jetty-jetty-io-12.1.7.jar -- lib/org.eclipse.jetty-jetty-security-12.1.7.jar -- lib/org.eclipse.jetty-jetty-server-12.1.7.jar -- lib/org.eclipse.jetty-jetty-session-12.1.7.jar -- lib/org.eclipse.jetty-jetty-util-12.1.7.jar -- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.1.7.jar -- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.1.7.jar -- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.7.jar +- lib/org.eclipse.jetty-jetty-http-12.1.10.jar +- lib/org.eclipse.jetty-jetty-io-12.1.10.jar +- lib/org.eclipse.jetty-jetty-security-12.1.10.jar +- lib/org.eclipse.jetty-jetty-server-12.1.10.jar +- lib/org.eclipse.jetty-jetty-session-12.1.10.jar +- lib/org.eclipse.jetty-jetty-util-12.1.10.jar +- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.1.10.jar +- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.1.10.jar +- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.10.jar - lib/org.eclipse.jetty.toolchain-jetty-servlet-api-4.0.9.jar ============================================================== diff --git a/pom.xml b/pom.xml index 080171d502..12fc767517 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ <hdrhistogram.version>2.1.10</hdrhistogram.version> <jackson.version>2.17.1</jackson.version> <jcommander.version>1.82</jcommander.version> - <jetty.version>12.1.7</jetty.version> + <jetty.version>12.1.10</jetty.version> <jmh.version>1.37</jmh.version> <jmock.version>2.8.2</jmock.version> <junit.version>4.13.2</junit.version>
