Skip to content

Commit 54f60e4

Browse files
merlimatmerlimat
committed
Upgrade Jetty from 9.4.57 to 12.1.6
This upgrades Jetty to the latest stable 12.x release, which brings improved performance, HTTP/2 and HTTP/3 support, and ongoing security updates (Jetty 9.x is EOL). Key changes: - Update jetty.version from 9.4.57.v20241219 to 12.1.6 - Use jetty-ee8-* artifacts to maintain javax.servlet compatibility - Update import statements to use org.eclipse.jetty.ee8.servlet package - Update LICENSE and NOTICE files with new artifact names and versions
1 parent 3a5cf9d commit 54f60e4

File tree

9 files changed

+57
-66
lines changed

9 files changed

+57
-66
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,13 @@ Apache Software License, Version 2.
265265
- lib/org.apache.zookeeper-zookeeper-3.9.3.jar [21]
266266
- lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [21]
267267
- lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [21]
268-
- lib/org.eclipse.jetty-jetty-http-9.4.57.v20241219.jar [22]
269-
- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar [22]
270-
- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar [22]
271-
- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar [22]
272-
- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar [22]
273-
- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar [22]
274-
- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar [22]
268+
- lib/org.eclipse.jetty-jetty-http-12.1.6.jar [22]
269+
- lib/org.eclipse.jetty-jetty-io-12.1.6.jar [22]
270+
- lib/org.eclipse.jetty-jetty-security-12.1.6.jar [22]
271+
- lib/org.eclipse.jetty-jetty-server-12.1.6.jar [22]
272+
- lib/org.eclipse.jetty-jetty-session-12.1.6.jar [22]
273+
- lib/org.eclipse.jetty-jetty-util-12.1.6.jar [22]
274+
- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.6.jar [22]
275275
- lib/org.rocksdb-rocksdbjni-9.9.3.jar [23]
276276
- lib/com.beust-jcommander-1.82.jar [24]
277277
- lib/com.yahoo.datasketches-memory-0.8.3.jar [25]
@@ -379,7 +379,7 @@ Apache Software License, Version 2.
379379
[19] Source available at https://github.com/apache/commons-collections/tree/collections-4.1
380380
[20] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6
381381
[21] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0
382-
[22] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.48.v20220622
382+
[22] Source available at https://github.com/jetty/jetty.project/tree/jetty-12.1.6
383383
[23] Source available at https://github.com/facebook/rocksdb/tree/v9.9.3
384384
[24] Source available at https://github.com/cbeust/jcommander/tree/1.82
385385
[25] Source available at https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,13 @@ Apache Software License, Version 2.
265265
- lib/org.apache.zookeeper-zookeeper-3.9.3.jar [21]
266266
- lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [21]
267267
- lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [21]
268-
- lib/org.eclipse.jetty-jetty-http-9.4.57.v20241219.jar [22]
269-
- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar [22]
270-
- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar [22]
271-
- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar [22]
272-
- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar [22]
273-
- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar [22]
274-
- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar [22]
268+
- lib/org.eclipse.jetty-jetty-http-12.1.6.jar [22]
269+
- lib/org.eclipse.jetty-jetty-io-12.1.6.jar [22]
270+
- lib/org.eclipse.jetty-jetty-security-12.1.6.jar [22]
271+
- lib/org.eclipse.jetty-jetty-server-12.1.6.jar [22]
272+
- lib/org.eclipse.jetty-jetty-session-12.1.6.jar [22]
273+
- lib/org.eclipse.jetty-jetty-util-12.1.6.jar [22]
274+
- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.6.jar [22]
275275
- lib/org.rocksdb-rocksdbjni-9.9.3.jar [23]
276276
- lib/com.beust-jcommander-1.82.jar [24]
277277
- lib/com.yahoo.datasketches-memory-0.8.3.jar [25]
@@ -375,7 +375,7 @@ Apache Software License, Version 2.
375375
[19] Source available at https://github.com/apache/commons-collections/tree/collections-4.1
376376
[20] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6
377377
[21] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0
378-
[22] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.48.v20220622
378+
[22] Source available at https://github.com/jetty/jetty.project/tree/jetty-12.1.6
379379
[23] Source available at https://github.com/facebook/rocksdb/tree/v9.9.3
380380
[24] Source available at https://github.com/cbeust/jcommander/tree/1.82
381381
[25] Source available at https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3

‎bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,17 @@ SoundCloud Ltd. (http://soundcloud.com/).
9393
This product includes software developed as part of the
9494
Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/).
9595
------------------------------------------------------------------------------------
96-
- lib/org.eclipse.jetty-jetty-http-9.4.57.v20241219.jar
97-
- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar
98-
- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar
99-
- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar
100-
- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar
101-
- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar
102-
- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar
96+
- lib/org.eclipse.jetty-jetty-http-12.1.6.jar
97+
- lib/org.eclipse.jetty-jetty-io-12.1.6.jar
98+
- lib/org.eclipse.jetty-jetty-security-12.1.6.jar
99+
- lib/org.eclipse.jetty-jetty-server-12.1.6.jar
100+
- lib/org.eclipse.jetty-jetty-session-12.1.6.jar
101+
- lib/org.eclipse.jetty-jetty-util-12.1.6.jar
102+
- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.6.jar
103103

104104
==============================================================
105105
Jetty Web Container
106-
Copyright 1995-2017 Mort Bay Consulting Pty Ltd.
106+
Copyright 1995-2024 Mort Bay Consulting Pty Ltd.
107107
==============================================================
108108

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

117117
and
118118

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

122122
Jetty may be distributed under either license.
123-
124-
lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar bundles UnixCrypt
125-
126-
The UnixCrypt.java code implements the one way cryptography used by
127-
Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
128-
modified April 2001 by Iris Van den Broeke, Daniel Deville.
129-
Permission to use, copy, modify and distribute UnixCrypt
130-
for non-commercial or commercial purposes and without fee is
131-
granted provided that the copyright notice appears in all copies.
132123
------------------------------------------------------------------------------------
133124
- lib/com.beust-jcommander-1.82.jar
134125

‎bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@ SoundCloud Ltd. (http://soundcloud.com/).
7575
This product includes software developed as part of the
7676
Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/).
7777
------------------------------------------------------------------------------------
78-
- lib/org.eclipse.jetty-jetty-http-9.4.57.v20241219.jar
79-
- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar
80-
- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar
81-
- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar
82-
- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar
83-
- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar
84-
- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar
78+
- lib/org.eclipse.jetty-jetty-http-12.1.6.jar
79+
- lib/org.eclipse.jetty-jetty-io-12.1.6.jar
80+
- lib/org.eclipse.jetty-jetty-security-12.1.6.jar
81+
- lib/org.eclipse.jetty-jetty-server-12.1.6.jar
82+
- lib/org.eclipse.jetty-jetty-session-12.1.6.jar
83+
- lib/org.eclipse.jetty-jetty-util-12.1.6.jar
84+
- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.6.jar
8585

8686
==============================================================
8787
Jetty Web Container
88-
Copyright 1995-2017 Mort Bay Consulting Pty Ltd.
88+
Copyright 1995-2024 Mort Bay Consulting Pty Ltd.
8989
==============================================================
9090

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

9999
and
100100

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

104104
Jetty may be distributed under either license.
105-
106-
lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar bundles UnixCrypt
107-
108-
The UnixCrypt.java code implements the one way cryptography used by
109-
Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
110-
modified April 2001 by Iris Van den Broeke, Daniel Deville.
111-
Permission to use, copy, modify and distribute UnixCrypt
112-
for non-commercial or commercial purposes and without fee is
113-
granted provided that the copyright notice appears in all copies.
114105
------------------------------------------------------------------------------------
115106
- lib/com.beust-jcommander-1.82.jar
116107

‎bookkeeper-http/servlet-http-server/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,13 @@
4848
<scope>test</scope>
4949
</dependency>
5050
<dependency>
51-
<groupId>org.eclipse.jetty</groupId>
52-
<artifactId>jetty-webapp</artifactId>
51+
<groupId>org.eclipse.jetty.ee8</groupId>
52+
<artifactId>jetty-ee8-webapp</artifactId>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.eclipse.jetty.ee8</groupId>
57+
<artifactId>jetty-ee8-servlet</artifactId>
5358
<scope>test</scope>
5459
</dependency>
5560
</dependencies>

‎bookkeeper-http/servlet-http-server/src/test/java/org/apache/bookkeeper/http/servlet/JettyHttpServer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
import java.nio.file.Files;
2828
import java.util.List;
2929
import javax.servlet.Servlet;
30+
import org.eclipse.jetty.ee8.servlet.ServletHolder;
31+
import org.eclipse.jetty.ee8.webapp.WebAppContext;
3032
import org.eclipse.jetty.server.Server;
3133
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
32-
import org.eclipse.jetty.servlet.ServletHolder;
33-
import org.eclipse.jetty.webapp.WebAppContext;
3434

3535
/**
3636
* Jetty based http server.

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<hdrhistogram.version>2.1.10</hdrhistogram.version>
146146
<jackson.version>2.17.1</jackson.version>
147147
<jcommander.version>1.82</jcommander.version>
148-
<jetty.version>9.4.57.v20241219</jetty.version>
148+
<jetty.version>12.1.6</jetty.version>
149149
<jmh.version>1.37</jmh.version>
150150
<jmock.version>2.8.2</jmock.version>
151151
<junit.version>4.13.2</junit.version>
@@ -598,13 +598,13 @@
598598
<version>${jetty.version}</version>
599599
</dependency>
600600
<dependency>
601-
<groupId>org.eclipse.jetty</groupId>
602-
<artifactId>jetty-webapp</artifactId>
601+
<groupId>org.eclipse.jetty.ee8</groupId>
602+
<artifactId>jetty-ee8-webapp</artifactId>
603603
<version>${jetty.version}</version>
604604
</dependency>
605605
<dependency>
606-
<groupId>org.eclipse.jetty</groupId>
607-
<artifactId>jetty-servlet</artifactId>
606+
<groupId>org.eclipse.jetty.ee8</groupId>
607+
<artifactId>jetty-ee8-servlet</artifactId>
608608
<version>${jetty.version}</version>
609609
</dependency>
610610

‎stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@
5757
</dependency>
5858
<dependency>
5959
<groupId>org.eclipse.jetty</groupId>
60-
<artifactId>jetty-servlet</artifactId>
60+
<artifactId>jetty-server</artifactId>
61+
</dependency>
62+
<dependency>
63+
<groupId>org.eclipse.jetty.ee8</groupId>
64+
<artifactId>jetty-ee8-servlet</artifactId>
6165
</dependency>
6266

6367
<dependency>

‎stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/PrometheusMetricsProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
import org.apache.bookkeeper.stats.ThreadRegistry;
5050
import org.apache.commons.configuration2.Configuration;
5151
import org.apache.commons.lang3.StringUtils;
52+
import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
53+
import org.eclipse.jetty.ee8.servlet.ServletHolder;
5254
import org.eclipse.jetty.server.Server;
53-
import org.eclipse.jetty.servlet.ServletContextHandler;
54-
import org.eclipse.jetty.servlet.ServletHolder;
5555
import org.slf4j.Logger;
5656
import org.slf4j.LoggerFactory;
5757
// CHECKSTYLE.ON: IllegalImport

0 commit comments

Comments
 (0)