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]>
apache · Dec 8, 2023 · 1160212 · 1160212
1 parent d2e7814
commit 1160212
Show file tree

Hide file tree

Showing 50 changed files with 50 additions and 47 deletions.
diff --git a/solr/licenses/awaitility-4.2.0.jar.sha1 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
diff --git a/solr/licenses/http2-client-10.0.18.jar.sha1 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
diff --git a/solr/licenses/http2-common-10.0.18.jar.sha1 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
diff --git a/solr/licenses/http2-hpack-10.0.18.jar.sha1 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
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
@@ -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
diff --git a/solr/licenses/http2-server-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-alpn-client-10.0.18.jar.sha1 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
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
@@ -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
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
@@ -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
diff --git a/solr/licenses/jetty-alpn-server-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-client-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-deploy-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-http-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-io-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-jmx-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-rewrite-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-security-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-server-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-servlet-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-servlets-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-start-10.0.18-shaded.jar.sha1 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
diff --git a/solr/licenses/jetty-util-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-webapp-10.0.18.jar.sha1 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
diff --git a/solr/licenses/jetty-xml-10.0.18.jar.sha1 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
@@ -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
@@ -275,28 +275,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
@@ -54,7 +54,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