Skip to content

Upgrade Jetty from 9.4.57 to 12.1.7 #4710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lhotari merged 10 commits into from
Mar 6, 2026
Merged

Upgrade Jetty from 9.4.57 to 12.1.7 #4710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
54f60e4
Upgrade Jetty from 9.4.57 to 12.1.6
merlimat Feb 4, 2026
c6b10b8
Merge remote-tracking branch 'apache/master' into upgrade-jetty-12.1.6
merlimat Mar 5, 2026
10ab987
12.1.7
merlimat Mar 5, 2026
1a39876
Fix source url
lhotari Mar 5, 2026
ac7e81b
Fixed license
merlimat Mar 5, 2026
c677e24
Removed unreferenced license
merlimat Mar 5, 2026
bb3b9ec
Fixed integration test
merlimat Mar 5, 2026
12a8656
Merge branch 'master' into upgrade-jetty-12.1.6
merlimat Mar 5, 2026
55098aa
Make tests less flaky
merlimat Mar 5, 2026
e97e17a
Merge branch 'master' into upgrade-jetty-12.1.6
merlimat Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,16 @@ Apache Software License, Version 2.
- lib/org.apache.zookeeper-zookeeper-3.9.4.jar [21]
- lib/org.apache.zookeeper-zookeeper-jute-3.9.4.jar [21]
- lib/org.apache.zookeeper-zookeeper-3.9.4-tests.jar [21]
- lib/org.eclipse.jetty-jetty-http-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar [22]
- 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.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]
- lib/com.yahoo.datasketches-memory-0.8.3.jar [25]
Expand Down Expand Up @@ -380,7 +383,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/eclipse/jetty.project/tree/jetty-9.4.48.v20220622
[22] Source available at https://github.com/jetty/jetty.project/tree/jetty-12.1.7
[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/DataSketches/sketches-core/tree/sketches-0.8.3
Expand Down Expand Up @@ -696,12 +699,6 @@ Bundled as
Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
For details, see deps/protobuf/LICENSE.
------------------------------------------------------------------------------------
This product bundles the JCP Standard Java Servlet API, which is available under a
CDDL 1.1 license. For details, see deps/javax.servlet-api-4.0.0/CDDL+GPL-1.1.

Bundled as lib/javax.servlet-javax.servlet-api-4.0.0.jar
Source available at https://github.com/javaee/servlet-spec/tree/4.0.0
------------------------------------------------------------------------------------
This product bundles Simple Logging Facade for Java, which is available under a
MIT license. For details, see deps/slf4j-2.0.12/LICENSE.txt.

Expand Down
25 changes: 11 additions & 14 deletions bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,16 @@ Apache Software License, Version 2.
- lib/org.apache.zookeeper-zookeeper-3.9.4.jar [21]
- lib/org.apache.zookeeper-zookeeper-jute-3.9.4.jar [21]
- lib/org.apache.zookeeper-zookeeper-3.9.4-tests.jar [21]
- lib/org.eclipse.jetty-jetty-http-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar [22]
- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar [22]
- 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.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]
- lib/com.yahoo.datasketches-memory-0.8.3.jar [25]
Expand Down Expand Up @@ -376,7 +379,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/eclipse/jetty.project/tree/jetty-9.4.48.v20220622
[22] Source available at https://github.com/jetty/jetty.project/tree/jetty-12.1.7
[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/DataSketches/sketches-core/tree/sketches-0.8.3
Expand Down Expand Up @@ -685,12 +688,6 @@ Bundled as
Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
For details, see deps/protobuf/LICENSE.
------------------------------------------------------------------------------------
This product bundles the JCP Standard Java Servlet API, which is available under a
CDDL 1.1 license. For details, see deps/javax.servlet-api-4.0.0/CDDL+GPL-1.1.

Bundled as lib/javax.servlet-javax.servlet-api-4.0.0.jar
Source available at https://github.com/javaee/servlet-spec/tree/4.0.0
------------------------------------------------------------------------------------
This product bundles Simple Logging Facade for Java, which is available under a
MIT license. For details, see deps/slf4j-2.0.12/LICENSE.txt.

Expand Down
32 changes: 13 additions & 19 deletions bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,20 @@ 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-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar
- 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.toolchain-jetty-servlet-api-4.0.9.jar

==============================================================
Jetty Web Container
Copyright 1995-2017 Mort Bay Consulting Pty Ltd.
Copyright 1995-2024 Mort Bay Consulting Pty Ltd.
==============================================================

The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
Expand All @@ -116,19 +119,10 @@ Jetty is dual licensed under both

and

* The Eclipse Public 1.0 License
http://www.eclipse.org/legal/epl-v10.html
* The Eclipse Public License 2.0
https://www.eclipse.org/legal/epl-2.0/

Jetty may be distributed under either license.

lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar bundles UnixCrypt

The UnixCrypt.java code implements the one way cryptography used by
Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
modified April 2001 by Iris Van den Broeke, Daniel Deville.
Permission to use, copy, modify and distribute UnixCrypt
for non-commercial or commercial purposes and without fee is
granted provided that the copyright notice appears in all copies.
------------------------------------------------------------------------------------
- lib/com.beust-jcommander-1.82.jar

Expand Down
32 changes: 13 additions & 19 deletions bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,20 @@ 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-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar
- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar
- 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.toolchain-jetty-servlet-api-4.0.9.jar

==============================================================
Jetty Web Container
Copyright 1995-2017 Mort Bay Consulting Pty Ltd.
Copyright 1995-2024 Mort Bay Consulting Pty Ltd.
==============================================================

The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
Expand All @@ -98,19 +101,10 @@ Jetty is dual licensed under both

and

* The Eclipse Public 1.0 License
http://www.eclipse.org/legal/epl-v10.html
* The Eclipse Public License 2.0
https://www.eclipse.org/legal/epl-2.0/

Jetty may be distributed under either license.

lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar bundles UnixCrypt

The UnixCrypt.java code implements the one way cryptography used by
Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
modified April 2001 by Iris Van den Broeke, Daniel Deville.
Permission to use, copy, modify and distribute UnixCrypt
for non-commercial or commercial purposes and without fee is
granted provided that the copyright notice appears in all copies.
------------------------------------------------------------------------------------
- lib/com.beust-jcommander-1.82.jar

Expand Down
Loading
Loading