From 392b79d7e112e95fdd910854fa0e5efb9fb9b2b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Fri, 4 Jun 2021 09:39:14 +0200 Subject: [PATCH] SOLR-15316 Update Jetty to 9.4.41 (backport 8x) (#2502) --- lucene/CHANGES.txt | 2 ++ lucene/ivy-versions.properties | 2 +- lucene/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 | 1 - lucene/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 | 1 + lucene/licenses/jetty-http-9.4.34.v20201102.jar.sha1 | 1 - lucene/licenses/jetty-http-9.4.41.v20210516.jar.sha1 | 1 + lucene/licenses/jetty-io-9.4.34.v20201102.jar.sha1 | 1 - lucene/licenses/jetty-io-9.4.41.v20210516.jar.sha1 | 1 + lucene/licenses/jetty-server-9.4.34.v20201102.jar.sha1 | 1 - lucene/licenses/jetty-server-9.4.41.v20210516.jar.sha1 | 1 + lucene/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 | 1 - lucene/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 | 1 + lucene/licenses/jetty-util-9.4.34.v20201102.jar.sha1 | 1 - lucene/licenses/jetty-util-9.4.41.v20210516.jar.sha1 | 1 + solr/CHANGES.txt | 2 ++ solr/licenses/http2-client-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/http2-client-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/http2-common-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/http2-common-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/http2-hpack-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/http2-hpack-9.4.41.v20210516.jar.sha1 | 1 + .../http2-http-client-transport-9.4.34.v20201102.jar.sha1 | 1 - .../http2-http-client-transport-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/http2-server-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/http2-server-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-alpn-client-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-alpn-client-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-alpn-java-client-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-alpn-java-client-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-alpn-java-server-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-alpn-java-server-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-alpn-server-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-alpn-server-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-client-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-client-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-deploy-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-deploy-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-http-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-io-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-jmx-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-rewrite-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-rewrite-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-security-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-security-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-server-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-server-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-servlets-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-servlets-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-util-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-webapp-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-webapp-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/jetty-xml-9.4.34.v20201102.jar.sha1 | 1 - solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1 | 1 + solr/licenses/start.jar.sha1 | 2 +- 62 files changed, 35 insertions(+), 31 deletions(-) delete mode 100644 lucene/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 delete mode 100644 lucene/licenses/jetty-http-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-http-9.4.41.v20210516.jar.sha1 delete mode 100644 lucene/licenses/jetty-io-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-io-9.4.41.v20210516.jar.sha1 delete mode 100644 lucene/licenses/jetty-server-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-server-9.4.41.v20210516.jar.sha1 delete mode 100644 lucene/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 delete mode 100644 lucene/licenses/jetty-util-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-util-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/http2-client-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/http2-client-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/http2-common-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/http2-common-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/http2-hpack-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/http2-hpack-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/http2-http-client-transport-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/http2-http-client-transport-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/http2-server-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/http2-server-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-client-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-client-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-java-client-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-java-client-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-java-server-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-java-server-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-server-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-server-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-client-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-client-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-deploy-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-deploy-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-http-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-io-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-jmx-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-rewrite-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-rewrite-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-security-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-security-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-server-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-server-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-servlets-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-servlets-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-util-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-webapp-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-webapp-9.4.41.v20210516.jar.sha1 delete mode 100644 solr/licenses/jetty-xml-9.4.34.v20201102.jar.sha1 create mode 100644 solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1 diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 1bf18a2457eb..59de22459ee0 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -102,6 +102,8 @@ Other * LUCENE-9836: Migrate Maven tasks to use "maven-resolver-ant-tasks" instead of the no longer maintained "maven-ant-tasks". (Uwe Schindler) +* LUCENE-9985: Upgrade jetty to 9.4.41 (janhoy) + ======================= Lucene 8.8.2 ======================= Bug Fixes diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index cf29c729fdc1..73a4fbda84d0 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -282,7 +282,7 @@ org.codehaus.janino.version = 3.0.9 /org.codehaus.woodstox/stax2-api = 3.1.4 /org.codehaus.woodstox/woodstox-core-asl = 4.4.1 -org.eclipse.jetty.version = 9.4.34.v20201102 +org.eclipse.jetty.version = 9.4.41.v20210516 /org.eclipse.jetty.http2/http2-client = ${org.eclipse.jetty.version} /org.eclipse.jetty.http2/http2-common = ${org.eclipse.jetty.version} /org.eclipse.jetty.http2/http2-hpack = ${org.eclipse.jetty.version} diff --git a/lucene/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 9cfe0569eeba..000000000000 --- a/lucene/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -070923c6b55dcabd4bde53971554261048844b3f diff --git a/lucene/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..7bd5e5a78c51 --- /dev/null +++ b/lucene/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +e5859cddb2cac51fd8339668bd35ccac106cb28f diff --git a/lucene/licenses/jetty-http-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-http-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index c44b514bcbeb..000000000000 --- a/lucene/licenses/jetty-http-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7acb9ea4deaba904a49e304ac24f9b3a8ddb5881 diff --git a/lucene/licenses/jetty-http-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-http-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..36812d204b40 --- /dev/null +++ b/lucene/licenses/jetty-http-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +0d460bece4dd9666b46cbd18f8d7fd31cf02ecd9 diff --git a/lucene/licenses/jetty-io-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-io-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 46b17d2aadf1..000000000000 --- a/lucene/licenses/jetty-io-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -80693ce94fa34647e9af613ba17c443feb624590 diff --git a/lucene/licenses/jetty-io-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-io-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..d88fbd5f52a6 --- /dev/null +++ b/lucene/licenses/jetty-io-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +820eea368623939c2113902b1ca7a98186f64a73 diff --git a/lucene/licenses/jetty-server-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-server-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index bd9bf9f19115..000000000000 --- a/lucene/licenses/jetty-server-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19c5309325d5819a9e22bfee66a3c0d50750ed03 diff --git a/lucene/licenses/jetty-server-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-server-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..dd66f4733197 --- /dev/null +++ b/lucene/licenses/jetty-server-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +25b1963b0a1c56202ec37046adc55861815107ce diff --git a/lucene/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 822f1595ff6b..000000000000 --- a/lucene/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -606f9724b14bf58c915ee0e37f6425c52dae7b76 diff --git a/lucene/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..6ff3ebd21806 --- /dev/null +++ b/lucene/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +ea45368ea7fd04026038f89e6910f17f70939641 diff --git a/lucene/licenses/jetty-util-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-util-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 5b96d842b735..000000000000 --- a/lucene/licenses/jetty-util-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -47993d1def63ca9e8bc7284716a89031f642db82 diff --git a/lucene/licenses/jetty-util-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-util-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..9870323ef5c7 --- /dev/null +++ b/lucene/licenses/jetty-util-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +548c76ea00d7eb3e2bcea273174e5d030639d109 diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 2daa2ca6aa97..bf35336dccae 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -129,6 +129,8 @@ Other Changes * SOLR-14978: Enable OOM Killer Script in Solr Foreground. Simplify getting heap dumps on OOM. (Mike Drob, Houston Putman) +* SOLR-15316: Upgrade Jetty to 9.4.41.v20210516 (janhoy, Mike Drob) + ================== 8.8.2 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/licenses/http2-client-9.4.34.v20201102.jar.sha1 b/solr/licenses/http2-client-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 1c048a7d9b09..000000000000 --- a/solr/licenses/http2-client-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -854ea016e9d02ca88d575c1600cf2f0629b6556f diff --git a/solr/licenses/http2-client-9.4.41.v20210516.jar.sha1 b/solr/licenses/http2-client-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..d192d89bd42c --- /dev/null +++ b/solr/licenses/http2-client-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +6e02f1b5c5b9534f6a2d694bff058b0613953e56 diff --git a/solr/licenses/http2-common-9.4.34.v20201102.jar.sha1 b/solr/licenses/http2-common-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index e21fb11af18e..000000000000 --- a/solr/licenses/http2-common-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -37747b3e903eacb8532d8fbc7c15540086f05835 diff --git a/solr/licenses/http2-common-9.4.41.v20210516.jar.sha1 b/solr/licenses/http2-common-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..cbbda21d884e --- /dev/null +++ b/solr/licenses/http2-common-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +8c492e21f77c85a11eb20a496b1a8354e4abfee4 diff --git a/solr/licenses/http2-hpack-9.4.34.v20201102.jar.sha1 b/solr/licenses/http2-hpack-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 1fe1dc742ad9..000000000000 --- a/solr/licenses/http2-hpack-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4adaf9b343d17a786b5f26bf5c7067d4b0958164 diff --git a/solr/licenses/http2-hpack-9.4.41.v20210516.jar.sha1 b/solr/licenses/http2-hpack-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..dd08afa2642b --- /dev/null +++ b/solr/licenses/http2-hpack-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +ffd9437cd379d16a283d7487288a7fbdf08564dc diff --git a/solr/licenses/http2-http-client-transport-9.4.34.v20201102.jar.sha1 b/solr/licenses/http2-http-client-transport-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index d46467c556b7..000000000000 --- a/solr/licenses/http2-http-client-transport-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1b4f1e7d279d9fb7ac4f37def8d23832172db476 diff --git a/solr/licenses/http2-http-client-transport-9.4.41.v20210516.jar.sha1 b/solr/licenses/http2-http-client-transport-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..928d388726d5 --- /dev/null +++ b/solr/licenses/http2-http-client-transport-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +3d018332300975cc28cc4f39a2d45d0b3c72cd19 diff --git a/solr/licenses/http2-server-9.4.34.v20201102.jar.sha1 b/solr/licenses/http2-server-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 290945582695..000000000000 --- a/solr/licenses/http2-server-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eb2d1caf2772d0ea21d2c41aa77cb3e57d682c82 diff --git a/solr/licenses/http2-server-9.4.41.v20210516.jar.sha1 b/solr/licenses/http2-server-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..9845c6e6e825 --- /dev/null +++ b/solr/licenses/http2-server-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +82af0e87ad74608cc63c490da64d5ebd9cd4e013 diff --git a/solr/licenses/jetty-alpn-client-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-alpn-client-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 516be7f02054..000000000000 --- a/solr/licenses/jetty-alpn-client-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2b741945279551477cd038d9acefa34190f4efad diff --git a/solr/licenses/jetty-alpn-client-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-alpn-client-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..8159eae627ef --- /dev/null +++ b/solr/licenses/jetty-alpn-client-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +8ee1d39fd10e8c6c599fadda214af5afc3e4c67b diff --git a/solr/licenses/jetty-alpn-java-client-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-alpn-java-client-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index a2c9fa8edfc7..000000000000 --- a/solr/licenses/jetty-alpn-java-client-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2717d00a3e2e79304d3e2e620d10edab993715f9 diff --git a/solr/licenses/jetty-alpn-java-client-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-alpn-java-client-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..7b977587f40b --- /dev/null +++ b/solr/licenses/jetty-alpn-java-client-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +c16d748c1515b7e8e18008c2377fd619f1c5acac diff --git a/solr/licenses/jetty-alpn-java-server-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-alpn-java-server-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 22a8586e00f5..000000000000 --- a/solr/licenses/jetty-alpn-java-server-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3b11b75b11f1e3b8230a56eefb175aabed89aad7 diff --git a/solr/licenses/jetty-alpn-java-server-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-alpn-java-server-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..17af957d7152 --- /dev/null +++ b/solr/licenses/jetty-alpn-java-server-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +d3f511b5160cd74acc251a28a7c05b7dbb318212 diff --git a/solr/licenses/jetty-alpn-server-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-alpn-server-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 46d541db13d8..000000000000 --- a/solr/licenses/jetty-alpn-server-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ddac4f9a5c55dcd9c48a9672b5e6abac533c0e21 diff --git a/solr/licenses/jetty-alpn-server-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-alpn-server-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..9acb04b99569 --- /dev/null +++ b/solr/licenses/jetty-alpn-server-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +ac53eeb883d505bf4dce550b46d8e225a63c33d7 diff --git a/solr/licenses/jetty-client-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-client-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 8af5418bdb90..000000000000 --- a/solr/licenses/jetty-client-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b34fa346d2e3a459d4c30d533e28ccf2aee3f8a8 diff --git a/solr/licenses/jetty-client-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-client-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..f6f48deeda20 --- /dev/null +++ b/solr/licenses/jetty-client-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +5314498aa745115f207372e66f6ab8d8504e0c63 diff --git a/solr/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 9cfe0569eeba..000000000000 --- a/solr/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -070923c6b55dcabd4bde53971554261048844b3f diff --git a/solr/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..7bd5e5a78c51 --- /dev/null +++ b/solr/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +e5859cddb2cac51fd8339668bd35ccac106cb28f diff --git a/solr/licenses/jetty-deploy-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-deploy-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 224b8b6a7d10..000000000000 --- a/solr/licenses/jetty-deploy-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6d0f0eefa7f210eab166ac2ec03d3d329b622632 diff --git a/solr/licenses/jetty-deploy-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-deploy-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..360b5c568b47 --- /dev/null +++ b/solr/licenses/jetty-deploy-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +9751c23a0cb6120fe05d1a3af501ada00b78738d diff --git a/solr/licenses/jetty-http-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-http-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index c44b514bcbeb..000000000000 --- a/solr/licenses/jetty-http-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7acb9ea4deaba904a49e304ac24f9b3a8ddb5881 diff --git a/solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..36812d204b40 --- /dev/null +++ b/solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +0d460bece4dd9666b46cbd18f8d7fd31cf02ecd9 diff --git a/solr/licenses/jetty-io-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-io-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 46b17d2aadf1..000000000000 --- a/solr/licenses/jetty-io-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -80693ce94fa34647e9af613ba17c443feb624590 diff --git a/solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..d88fbd5f52a6 --- /dev/null +++ b/solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +820eea368623939c2113902b1ca7a98186f64a73 diff --git a/solr/licenses/jetty-jmx-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-jmx-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index dd20013486bb..000000000000 --- a/solr/licenses/jetty-jmx-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a0a065ed8acfd7a29712b22a16485c96fbdc9af8 diff --git a/solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..5e5f8457031c --- /dev/null +++ b/solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +ec801fc1f84a42f278cfb892c36d63e4e38929fc diff --git a/solr/licenses/jetty-rewrite-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-rewrite-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 24275d100b5f..000000000000 --- a/solr/licenses/jetty-rewrite-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -87a350e23851a8d326defc2d4259e4e6846cb490 diff --git a/solr/licenses/jetty-rewrite-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-rewrite-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..a2d615f8cc1e --- /dev/null +++ b/solr/licenses/jetty-rewrite-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +c454469a24fc26a468e6e17750b9755ab89ab6d8 diff --git a/solr/licenses/jetty-security-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-security-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index d220aed210a2..000000000000 --- a/solr/licenses/jetty-security-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bf4d5bb4deb938ed58813bcae75c6f1b82453df1 diff --git a/solr/licenses/jetty-security-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-security-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..f31c63400c0c --- /dev/null +++ b/solr/licenses/jetty-security-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +5ba69b1189a9d1f425ed03cbc2c901e0e6023c4d diff --git a/solr/licenses/jetty-server-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-server-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index bd9bf9f19115..000000000000 --- a/solr/licenses/jetty-server-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19c5309325d5819a9e22bfee66a3c0d50750ed03 diff --git a/solr/licenses/jetty-server-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-server-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..dd66f4733197 --- /dev/null +++ b/solr/licenses/jetty-server-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +25b1963b0a1c56202ec37046adc55861815107ce diff --git a/solr/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 822f1595ff6b..000000000000 --- a/solr/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -606f9724b14bf58c915ee0e37f6425c52dae7b76 diff --git a/solr/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..6ff3ebd21806 --- /dev/null +++ b/solr/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +ea45368ea7fd04026038f89e6910f17f70939641 diff --git a/solr/licenses/jetty-servlets-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-servlets-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index b83ff99030eb..000000000000 --- a/solr/licenses/jetty-servlets-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -60220df1900bfe624b8d5e9fad4d3da755bd5c6a diff --git a/solr/licenses/jetty-servlets-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-servlets-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..0f6e38704fcc --- /dev/null +++ b/solr/licenses/jetty-servlets-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +3b91e6956511b978355b597c5ac1737167e4bca5 diff --git a/solr/licenses/jetty-util-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-util-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 5b96d842b735..000000000000 --- a/solr/licenses/jetty-util-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -47993d1def63ca9e8bc7284716a89031f642db82 diff --git a/solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..9870323ef5c7 --- /dev/null +++ b/solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +548c76ea00d7eb3e2bcea273174e5d030639d109 diff --git a/solr/licenses/jetty-webapp-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-webapp-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index aa39816d764a..000000000000 --- a/solr/licenses/jetty-webapp-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a01524d9e59277e6849136a245056d91018a0988 diff --git a/solr/licenses/jetty-webapp-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-webapp-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..04711086c990 --- /dev/null +++ b/solr/licenses/jetty-webapp-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +e9dfb34715ab48f5175fd6ab96f67ff6c299e6fb diff --git a/solr/licenses/jetty-xml-9.4.34.v20201102.jar.sha1 b/solr/licenses/jetty-xml-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index b02a15ba0fd6..000000000000 --- a/solr/licenses/jetty-xml-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -72c779fe9ae051086ddce8dc01745ffd22646f60 diff --git a/solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1 new file mode 100644 index 000000000000..60df005ac475 --- /dev/null +++ b/solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +38d6d8fd800173c76c68ca847ceb823c0116ba04 diff --git a/solr/licenses/start.jar.sha1 b/solr/licenses/start.jar.sha1 index 4d6bbe75b8bc..f803100c76f9 100644 --- a/solr/licenses/start.jar.sha1 +++ b/solr/licenses/start.jar.sha1 @@ -1 +1 @@ -8bcce89a62de93e4c5ff2cd77de6d461c79df83e +6ce90c6155ec1b9b779511753c665d994b392ebf