[improve][misc] Upgrade to Jetty 12

lhotari · May 13, 2024 · d6d2209 · d6d2209
1 parent 936afec
commit d6d2209
Show file tree

Hide file tree

Showing 95 changed files with 1,082 additions and 1,118 deletions.
diff --git a/distribution/licenses/LICENSE-ASM.txt b/distribution/licenses/LICENSE-ASM.txt
@@ -0,0 +1,28 @@
+
+ ASM: a very small and fast Java bytecode manipulation framework
+ Copyright (c) 2000-2011 INRIA, France Telecom
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -330,7 +330,6 @@ The Apache Software License, Version 2.0
     - io.prometheus-simpleclient_common-0.16.0.jar
     - io.prometheus-simpleclient_hotspot-0.16.0.jar
     - io.prometheus-simpleclient_httpserver-0.16.0.jar
-    - io.prometheus-simpleclient_jetty-0.16.0.jar
     - io.prometheus-simpleclient_log4j2-0.16.0.jar
     - io.prometheus-simpleclient_servlet-0.16.0.jar
     - io.prometheus-simpleclient_servlet_common-0.16.0.jar
@@ -353,8 +352,8 @@ The Apache Software License, Version 2.0
     - org.apache.logging.log4j-log4j-slf4j2-impl-2.23.1.jar
     - org.apache.logging.log4j-log4j-web-2.23.1.jar
  * Java Native Access JNA
-    - net.java.dev.jna-jna-jpms-5.12.1.jar
-    - net.java.dev.jna-jna-platform-jpms-5.12.1.jar
+    - net.java.dev.jna-jna-jpms-5.14.0.jar
+    - net.java.dev.jna-jna-platform-jpms-5.14.0.jar
  * BookKeeper
     - org.apache.bookkeeper-bookkeeper-common-4.17.0.jar
     - org.apache.bookkeeper-bookkeeper-common-allocator-4.17.0.jar
@@ -393,25 +392,42 @@ The Apache Software License, Version 2.0
     - org.asynchttpclient-async-http-client-2.12.1.jar
     - org.asynchttpclient-async-http-client-netty-utils-2.12.1.jar
  * Jetty
-    - org.eclipse.jetty-jetty-client-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-continuation-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-http-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-io-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-proxy-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-security-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-server-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-servlet-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-servlets-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-util-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-util-ajax-9.4.54.v20240208.jar
-    - org.eclipse.jetty.websocket-javax-websocket-client-impl-9.4.54.v20240208.jar
-    - org.eclipse.jetty.websocket-websocket-api-9.4.54.v20240208.jar
-    - org.eclipse.jetty.websocket-websocket-client-9.4.54.v20240208.jar
-    - org.eclipse.jetty.websocket-websocket-common-9.4.54.v20240208.jar
-    - org.eclipse.jetty.websocket-websocket-server-9.4.54.v20240208.jar
-    - org.eclipse.jetty.websocket-websocket-servlet-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-alpn-conscrypt-server-9.4.54.v20240208.jar
-    - org.eclipse.jetty-jetty-alpn-server-9.4.54.v20240208.jar
+    - org.eclipse.jetty-jetty-alpn-client-12.0.9.jar
+    - org.eclipse.jetty-jetty-alpn-conscrypt-server-12.0.9.jar
+    - org.eclipse.jetty-jetty-alpn-server-12.0.9.jar
+    - org.eclipse.jetty-jetty-client-12.0.9.jar
+    - org.eclipse.jetty-jetty-ee-12.0.9.jar
+    - org.eclipse.jetty-jetty-http-12.0.9.jar
+    - org.eclipse.jetty-jetty-io-12.0.9.jar
+    - org.eclipse.jetty-jetty-jndi-12.0.9.jar
+    - org.eclipse.jetty-jetty-plus-12.0.9.jar
+    - org.eclipse.jetty-jetty-security-12.0.9.jar
+    - org.eclipse.jetty-jetty-server-12.0.9.jar
+    - org.eclipse.jetty-jetty-session-12.0.9.jar
+    - org.eclipse.jetty-jetty-util-12.0.9.jar
+    - org.eclipse.jetty-jetty-xml-12.0.9.jar
+    - org.eclipse.jetty.ee8-jetty-ee8-annotations-12.0.9.jar
+    - org.eclipse.jetty.ee8-jetty-ee8-nested-12.0.9.jar
+    - org.eclipse.jetty.ee8-jetty-ee8-plus-12.0.9.jar
+    - org.eclipse.jetty.ee8-jetty-ee8-proxy-12.0.9.jar
+    - org.eclipse.jetty.ee8-jetty-ee8-security-12.0.9.jar
+    - org.eclipse.jetty.ee8-jetty-ee8-servlet-12.0.9.jar
+    - org.eclipse.jetty.ee8-jetty-ee8-servlets-12.0.9.jar
+    - org.eclipse.jetty.ee8-jetty-ee8-webapp-12.0.9.jar
+    - org.eclipse.jetty.ee8.websocket-jetty-ee8-websocket-javax-client-12.0.9.jar
+    - org.eclipse.jetty.ee8.websocket-jetty-ee8-websocket-javax-common-12.0.9.jar
+    - org.eclipse.jetty.ee8.websocket-jetty-ee8-websocket-jetty-api-12.0.9.jar
+    - org.eclipse.jetty.ee8.websocket-jetty-ee8-websocket-jetty-common-12.0.9.jar
+    - org.eclipse.jetty.ee8.websocket-jetty-ee8-websocket-jetty-server-12.0.9.jar
+    - org.eclipse.jetty.ee8.websocket-jetty-ee8-websocket-servlet-12.0.9.jar
+    - org.eclipse.jetty.toolchain-jetty-javax-websocket-api-1.1.2.jar
+    - org.eclipse.jetty.toolchain-jetty-servlet-api-4.0.6.jar
+    - org.eclipse.jetty.websocket-jetty-websocket-core-client-12.0.9.jar
+    - org.eclipse.jetty.websocket-jetty-websocket-core-common-12.0.9.jar
+    - org.eclipse.jetty.websocket-jetty-websocket-core-server-12.0.9.jar
+    - org.eclipse.jetty.websocket-jetty-websocket-jetty-api-12.0.9.jar
+    - org.eclipse.jetty.websocket-jetty-websocket-jetty-client-12.0.9.jar
+    - org.eclipse.jetty.websocket-jetty-websocket-jetty-common-12.0.9.jar
  * SnakeYaml -- org.yaml-snakeyaml-2.0.jar
  * RocksDB - org.rocksdb-rocksdbjni-7.9.2.jar
  * Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.24.0.jar
@@ -552,6 +568,10 @@ BSD 3-clause "New" or "Revised" License
  * JSR305 -- com.google.code.findbugs-jsr305-3.0.2.jar -- ../licenses/LICENSE-JSR305.txt
  * JLine -- jline-jline-2.14.6.jar -- ../licenses/LICENSE-JLine.txt
  * JLine3 -- org.jline-jline-3.21.0.jar -- ../licenses/LICENSE-JLine.txt
+ * OW2 ASM
+   - org.ow2.asm-asm-9.7.jar -- ../licenses/LICENSE-ASM.txt
+   - org.ow2.asm-asm-commons-9.7.jar -- ../licenses/LICENSE-ASM.txt
+   - org.ow2.asm-asm-tree-9.7.jar -- ../licenses/LICENSE-ASM.txt
 
 BSD 2-Clause License
  * HdrHistogram -- org.hdrhistogram-HdrHistogram-2.1.9.jar -- ../licenses/LICENSE-HdrHistogram.txt
@@ -578,7 +598,6 @@ CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
     - com.sun.activation-javax.activation-1.2.0.jar
     - javax.xml.bind-jaxb-api-2.3.1.jar
  * Java Servlet API -- javax.servlet-javax.servlet-api-3.1.0.jar
- * WebSocket Server API -- javax.websocket-javax.websocket-client-api-1.0.jar
  * Java Web Service REST API -- javax.ws.rs-javax.ws.rs-api-2.1.jar
  * HK2 - Dependency Injection Kernel
     - org.glassfish.hk2-hk2-api-2.6.1.jar
@@ -607,6 +626,7 @@ Eclipse Public License - v2.0 -- ../licenses/LICENSE-EPL-2.0.txt
  * Jakarta Annotations API -- jakarta.annotation-jakarta.annotation-api-1.3.5.jar
  * Jakarta RESTful Web Services -- jakarta.ws.rs-jakarta.ws.rs-api-2.1.6.jar
  * Jakarta Injection -- org.glassfish.hk2.external-jakarta.inject-2.6.1.jar
+ * Jakarta Transactions API -- jakarta.transaction-jakarta.transaction-api-1.3.3.jar
 
 Public Domain (CC0) -- ../licenses/LICENSE-CC0.txt
  * Reactive Streams -- org.reactivestreams-reactive-streams-1.0.3.jar

diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -403,14 +403,20 @@ The Apache Software License, Version 2.0
     - async-http-client-2.12.1.jar
     - async-http-client-netty-utils-2.12.1.jar
  * Jetty
-    - jetty-client-9.4.54.v20240208.jar
-    - jetty-http-9.4.54.v20240208.jar
-    - jetty-io-9.4.54.v20240208.jar
-    - jetty-util-9.4.54.v20240208.jar
-    - javax-websocket-client-impl-9.4.54.v20240208.jar
-    - websocket-api-9.4.54.v20240208.jar
-    - websocket-client-9.4.54.v20240208.jar
-    - websocket-common-9.4.54.v20240208.jar
+    - jetty-alpn-client-12.0.9.jar
+    - jetty-client-12.0.9.jar
+    - jetty-ee8-websocket-javax-client-12.0.9.jar
+    - jetty-ee8-websocket-javax-common-12.0.9.jar
+    - jetty-ee8-websocket-jetty-api-12.0.9.jar
+    - jetty-http-12.0.9.jar
+    - jetty-io-12.0.9.jar
+    - jetty-javax-websocket-api-1.1.2.jar
+    - jetty-util-12.0.9.jar
+    - jetty-websocket-core-client-12.0.9.jar
+    - jetty-websocket-core-common-12.0.9.jar
+    - jetty-websocket-jetty-api-12.0.9.jar
+    - jetty-websocket-jetty-client-12.0.9.jar
+    - jetty-websocket-jetty-common-12.0.9.jar
  * SnakeYaml -- snakeyaml-2.0.jar
  * Google Error Prone Annotations - error_prone_annotations-2.24.0.jar
  * Javassist -- javassist-3.25.0-GA.jar
@@ -437,7 +443,6 @@ CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
     - javax.annotation-api-1.3.2.jar
     - javax.activation-1.2.0.jar
     - jaxb-api-2.3.1.jar
- * WebSocket Server API -- javax.websocket-client-api-1.0.jar
  * Java Web Service REST API -- javax.ws.rs-api-2.1.jar
  * HK2 - Dependency Injection Kernel
     - hk2-api-2.6.1.jar