From e0930a7c7c4d7ac09a4ab5a7e7cf9f98455f03b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Fri, 19 Aug 2022 13:37:59 +0200 Subject: [PATCH] SOLR-16332: Upgrade Jetty to 9.4.48.v20220622 (#970) --- solr/CHANGES.txt | 2 + .../http2-client-9.4.44.v20210927.jar.sha1 | 1 - .../http2-client-9.4.48.v20220622.jar.sha1 | 1 + .../http2-common-9.4.44.v20210927.jar.sha1 | 1 - .../http2-common-9.4.48.v20220622.jar.sha1 | 1 + .../http2-hpack-9.4.44.v20210927.jar.sha1 | 1 - .../http2-hpack-9.4.48.v20220622.jar.sha1 | 1 + ...client-transport-9.4.44.v20210927.jar.sha1 | 1 - ...client-transport-9.4.48.v20220622.jar.sha1 | 1 + .../http2-server-9.4.44.v20210927.jar.sha1 | 1 - .../http2-server-9.4.48.v20220622.jar.sha1 | 1 + ...etty-alpn-client-9.4.44.v20210927.jar.sha1 | 1 - ...etty-alpn-client-9.4.48.v20220622.jar.sha1 | 1 + ...alpn-java-client-9.4.44.v20210927.jar.sha1 | 1 - ...alpn-java-client-9.4.48.v20220622.jar.sha1 | 1 + ...alpn-java-server-9.4.44.v20210927.jar.sha1 | 1 - ...alpn-java-server-9.4.48.v20220622.jar.sha1 | 1 + ...etty-alpn-server-9.4.44.v20210927.jar.sha1 | 1 - ...etty-alpn-server-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-client-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-client-9.4.48.v20220622.jar.sha1 | 1 + ...tty-continuation-9.4.44.v20210927.jar.sha1 | 1 - ...tty-continuation-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-deploy-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-deploy-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-http-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-http-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-io-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-io-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-jmx-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-jmx-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-rewrite-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-rewrite-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-security-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-security-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-server-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-server-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-servlet-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-servlet-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-servlets-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-servlets-9.4.48.v20220622.jar.sha1 | 1 + ...tty-start-9.4.44.v20210927-shaded.jar.sha1 | 1 - ...tty-start-9.4.48.v20220622-shaded.jar.sha1 | 1 + .../jetty-util-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-util-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-util-ajax-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-util-ajax-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-webapp-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-webapp-9.4.48.v20220622.jar.sha1 | 1 + .../jetty-xml-9.4.44.v20210927.jar.sha1 | 1 - .../jetty-xml-9.4.48.v20220622.jar.sha1 | 1 + versions.lock | 48 +++++++++---------- versions.props | 2 +- 53 files changed, 52 insertions(+), 50 deletions(-) delete mode 100644 solr/licenses/http2-client-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/http2-client-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/http2-common-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/http2-common-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/http2-hpack-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/http2-hpack-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/http2-http-client-transport-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/http2-http-client-transport-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/http2-server-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/http2-server-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-client-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-client-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-java-client-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-java-client-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-java-server-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-java-server-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-server-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-server-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-client-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-client-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-continuation-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-continuation-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-deploy-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-deploy-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-http-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-http-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-io-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-io-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-jmx-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-jmx-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-rewrite-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-rewrite-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-security-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-security-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-server-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-server-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-servlet-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-servlet-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-servlets-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-servlets-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-start-9.4.44.v20210927-shaded.jar.sha1 create mode 100644 solr/licenses/jetty-start-9.4.48.v20220622-shaded.jar.sha1 delete mode 100644 solr/licenses/jetty-util-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-util-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-util-ajax-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-util-ajax-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-webapp-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-webapp-9.4.48.v20220622.jar.sha1 delete mode 100644 solr/licenses/jetty-xml-9.4.44.v20210927.jar.sha1 create mode 100644 solr/licenses/jetty-xml-9.4.48.v20220622.jar.sha1 diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 8cd7861d43c..0ed98370755 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -150,6 +150,8 @@ Other Changes * SOLR-16331: Migrate remaining managed-schema files to be managed-schema.xml. (Eric Pugh) +* SOLR-16332: Upgrade Jetty to 9.4.48.v20220622 (Chris Sabelstrom, janhoy) + Build --------------------- * SOLR-16204: Change Lucene dependency to Lucene 9.1.0 (Elia Porciani via Alessandro Benedetti) diff --git a/solr/licenses/http2-client-9.4.44.v20210927.jar.sha1 b/solr/licenses/http2-client-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index e94718d2916..00000000000 --- a/solr/licenses/http2-client-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d2783eb9a9ba483fb577ab734bc11ed64b5fc1d2 diff --git a/solr/licenses/http2-client-9.4.48.v20220622.jar.sha1 b/solr/licenses/http2-client-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..872ff3038d1 --- /dev/null +++ b/solr/licenses/http2-client-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +92d50764a8ec042772cea815ced63212b3f8f8df diff --git a/solr/licenses/http2-common-9.4.44.v20210927.jar.sha1 b/solr/licenses/http2-common-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 09fb2e27097..00000000000 --- a/solr/licenses/http2-common-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0568516e62ab7d118fcbcd00ad3e4a33ca23490b diff --git a/solr/licenses/http2-common-9.4.48.v20220622.jar.sha1 b/solr/licenses/http2-common-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..6e1717f486c --- /dev/null +++ b/solr/licenses/http2-common-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +d9dd860a7e9bb8227b137bd63c8630cbb6cac9cf diff --git a/solr/licenses/http2-hpack-9.4.44.v20210927.jar.sha1 b/solr/licenses/http2-hpack-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 27c877443e2..00000000000 --- a/solr/licenses/http2-hpack-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e71c82798665804538e1248ea6e6a901e3d0939b diff --git a/solr/licenses/http2-hpack-9.4.48.v20220622.jar.sha1 b/solr/licenses/http2-hpack-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..1cd3300a877 --- /dev/null +++ b/solr/licenses/http2-hpack-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +dab003d88e03d92cd0c94452297d476aa5e0c566 diff --git a/solr/licenses/http2-http-client-transport-9.4.44.v20210927.jar.sha1 b/solr/licenses/http2-http-client-transport-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 7b1a7341835..00000000000 --- a/solr/licenses/http2-http-client-transport-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -64d1c8481979a9764000433ccda668b0dca1fd25 diff --git a/solr/licenses/http2-http-client-transport-9.4.48.v20220622.jar.sha1 b/solr/licenses/http2-http-client-transport-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..40af10364f0 --- /dev/null +++ b/solr/licenses/http2-http-client-transport-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +753094fc5d944b5c000246244bb1269ef4eda70c diff --git a/solr/licenses/http2-server-9.4.44.v20210927.jar.sha1 b/solr/licenses/http2-server-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 809cb640c1c..00000000000 --- a/solr/licenses/http2-server-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c2cb44a40e1f57d3381125a9947e461d65e6959b diff --git a/solr/licenses/http2-server-9.4.48.v20220622.jar.sha1 b/solr/licenses/http2-server-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..7f692a8cb75 --- /dev/null +++ b/solr/licenses/http2-server-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +4f417e525a533fedfdb891331c5c8ccfcb12b263 diff --git a/solr/licenses/jetty-alpn-client-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-alpn-client-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index e00b2188df9..00000000000 --- a/solr/licenses/jetty-alpn-client-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f830651e636bfe8fcf5c55c421441ff3cc2e85d7 diff --git a/solr/licenses/jetty-alpn-client-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-alpn-client-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..3fa72b8ef8e --- /dev/null +++ b/solr/licenses/jetty-alpn-client-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +b224008b51c94e9440367e2af67a0fcbbdae943b diff --git a/solr/licenses/jetty-alpn-java-client-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-alpn-java-client-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index e9e983f661c..00000000000 --- a/solr/licenses/jetty-alpn-java-client-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a8cbcc7a550140332f0ecd16f50fde5490b06e9e diff --git a/solr/licenses/jetty-alpn-java-client-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-alpn-java-client-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..8e6dcbe52a0 --- /dev/null +++ b/solr/licenses/jetty-alpn-java-client-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +e82cb053fdbd274b7be469f408675428bb849dea diff --git a/solr/licenses/jetty-alpn-java-server-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-alpn-java-server-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 64b6d809899..00000000000 --- a/solr/licenses/jetty-alpn-java-server-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -42af6a328f4a8cd6269d7e8192ca6a185886e5f7 diff --git a/solr/licenses/jetty-alpn-java-server-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-alpn-java-server-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..498ab0849e3 --- /dev/null +++ b/solr/licenses/jetty-alpn-java-server-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +5260dcfac217ce3b5e7b6bbf58b6f350ed6e4f00 diff --git a/solr/licenses/jetty-alpn-server-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-alpn-server-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 12da1ebb709..00000000000 --- a/solr/licenses/jetty-alpn-server-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9ac2672410f18916ec848ac99581dbf0b383e4c9 diff --git a/solr/licenses/jetty-alpn-server-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-alpn-server-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..2eb2f556775 --- /dev/null +++ b/solr/licenses/jetty-alpn-server-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +ed4427d8748b15a0be8d0181e77f434d30b8db8e diff --git a/solr/licenses/jetty-client-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-client-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index f559856cd2d..00000000000 --- a/solr/licenses/jetty-client-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0d8b2c13ec103d12cdc575dc1bfea155dea59e1e diff --git a/solr/licenses/jetty-client-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-client-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..3418425cc0b --- /dev/null +++ b/solr/licenses/jetty-client-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +fc2e953a7030045e1ca467d57e200856a170848e diff --git a/solr/licenses/jetty-continuation-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-continuation-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index eb8c9d1140f..00000000000 --- a/solr/licenses/jetty-continuation-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4ffc681d5b4cbbc340cb58b17d7ac66254ee5e62 diff --git a/solr/licenses/jetty-continuation-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-continuation-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..14dc08bb7af --- /dev/null +++ b/solr/licenses/jetty-continuation-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +2da1287dfc76d01418cc4b716d20154941b841ed diff --git a/solr/licenses/jetty-deploy-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-deploy-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index bb4833a782c..00000000000 --- a/solr/licenses/jetty-deploy-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7598b85596d3e7f353d8941d4199ee3c37b0c60e diff --git a/solr/licenses/jetty-deploy-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-deploy-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..90e395bee04 --- /dev/null +++ b/solr/licenses/jetty-deploy-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +552bf16b9f698bc44453af3269750de15117496d diff --git a/solr/licenses/jetty-http-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-http-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 2563e9b33c3..00000000000 --- a/solr/licenses/jetty-http-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -37f0e30cdc02128e40d095ad63cb18e10ecb7726 diff --git a/solr/licenses/jetty-http-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-http-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..41650bd2c91 --- /dev/null +++ b/solr/licenses/jetty-http-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +8cb235e70bda0c5e97a41e7ee0ea33ee7f5bcc6a diff --git a/solr/licenses/jetty-io-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-io-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 044b28ac860..00000000000 --- a/solr/licenses/jetty-io-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a2ec01e2b5552b777a3d7085163f80756ef8c1ce diff --git a/solr/licenses/jetty-io-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-io-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..e5b636919d4 --- /dev/null +++ b/solr/licenses/jetty-io-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +b09b55209d0a304e542f779750a01f6914dc55e7 diff --git a/solr/licenses/jetty-jmx-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-jmx-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 0747117b698..00000000000 --- a/solr/licenses/jetty-jmx-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a297f5c1d4fa7391cbae72a60cbf51287e54b561 diff --git a/solr/licenses/jetty-jmx-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-jmx-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..936f5ee4ee8 --- /dev/null +++ b/solr/licenses/jetty-jmx-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +c7dcca458ec5b00e3270722821d96c2d0ea38024 diff --git a/solr/licenses/jetty-rewrite-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-rewrite-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 0cf45245f60..00000000000 --- a/solr/licenses/jetty-rewrite-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -22ee4488a149fe0e809d5ac40a906540cf6df597 diff --git a/solr/licenses/jetty-rewrite-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-rewrite-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..dd3816b51ab --- /dev/null +++ b/solr/licenses/jetty-rewrite-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +d07d2acccf6626e23e2583c51067cd3cbb54ac27 diff --git a/solr/licenses/jetty-security-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-security-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 3f0c12fa518..00000000000 --- a/solr/licenses/jetty-security-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ecb80b8e008daa46e95e5691b2611d4007922497 diff --git a/solr/licenses/jetty-security-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-security-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..8a4e7ba9b57 --- /dev/null +++ b/solr/licenses/jetty-security-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +6114f92529e9cff489528e6be77b48526a92d577 diff --git a/solr/licenses/jetty-server-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-server-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index be339c8abf2..00000000000 --- a/solr/licenses/jetty-server-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0bf2de0d31925a8ca71ad80f721236850b636e0d diff --git a/solr/licenses/jetty-server-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-server-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..8954b7aaec5 --- /dev/null +++ b/solr/licenses/jetty-server-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +b91a0641cda31c93962503b88f783602d2bd8093 diff --git a/solr/licenses/jetty-servlet-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-servlet-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 5af98051489..00000000000 --- a/solr/licenses/jetty-servlet-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1cb43a0d74b7395c7207dbf3dc2ca97eac89f5fd diff --git a/solr/licenses/jetty-servlet-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-servlet-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..a53f81bc8c2 --- /dev/null +++ b/solr/licenses/jetty-servlet-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +8a9a53e0aad3f194a4cc9940f7e9d5619254bf62 diff --git a/solr/licenses/jetty-servlets-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-servlets-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 352ca7aacab..00000000000 --- a/solr/licenses/jetty-servlets-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d22ec443ac9b983a8771a44ed258b47dc70108b6 diff --git a/solr/licenses/jetty-servlets-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-servlets-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..cd4db7cfcb1 --- /dev/null +++ b/solr/licenses/jetty-servlets-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +b113da58158c96d6dd8df440bb79c1c0b5e2056e diff --git a/solr/licenses/jetty-start-9.4.44.v20210927-shaded.jar.sha1 b/solr/licenses/jetty-start-9.4.44.v20210927-shaded.jar.sha1 deleted file mode 100644 index fbfb3209e86..00000000000 --- a/solr/licenses/jetty-start-9.4.44.v20210927-shaded.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6a975b3345655d9d505ae5100487f0637260a7b5 diff --git a/solr/licenses/jetty-start-9.4.48.v20220622-shaded.jar.sha1 b/solr/licenses/jetty-start-9.4.48.v20220622-shaded.jar.sha1 new file mode 100644 index 00000000000..4cb3bea8025 --- /dev/null +++ b/solr/licenses/jetty-start-9.4.48.v20220622-shaded.jar.sha1 @@ -0,0 +1 @@ +3458dc539d9d5f4be1205ea35950158849c86ee8 diff --git a/solr/licenses/jetty-util-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-util-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index b7dc0de8ca7..00000000000 --- a/solr/licenses/jetty-util-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3c7151c5a04a93119988b48a1577a972d90f8990 diff --git a/solr/licenses/jetty-util-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-util-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..3023979259e --- /dev/null +++ b/solr/licenses/jetty-util-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +7efc06f7ec0ff33d8c219bcc8c7415280c103669 diff --git a/solr/licenses/jetty-util-ajax-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-util-ajax-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 596d62b2f69..00000000000 --- a/solr/licenses/jetty-util-ajax-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ed2f30e8eef939ab2825e607d83f82f85167e2c0 diff --git a/solr/licenses/jetty-util-ajax-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-util-ajax-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..9cca4a30652 --- /dev/null +++ b/solr/licenses/jetty-util-ajax-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +def39454993d094df10b1689592d235e636d7dde diff --git a/solr/licenses/jetty-webapp-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-webapp-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 410baa51dba..00000000000 --- a/solr/licenses/jetty-webapp-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -60c0ff88088b2eddb2a8e40d6cc4d4e963b72d6e diff --git a/solr/licenses/jetty-webapp-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-webapp-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..921e5b6a6e2 --- /dev/null +++ b/solr/licenses/jetty-webapp-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +9317a8518674c54b5ed9ec5ece8fcad92af91802 diff --git a/solr/licenses/jetty-xml-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-xml-9.4.44.v20210927.jar.sha1 deleted file mode 100644 index 6c784db5208..00000000000 --- a/solr/licenses/jetty-xml-9.4.44.v20210927.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -da53a0fa775752cd4626539796bdb49e9b4cf23c diff --git a/solr/licenses/jetty-xml-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-xml-9.4.48.v20220622.jar.sha1 new file mode 100644 index 00000000000..21a54c76b1c --- /dev/null +++ b/solr/licenses/jetty-xml-9.4.48.v20220622.jar.sha1 @@ -0,0 +1 @@ +2c8b7ad6b64437a693cd30666f3def666aac8207 diff --git a/versions.lock b/versions.lock index 7c493f11392..f504e882211 100644 --- a/versions.lock +++ b/versions.lock @@ -220,30 +220,30 @@ org.codehaus.janino:commons-compiler:3.0.11 (2 constraints: 81192719) org.codehaus.janino:janino:3.0.11 (1 constraints: 8d0d3f3a) org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf) org.codelibs:jhighlight:1.0.3 (1 constraints: 5b0ce401) -org.eclipse.jetty:jetty-alpn-client:9.4.44.v20210927 (2 constraints: 5625951d) -org.eclipse.jetty:jetty-alpn-java-client:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-alpn-java-server:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-alpn-server:9.4.44.v20210927 (2 constraints: 271b20de) -org.eclipse.jetty:jetty-client:9.4.44.v20210927 (2 constraints: 511f4040) -org.eclipse.jetty:jetty-continuation:9.4.44.v20210927 (2 constraints: 611890fb) -org.eclipse.jetty:jetty-deploy:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-http:9.4.44.v20210927 (5 constraints: 9549eb52) -org.eclipse.jetty:jetty-io:9.4.44.v20210927 (8 constraints: 1f7e093d) -org.eclipse.jetty:jetty-jmx:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-rewrite:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-security:9.4.44.v20210927 (2 constraints: ee174ade) -org.eclipse.jetty:jetty-server:9.4.44.v20210927 (6 constraints: c85e10fa) -org.eclipse.jetty:jetty-servlet:9.4.44.v20210927 (2 constraints: 6817a7bf) -org.eclipse.jetty:jetty-servlets:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-util:9.4.44.v20210927 (8 constraints: 7b756007) -org.eclipse.jetty:jetty-util-ajax:9.4.44.v20210927 (1 constraints: 6d104be2) -org.eclipse.jetty:jetty-webapp:9.4.44.v20210927 (2 constraints: 7617adc0) -org.eclipse.jetty:jetty-xml:9.4.44.v20210927 (3 constraints: 5c270a21) -org.eclipse.jetty.http2:http2-client:9.4.44.v20210927 (2 constraints: 511f4040) -org.eclipse.jetty.http2:http2-common:9.4.44.v20210927 (3 constraints: 2a2baa20) -org.eclipse.jetty.http2:http2-hpack:9.4.44.v20210927 (2 constraints: 5419b95c) -org.eclipse.jetty.http2:http2-http-client-transport:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty.http2:http2-server:9.4.44.v20210927 (1 constraints: 82072e7d) +org.eclipse.jetty:jetty-alpn-client:9.4.48.v20220622 (2 constraints: 5025331d) +org.eclipse.jetty:jetty-alpn-java-client:9.4.48.v20220622 (1 constraints: 7f07517d) +org.eclipse.jetty:jetty-alpn-java-server:9.4.48.v20220622 (1 constraints: 7f07517d) +org.eclipse.jetty:jetty-alpn-server:9.4.48.v20220622 (2 constraints: 211bb2dd) +org.eclipse.jetty:jetty-client:9.4.48.v20220622 (2 constraints: 4b1fb13f) +org.eclipse.jetty:jetty-continuation:9.4.48.v20220622 (2 constraints: 5b183afb) +org.eclipse.jetty:jetty-deploy:9.4.48.v20220622 (1 constraints: 7f07517d) +org.eclipse.jetty:jetty-http:9.4.48.v20220622 (5 constraints: 8649704d) +org.eclipse.jetty:jetty-io:9.4.48.v20220622 (8 constraints: 077ef92c) +org.eclipse.jetty:jetty-jmx:9.4.48.v20220622 (1 constraints: 7f07517d) +org.eclipse.jetty:jetty-rewrite:9.4.48.v20220622 (1 constraints: 7f07517d) +org.eclipse.jetty:jetty-security:9.4.48.v20220622 (2 constraints: e817f7dd) +org.eclipse.jetty:jetty-server:9.4.48.v20220622 (6 constraints: b95eccf3) +org.eclipse.jetty:jetty-servlet:9.4.48.v20220622 (2 constraints: 621757bf) +org.eclipse.jetty:jetty-servlets:9.4.48.v20220622 (1 constraints: 7f07517d) +org.eclipse.jetty:jetty-util:9.4.48.v20220622 (8 constraints: 6375c2f7) +org.eclipse.jetty:jetty-util-ajax:9.4.48.v20220622 (1 constraints: 6a106ee2) +org.eclipse.jetty:jetty-webapp:9.4.48.v20220622 (2 constraints: 70175dc0) +org.eclipse.jetty:jetty-xml:9.4.48.v20220622 (3 constraints: 5327b11f) +org.eclipse.jetty.http2:http2-client:9.4.48.v20220622 (2 constraints: 4b1fb13f) +org.eclipse.jetty.http2:http2-common:9.4.48.v20220622 (3 constraints: 212b1b1f) +org.eclipse.jetty.http2:http2-hpack:9.4.48.v20220622 (2 constraints: 4e19575c) +org.eclipse.jetty.http2:http2-http-client-transport:9.4.48.v20220622 (1 constraints: 7f07517d) +org.eclipse.jetty.http2:http2-server:9.4.48.v20220622 (1 constraints: 7f07517d) org.gagravarr:vorbis-java-core:0.8 (1 constraints: 010c57e9) org.gagravarr:vorbis-java-tika:0.8 (1 constraints: 010c57e9) org.glassfish.jaxb:jaxb-runtime:2.3.5 (1 constraints: 610cf401) diff --git a/versions.props b/versions.props index b888ae0ea88..20248173a96 100644 --- a/versions.props +++ b/versions.props @@ -55,7 +55,7 @@ org.apache.zookeeper:*=3.7.0 org.bitbucket.b_c:jose4j=0.7.9 org.carrot2:carrot2-core=4.4.2 org.codehaus.woodstox:stax2-api=4.2.1 -org.eclipse.jetty*:*=9.4.44.v20210927 +org.eclipse.jetty*:*=9.4.48.v20220622 org.hamcrest:*=2.2 org.hsqldb:hsqldb=2.4.0 org.jctools:jctools-core=3.3.0