SOLR-15316 Update Jetty to 9.4.41 (backport 8x) (#2502)

apache · Jun 4, 2021 · 506d370 · 506d370
1 parent ec3e445
commit 506d370
Show file tree

Hide file tree

Showing 62 changed files with 35 additions and 31 deletions.
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
@@ -128,6 +128,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
@@ -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
diff --git a/lucene/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 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
diff --git a/lucene/licenses/jetty-http-9.4.41.v20210516.jar.sha1 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
diff --git a/lucene/licenses/jetty-io-9.4.41.v20210516.jar.sha1 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
diff --git a/lucene/licenses/jetty-server-9.4.41.v20210516.jar.sha1 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
diff --git a/lucene/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 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
diff --git a/lucene/licenses/jetty-util-9.4.41.v20210516.jar.sha1 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
@@ -154,6 +154,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
diff --git a/solr/licenses/http2-client-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/http2-common-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/http2-hpack-9.4.41.v20210516.jar.sha1 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
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
@@ -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
diff --git a/solr/licenses/http2-server-9.4.41.v20210516.jar.sha1 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
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
@@ -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
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
@@ -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
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
@@ -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
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
@@ -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
diff --git a/solr/licenses/jetty-client-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-deploy-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-rewrite-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-security-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-server-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-servlets-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-webapp-9.4.41.v20210516.jar.sha1 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
diff --git a/solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1 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
@@ -1 +1 @@
-8bcce89a62de93e4c5ff2cd77de6d461c79df83e
+6ce90c6155ec1b9b779511753c665d994b392ebf
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		8bcce89a62de93e4c5ff2cd77de6d461c79df83e
		6ce90c6155ec1b9b779511753c665d994b392ebf