SOLR-16332: Upgrade Jetty to 9.4.48.v20220622 (apache#970)

cowpaths · Aug 19, 2022 · e0930a7 · e0930a7
1 parent f80511d
commit e0930a7
Show file tree

Hide file tree

Showing 53 changed files with 52 additions and 50 deletions.
diff --git 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
diff --git a/solr/licenses/http2-client-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/http2-common-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/http2-hpack-9.4.48.v20220622.jar.sha1 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
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
@@ -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
diff --git a/solr/licenses/http2-server-9.4.48.v20220622.jar.sha1 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
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
@@ -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
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
@@ -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
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
@@ -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
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
@@ -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
diff --git a/solr/licenses/jetty-client-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/jetty-continuation-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/jetty-deploy-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/jetty-http-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/jetty-io-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/jetty-jmx-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/jetty-rewrite-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/jetty-security-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/jetty-server-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/jetty-servlet-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/jetty-servlets-9.4.48.v20220622.jar.sha1 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
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
@@ -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
diff --git a/solr/licenses/jetty-util-9.4.48.v20220622.jar.sha1 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
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
@@ -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
diff --git a/solr/licenses/jetty-webapp-9.4.48.v20220622.jar.sha1 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
diff --git a/solr/licenses/jetty-xml-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-xml-9.4.48.v20220622.jar.sha1
@@ -0,0 +1 @@
+2c8b7ad6b64437a693cd30666f3def666aac8207
diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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)
@@ Expand Down @@