This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 2204d638a31 Update org.eclipse.jetty*:* to v10.0.18 (#2065)
2204d638a31 is described below
commit 2204d638a31f07ab3ae0e40377f92fc49dcdd253
Author: Solr Bot <[email protected]>
AuthorDate: Fri Dec 8 16:15:26 2023 +0100
Update org.eclipse.jetty*:* to v10.0.18 (#2065)
* Exclude org.awaitility:awaitility which should be test scope
---------
Co-authored-by: Jan Høydahl <[email protected]>
(cherry picked from commit 1160212892557c9fdbcfef84d1a5bd48d448cc09)
---
solr/licenses/awaitility-4.2.0.jar.sha1 | 1 +
solr/licenses/http2-client-10.0.17.jar.sha1 | 1 -
solr/licenses/http2-client-10.0.18.jar.sha1 | 1 +
solr/licenses/http2-common-10.0.17.jar.sha1 | 1 -
solr/licenses/http2-common-10.0.18.jar.sha1 | 1 +
solr/licenses/http2-hpack-10.0.17.jar.sha1 | 1 -
solr/licenses/http2-hpack-10.0.18.jar.sha1 | 1 +
.../http2-http-client-transport-10.0.17.jar.sha1 | 1 -
.../http2-http-client-transport-10.0.18.jar.sha1 | 1 +
solr/licenses/http2-server-10.0.17.jar.sha1 | 1 -
solr/licenses/http2-server-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-alpn-client-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-alpn-client-10.0.18.jar.sha1 | 1 +
.../jetty-alpn-java-client-10.0.17.jar.sha1 | 1 -
.../jetty-alpn-java-client-10.0.18.jar.sha1 | 1 +
.../jetty-alpn-java-server-10.0.17.jar.sha1 | 1 -
.../jetty-alpn-java-server-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-alpn-server-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-alpn-server-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-client-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-client-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-deploy-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-deploy-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-http-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-http-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-io-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-io-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-jmx-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-jmx-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-rewrite-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-rewrite-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-security-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-security-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-server-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-server-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-servlet-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-servlet-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-servlets-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-servlets-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-start-10.0.17-shaded.jar.sha1 | 1 -
solr/licenses/jetty-start-10.0.18-shaded.jar.sha1 | 1 +
solr/licenses/jetty-util-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-util-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-webapp-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-webapp-10.0.18.jar.sha1 | 1 +
solr/licenses/jetty-xml-10.0.17.jar.sha1 | 1 -
solr/licenses/jetty-xml-10.0.18.jar.sha1 | 1 +
solr/server/build.gradle | 4 +-
versions.lock | 44 +++++++++++-----------
versions.props | 2 +-
50 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/solr/licenses/awaitility-4.2.0.jar.sha1
b/solr/licenses/awaitility-4.2.0.jar.sha1
new file mode 100644
index 00000000000..cf7cb7c5062
--- /dev/null
+++ b/solr/licenses/awaitility-4.2.0.jar.sha1
@@ -0,0 +1 @@
+2c39784846001a9cffd6c6b89c78de62c0d80fb8
diff --git a/solr/licenses/http2-client-10.0.17.jar.sha1
b/solr/licenses/http2-client-10.0.17.jar.sha1
deleted file mode 100644
index 1e3c27ca220..00000000000
--- a/solr/licenses/http2-client-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7eede462d4d92a175f27e2249fc4592775968850
diff --git a/solr/licenses/http2-client-10.0.18.jar.sha1
b/solr/licenses/http2-client-10.0.18.jar.sha1
new file mode 100644
index 00000000000..836b7d7fe68
--- /dev/null
+++ b/solr/licenses/http2-client-10.0.18.jar.sha1
@@ -0,0 +1 @@
+17601499bef7f7bc0227f182b019ff771d3d8460
diff --git a/solr/licenses/http2-common-10.0.17.jar.sha1
b/solr/licenses/http2-common-10.0.17.jar.sha1
deleted file mode 100644
index c8785fb5dec..00000000000
--- a/solr/licenses/http2-common-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cec33f2a1c5ffea2a3a213d9e92886320ee5d282
diff --git a/solr/licenses/http2-common-10.0.18.jar.sha1
b/solr/licenses/http2-common-10.0.18.jar.sha1
new file mode 100644
index 00000000000..442ed998e94
--- /dev/null
+++ b/solr/licenses/http2-common-10.0.18.jar.sha1
@@ -0,0 +1 @@
+6ef1f232620fb6269938620720a676bebb1c2c56
diff --git a/solr/licenses/http2-hpack-10.0.17.jar.sha1
b/solr/licenses/http2-hpack-10.0.17.jar.sha1
deleted file mode 100644
index d9f1ab595f6..00000000000
--- a/solr/licenses/http2-hpack-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ca97ff8cde1f89533f14b5032dbd24678a9423b8
diff --git a/solr/licenses/http2-hpack-10.0.18.jar.sha1
b/solr/licenses/http2-hpack-10.0.18.jar.sha1
new file mode 100644
index 00000000000..052882a79ec
--- /dev/null
+++ b/solr/licenses/http2-hpack-10.0.18.jar.sha1
@@ -0,0 +1 @@
+c9a7fbeababa279957d6262e66400ad146e8912c
diff --git a/solr/licenses/http2-http-client-transport-10.0.17.jar.sha1
b/solr/licenses/http2-http-client-transport-10.0.17.jar.sha1
deleted file mode 100644
index 7f6935b4dc6..00000000000
--- a/solr/licenses/http2-http-client-transport-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4713b42ba819e9f049c7ca2fb4653ed3261cb0a7
diff --git a/solr/licenses/http2-http-client-transport-10.0.18.jar.sha1
b/solr/licenses/http2-http-client-transport-10.0.18.jar.sha1
new file mode 100644
index 00000000000..a8bfe7f5244
--- /dev/null
+++ b/solr/licenses/http2-http-client-transport-10.0.18.jar.sha1
@@ -0,0 +1 @@
+474fa9f4f7d7a57dd518287ca9e8c79b0f3290cd
diff --git a/solr/licenses/http2-server-10.0.17.jar.sha1
b/solr/licenses/http2-server-10.0.17.jar.sha1
deleted file mode 100644
index 53a9b01317f..00000000000
--- a/solr/licenses/http2-server-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-998535c492d462119246d141b19fdb511d832151
diff --git a/solr/licenses/http2-server-10.0.18.jar.sha1
b/solr/licenses/http2-server-10.0.18.jar.sha1
new file mode 100644
index 00000000000..b348f79c4d4
--- /dev/null
+++ b/solr/licenses/http2-server-10.0.18.jar.sha1
@@ -0,0 +1 @@
+12bea06cd5f8755995dba40fd3baf3b6ab2d3603
diff --git a/solr/licenses/jetty-alpn-client-10.0.17.jar.sha1
b/solr/licenses/jetty-alpn-client-10.0.17.jar.sha1
deleted file mode 100644
index 96d4e0656be..00000000000
--- a/solr/licenses/jetty-alpn-client-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-075e2ddf9d1331b3cf5ac9ede986f8e35117b71b
diff --git a/solr/licenses/jetty-alpn-client-10.0.18.jar.sha1
b/solr/licenses/jetty-alpn-client-10.0.18.jar.sha1
new file mode 100644
index 00000000000..12aa54b6b09
--- /dev/null
+++ b/solr/licenses/jetty-alpn-client-10.0.18.jar.sha1
@@ -0,0 +1 @@
+6e1aed65b6023daf45527e42da4f551d9d343580
diff --git a/solr/licenses/jetty-alpn-java-client-10.0.17.jar.sha1
b/solr/licenses/jetty-alpn-java-client-10.0.17.jar.sha1
deleted file mode 100644
index a4621485456..00000000000
--- a/solr/licenses/jetty-alpn-java-client-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e32fac7d11c0326fdecf1b505ba4a31413ab9ee1
diff --git a/solr/licenses/jetty-alpn-java-client-10.0.18.jar.sha1
b/solr/licenses/jetty-alpn-java-client-10.0.18.jar.sha1
new file mode 100644
index 00000000000..71a1bb70a2c
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-client-10.0.18.jar.sha1
@@ -0,0 +1 @@
+44771cb784888db79c15b391f516d4d3c13327b5
diff --git a/solr/licenses/jetty-alpn-java-server-10.0.17.jar.sha1
b/solr/licenses/jetty-alpn-java-server-10.0.17.jar.sha1
deleted file mode 100644
index b7a59671dbe..00000000000
--- a/solr/licenses/jetty-alpn-java-server-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ab96075253b83f217b525984972b7446e6071e88
diff --git a/solr/licenses/jetty-alpn-java-server-10.0.18.jar.sha1
b/solr/licenses/jetty-alpn-java-server-10.0.18.jar.sha1
new file mode 100644
index 00000000000..d8d85c292bd
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-server-10.0.18.jar.sha1
@@ -0,0 +1 @@
+d5a2819a161fed07e4e52cc5feb10cbc9fa8f65d
diff --git a/solr/licenses/jetty-alpn-server-10.0.17.jar.sha1
b/solr/licenses/jetty-alpn-server-10.0.17.jar.sha1
deleted file mode 100644
index 2a4fa808172..00000000000
--- a/solr/licenses/jetty-alpn-server-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e9472cc4aff9e4e5f6db1ac14a7a4f7682f92075
diff --git a/solr/licenses/jetty-alpn-server-10.0.18.jar.sha1
b/solr/licenses/jetty-alpn-server-10.0.18.jar.sha1
new file mode 100644
index 00000000000..eaad4b434f9
--- /dev/null
+++ b/solr/licenses/jetty-alpn-server-10.0.18.jar.sha1
@@ -0,0 +1 @@
+bf443bd65d360ad0a3e5537651356d0adf81fb15
diff --git a/solr/licenses/jetty-client-10.0.17.jar.sha1
b/solr/licenses/jetty-client-10.0.17.jar.sha1
deleted file mode 100644
index 7811a59b9a5..00000000000
--- a/solr/licenses/jetty-client-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dc3857133910dbf42e45311b6f9e6a338bd59e89
diff --git a/solr/licenses/jetty-client-10.0.18.jar.sha1
b/solr/licenses/jetty-client-10.0.18.jar.sha1
new file mode 100644
index 00000000000..ed7c1d24dc7
--- /dev/null
+++ b/solr/licenses/jetty-client-10.0.18.jar.sha1
@@ -0,0 +1 @@
+0b85a78ef43d35c65cf73d5978fe7ceb638e1456
diff --git a/solr/licenses/jetty-deploy-10.0.17.jar.sha1
b/solr/licenses/jetty-deploy-10.0.17.jar.sha1
deleted file mode 100644
index c0fbb1fc737..00000000000
--- a/solr/licenses/jetty-deploy-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7927d39b80296d343ad471756ce35f19dc206f8
diff --git a/solr/licenses/jetty-deploy-10.0.18.jar.sha1
b/solr/licenses/jetty-deploy-10.0.18.jar.sha1
new file mode 100644
index 00000000000..7de6e915423
--- /dev/null
+++ b/solr/licenses/jetty-deploy-10.0.18.jar.sha1
@@ -0,0 +1 @@
+f3082fe22cb2976cff445e8048e97308c5c6b01b
diff --git a/solr/licenses/jetty-http-10.0.17.jar.sha1
b/solr/licenses/jetty-http-10.0.17.jar.sha1
deleted file mode 100644
index ea2e057a821..00000000000
--- a/solr/licenses/jetty-http-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b684e63e9cc0f2b7bcc7917c83cc9e1a952b76ac
diff --git a/solr/licenses/jetty-http-10.0.18.jar.sha1
b/solr/licenses/jetty-http-10.0.18.jar.sha1
new file mode 100644
index 00000000000..3a73c28be0c
--- /dev/null
+++ b/solr/licenses/jetty-http-10.0.18.jar.sha1
@@ -0,0 +1 @@
+9b7f2b580bdcf2a9c27168eac58276c7e6e99ccf
diff --git a/solr/licenses/jetty-io-10.0.17.jar.sha1
b/solr/licenses/jetty-io-10.0.17.jar.sha1
deleted file mode 100644
index 81d88505fd0..00000000000
--- a/solr/licenses/jetty-io-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a57b2fb256166eda798edeffbe4a17c4dd7f7022
diff --git a/solr/licenses/jetty-io-10.0.18.jar.sha1
b/solr/licenses/jetty-io-10.0.18.jar.sha1
new file mode 100644
index 00000000000..acdcc403b60
--- /dev/null
+++ b/solr/licenses/jetty-io-10.0.18.jar.sha1
@@ -0,0 +1 @@
+a622527216b27f72744daf849aa2fa0c6f3db131
diff --git a/solr/licenses/jetty-jmx-10.0.17.jar.sha1
b/solr/licenses/jetty-jmx-10.0.17.jar.sha1
deleted file mode 100644
index 4fce84fc7a6..00000000000
--- a/solr/licenses/jetty-jmx-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bbcac3bd8cf03f4f75d86c9027ec5f6adf3c137b
diff --git a/solr/licenses/jetty-jmx-10.0.18.jar.sha1
b/solr/licenses/jetty-jmx-10.0.18.jar.sha1
new file mode 100644
index 00000000000..b8d18054183
--- /dev/null
+++ b/solr/licenses/jetty-jmx-10.0.18.jar.sha1
@@ -0,0 +1 @@
+428b7d5e2981eb94595637ba730c0c30b73ed4ae
diff --git a/solr/licenses/jetty-rewrite-10.0.17.jar.sha1
b/solr/licenses/jetty-rewrite-10.0.17.jar.sha1
deleted file mode 100644
index 89c5d37f4e4..00000000000
--- a/solr/licenses/jetty-rewrite-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5cd4d6fb5f6038c2cb92bcebee228ee54714b442
diff --git a/solr/licenses/jetty-rewrite-10.0.18.jar.sha1
b/solr/licenses/jetty-rewrite-10.0.18.jar.sha1
new file mode 100644
index 00000000000..37aede7e65a
--- /dev/null
+++ b/solr/licenses/jetty-rewrite-10.0.18.jar.sha1
@@ -0,0 +1 @@
+c9093cd0e77f6f991e38c8f97ff40ff56794a8d2
diff --git a/solr/licenses/jetty-security-10.0.17.jar.sha1
b/solr/licenses/jetty-security-10.0.17.jar.sha1
deleted file mode 100644
index 560e32f6a72..00000000000
--- a/solr/licenses/jetty-security-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e802a2ad37f38fbd0ea44f878079f891a57902ea
diff --git a/solr/licenses/jetty-security-10.0.18.jar.sha1
b/solr/licenses/jetty-security-10.0.18.jar.sha1
new file mode 100644
index 00000000000..160b8c9c2c5
--- /dev/null
+++ b/solr/licenses/jetty-security-10.0.18.jar.sha1
@@ -0,0 +1 @@
+399601ef4e649b3be6f9fd6176b208914f9fd171
diff --git a/solr/licenses/jetty-server-10.0.17.jar.sha1
b/solr/licenses/jetty-server-10.0.17.jar.sha1
deleted file mode 100644
index 71f3b913b0c..00000000000
--- a/solr/licenses/jetty-server-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8cce6c62ef95e5f8cbd0775f708b0423a7166da6
diff --git a/solr/licenses/jetty-server-10.0.18.jar.sha1
b/solr/licenses/jetty-server-10.0.18.jar.sha1
new file mode 100644
index 00000000000..9b6c6bae967
--- /dev/null
+++ b/solr/licenses/jetty-server-10.0.18.jar.sha1
@@ -0,0 +1 @@
+b59b7df009bbb85be455e42524e9a11944fb3ba1
diff --git a/solr/licenses/jetty-servlet-10.0.17.jar.sha1
b/solr/licenses/jetty-servlet-10.0.17.jar.sha1
deleted file mode 100644
index 894d01076c9..00000000000
--- a/solr/licenses/jetty-servlet-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-168984188c99004702cd9705728e54e1b441f8cd
diff --git a/solr/licenses/jetty-servlet-10.0.18.jar.sha1
b/solr/licenses/jetty-servlet-10.0.18.jar.sha1
new file mode 100644
index 00000000000..8cec2353c08
--- /dev/null
+++ b/solr/licenses/jetty-servlet-10.0.18.jar.sha1
@@ -0,0 +1 @@
+cc0acde71a3b04db8fcde2ad60a00dfd4effab23
diff --git a/solr/licenses/jetty-servlets-10.0.17.jar.sha1
b/solr/licenses/jetty-servlets-10.0.17.jar.sha1
deleted file mode 100644
index ed1e8644873..00000000000
--- a/solr/licenses/jetty-servlets-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bfe572f5f0ad314e2dbfddbc44abe8e619034997
diff --git a/solr/licenses/jetty-servlets-10.0.18.jar.sha1
b/solr/licenses/jetty-servlets-10.0.18.jar.sha1
new file mode 100644
index 00000000000..0e1c52afb44
--- /dev/null
+++ b/solr/licenses/jetty-servlets-10.0.18.jar.sha1
@@ -0,0 +1 @@
+828eafeda362ac71e2ba7a569ed938d1b80daede
diff --git a/solr/licenses/jetty-start-10.0.17-shaded.jar.sha1
b/solr/licenses/jetty-start-10.0.17-shaded.jar.sha1
deleted file mode 100644
index b2f28f33937..00000000000
--- a/solr/licenses/jetty-start-10.0.17-shaded.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ee571948efc88538f4ecf21824d43e2ffa636592
diff --git a/solr/licenses/jetty-start-10.0.18-shaded.jar.sha1
b/solr/licenses/jetty-start-10.0.18-shaded.jar.sha1
new file mode 100644
index 00000000000..ff8354c62ac
--- /dev/null
+++ b/solr/licenses/jetty-start-10.0.18-shaded.jar.sha1
@@ -0,0 +1 @@
+1c6435ac9907d394368c734fa0da8d74d8247d60
diff --git a/solr/licenses/jetty-util-10.0.17.jar.sha1
b/solr/licenses/jetty-util-10.0.17.jar.sha1
deleted file mode 100644
index b2c72469369..00000000000
--- a/solr/licenses/jetty-util-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2d8f2579b230660cca19410e61ea22635564f362
diff --git a/solr/licenses/jetty-util-10.0.18.jar.sha1
b/solr/licenses/jetty-util-10.0.18.jar.sha1
new file mode 100644
index 00000000000..cdd31e6c2ea
--- /dev/null
+++ b/solr/licenses/jetty-util-10.0.18.jar.sha1
@@ -0,0 +1 @@
+1ee6a71c2249d5596ba578f015121c99b2b7591a
diff --git a/solr/licenses/jetty-webapp-10.0.17.jar.sha1
b/solr/licenses/jetty-webapp-10.0.17.jar.sha1
deleted file mode 100644
index 5dd1dc06018..00000000000
--- a/solr/licenses/jetty-webapp-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0de2baa32c8ecf3217182e8e176f582fef9ca46f
diff --git a/solr/licenses/jetty-webapp-10.0.18.jar.sha1
b/solr/licenses/jetty-webapp-10.0.18.jar.sha1
new file mode 100644
index 00000000000..ad24994e958
--- /dev/null
+++ b/solr/licenses/jetty-webapp-10.0.18.jar.sha1
@@ -0,0 +1 @@
+5b70383521a3a02347d765071e120ab5adaf7e96
diff --git a/solr/licenses/jetty-xml-10.0.17.jar.sha1
b/solr/licenses/jetty-xml-10.0.17.jar.sha1
deleted file mode 100644
index 8942be24c99..00000000000
--- a/solr/licenses/jetty-xml-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1c56a0c61b36999d83343cc4bf36c26f2ba9477b
diff --git a/solr/licenses/jetty-xml-10.0.18.jar.sha1
b/solr/licenses/jetty-xml-10.0.18.jar.sha1
new file mode 100644
index 00000000000..e41d38dc953
--- /dev/null
+++ b/solr/licenses/jetty-xml-10.0.18.jar.sha1
@@ -0,0 +1 @@
+42b808df0fe90dd428e3ea936e87085e08d97289
diff --git a/solr/server/build.gradle b/solr/server/build.gradle
index 68a150d5f97..d0b722d63f6 100644
--- a/solr/server/build.gradle
+++ b/solr/server/build.gradle
@@ -37,7 +37,9 @@ configurations {
}
dependencies {
- serverLib 'org.eclipse.jetty:jetty-deploy'
+ serverLib('org.eclipse.jetty:jetty-deploy', {
+ exclude group: "org.awaitility", module: "awaitility"
+ })
serverLib 'org.eclipse.jetty:jetty-http'
serverLib 'org.eclipse.jetty:jetty-io'
serverLib 'org.eclipse.jetty:jetty-jmx'
diff --git a/versions.lock b/versions.lock
index 8ca5715fbb4..f0326ca0f96 100644
--- a/versions.lock
+++ b/versions.lock
@@ -282,28 +282,28 @@ org.codehaus.janino:janino:3.1.9 (1 constraints: 650dbd2c)
org.codehaus.woodstox:stax2-api:4.2.2 (2 constraints: 37155caf)
org.codelibs:jhighlight:1.1.0 (1 constraints: 590ce401)
org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95)
-org.eclipse.jetty:jetty-alpn-client:10.0.17 (3 constraints: f72e2e61)
-org.eclipse.jetty:jetty-alpn-java-client:10.0.17 (2 constraints: 231b136f)
-org.eclipse.jetty:jetty-alpn-java-server:10.0.17 (1 constraints: 6b059340)
-org.eclipse.jetty:jetty-alpn-server:10.0.17 (2 constraints: f9167949)
-org.eclipse.jetty:jetty-client:10.0.17 (2 constraints: 231b136f)
-org.eclipse.jetty:jetty-deploy:10.0.17 (1 constraints: 6b059340)
-org.eclipse.jetty:jetty-http:10.0.17 (6 constraints: 824feb91)
-org.eclipse.jetty:jetty-io:10.0.17 (9 constraints: c77dc8ef)
-org.eclipse.jetty:jetty-jmx:10.0.17 (1 constraints: 6b059340)
-org.eclipse.jetty:jetty-rewrite:10.0.17 (1 constraints: 6b059340)
-org.eclipse.jetty:jetty-security:10.0.17 (2 constraints: c0137379)
-org.eclipse.jetty:jetty-server:10.0.17 (7 constraints: ea6d9a2c)
-org.eclipse.jetty:jetty-servlet:10.0.17 (2 constraints: 3a139d61)
-org.eclipse.jetty:jetty-servlets:10.0.17 (1 constraints: 6b059340)
-org.eclipse.jetty:jetty-util:10.0.17 (9 constraints: c181f79f)
-org.eclipse.jetty:jetty-webapp:10.0.17 (2 constraints: 48132562)
-org.eclipse.jetty:jetty-xml:10.0.17 (3 constraints: 1721b2bb)
-org.eclipse.jetty.http2:http2-client:10.0.17 (2 constraints: 231b136f)
-org.eclipse.jetty.http2:http2-common:10.0.17 (3 constraints: e5240263)
-org.eclipse.jetty.http2:http2-hpack:10.0.17 (2 constraints: 2615cae0)
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.17 (1 constraints:
6b059340)
-org.eclipse.jetty.http2:http2-server:10.0.17 (1 constraints: 6b059340)
+org.eclipse.jetty:jetty-alpn-client:10.0.18 (3 constraints: fa2eb861)
+org.eclipse.jetty:jetty-alpn-java-client:10.0.18 (2 constraints: 251b536f)
+org.eclipse.jetty:jetty-alpn-java-server:10.0.18 (1 constraints: 6c059440)
+org.eclipse.jetty:jetty-alpn-server:10.0.18 (2 constraints: fb16ae49)
+org.eclipse.jetty:jetty-client:10.0.18 (2 constraints: 251b536f)
+org.eclipse.jetty:jetty-deploy:10.0.18 (1 constraints: 6c059440)
+org.eclipse.jetty:jetty-http:10.0.18 (6 constraints: 874fd493)
+org.eclipse.jetty:jetty-io:10.0.18 (9 constraints: cf7dbcf4)
+org.eclipse.jetty:jetty-jmx:10.0.18 (1 constraints: 6c059440)
+org.eclipse.jetty:jetty-rewrite:10.0.18 (1 constraints: 6c059440)
+org.eclipse.jetty:jetty-security:10.0.18 (2 constraints: c2139f79)
+org.eclipse.jetty:jetty-server:10.0.18 (7 constraints: ef6d1930)
+org.eclipse.jetty:jetty-servlet:10.0.18 (2 constraints: 3c13c861)
+org.eclipse.jetty:jetty-servlets:10.0.18 (1 constraints: 6c059440)
+org.eclipse.jetty:jetty-util:10.0.18 (9 constraints: c881b8a5)
+org.eclipse.jetty:jetty-webapp:10.0.18 (2 constraints: 4a135062)
+org.eclipse.jetty:jetty-xml:10.0.18 (3 constraints: 1a2130bc)
+org.eclipse.jetty.http2:http2-client:10.0.18 (2 constraints: 251b536f)
+org.eclipse.jetty.http2:http2-common:10.0.18 (3 constraints: e8249263)
+org.eclipse.jetty.http2:http2-hpack:10.0.18 (2 constraints: 2815fbe0)
+org.eclipse.jetty.http2:http2-http-client-transport:10.0.18 (1 constraints:
6c059440)
+org.eclipse.jetty.http2:http2-server:10.0.18 (1 constraints: 6c059440)
org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 (4 constraints: 883053bf)
org.gagravarr:vorbis-java-core:0.8 (1 constraints: 010c57e9)
org.gagravarr:vorbis-java-tika:0.8 (1 constraints: 010c57e9)
diff --git a/versions.props b/versions.props
index e84635e57ac..a1cac3ed4b0 100644
--- a/versions.props
+++ b/versions.props
@@ -56,7 +56,7 @@ org.apache.zookeeper:*=3.9.1
org.bitbucket.b_c:jose4j=0.9.3
org.carrot2:carrot2-core=4.5.1
org.codehaus.woodstox:stax2-api=4.2.2
-org.eclipse.jetty*:*=10.0.17
+org.eclipse.jetty*:*=10.0.18
org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.6
org.glassfish.hk2*:*=2.6.1
org.glassfish.jersey*:*=2.39.1
