This is an automated email from the ASF dual-hosted git repository.

casion pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git


The following commit(s) were added to refs/heads/master by this push:
     new 03a026383 issue-2491: upgrade jetty to 9.4.48
     new 5c7330536 Merge pull request #2492 from pjfanning/jetty-cve
03a026383 is described below

commit 03a026383ebc360a3a1676481de7022c758c22b2
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Jul 18 17:41:46 2022 +0100

    issue-2491: upgrade jetty to 9.4.48
---
 LICENSE-binary | 40 ++++++++++++++++++++--------------------
 pom.xml        |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 7f0f5e6a7..6d5043a24 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -218,26 +218,26 @@ The following components are provided under the Apache 
2.0 License.
 See licenses-binary/ for text of these licenses.
     (Apache License, Version 2.0) (Eclipse Distribution License - v 1.0) 
fastinfoset (com.sun.xml.fastinfoset:FastInfoset:1.2.16 - 
https://projects.eclipse.org/projects/ee4j.jaxb-impl/FastInfoset)
     (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Aggregate :: All core Jetty 
(org.eclipse.jetty.aggregate:jetty-all:7.6.0.v20120127 - 
http://www.eclipse.org/jetty/jetty-aggregate-project/jetty-all)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Continuation (org.eclipse.jetty:jetty-continuation:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Http Utility (org.eclipse.jetty:jetty-http:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: IO Utility (org.eclipse.jetty:jetty-io:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Plus (org.eclipse.jetty:jetty-plus:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Security (org.eclipse.jetty:jetty-security:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Server Core (org.eclipse.jetty:jetty-server:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Servlet Annotations (org.eclipse.jetty:jetty-annotations:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Utilities (org.eclipse.jetty:jetty-util:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Utility Servlets and Filters 
(org.eclipse.jetty:jetty-servlets:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.44.v20210927 
- http://www.eclipse.org/jetty)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: API (org.eclipse.jetty.websocket:websocket-api:9.4.44.v20210927 
- http://www.eclipse.org/jetty/websocket-api)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: Client 
(org.eclipse.jetty.websocket:websocket-client:9.4.44.v20210927 - 
http://www.eclipse.org/jetty/websocket-client)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: Common 
(org.eclipse.jetty.websocket:websocket-common:9.4.44.v20210927 - 
http://www.eclipse.org/jetty/websocket-common)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: Server 
(org.eclipse.jetty.websocket:websocket-server:9.4.44.v20210927 - 
http://www.eclipse.org/jetty/websocket-server)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: Servlet Interface 
(org.eclipse.jetty.websocket:websocket-servlet:9.4.44.v20210927 - 
http://www.eclipse.org/jetty/websocket-servlet)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: javax.websocket :: Client Implementation 
(org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.44.v20210927 - 
http://www.eclipse.org/jetty/javax-websocket-client-impl)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: javax.websocket.server :: Server Implementation 
(org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.44.v20210927 - 
http://www.eclipse.org/jetty/javax-websocket-server-impl)
-    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: XML utilities (org.eclipse.jetty:jetty-xml:9.4.44.v20210927 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Continuation (org.eclipse.jetty:jetty-continuation:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Http Utility (org.eclipse.jetty:jetty-http:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: IO Utility (org.eclipse.jetty:jetty-io:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Plus (org.eclipse.jetty:jetty-plus:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Security (org.eclipse.jetty:jetty-security:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Server Core (org.eclipse.jetty:jetty-server:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Servlet Annotations (org.eclipse.jetty:jetty-annotations:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Utilities (org.eclipse.jetty:jetty-util:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Utility Servlets and Filters 
(org.eclipse.jetty:jetty-servlets:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.48.v20220622 
- http://www.eclipse.org/jetty)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: API (org.eclipse.jetty.websocket:websocket-api:9.4.48.v20220622 
- http://www.eclipse.org/jetty/websocket-api)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: Client 
(org.eclipse.jetty.websocket:websocket-client:9.4.48.v20220622 - 
http://www.eclipse.org/jetty/websocket-client)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: Common 
(org.eclipse.jetty.websocket:websocket-common:9.4.48.v20220622 - 
http://www.eclipse.org/jetty/websocket-common)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: Server 
(org.eclipse.jetty.websocket:websocket-server:9.4.48.v20220622 - 
http://www.eclipse.org/jetty/websocket-server)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: Servlet Interface 
(org.eclipse.jetty.websocket:websocket-servlet:9.4.48.v20220622 - 
http://www.eclipse.org/jetty/websocket-servlet)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: javax.websocket :: Client Implementation 
(org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.48.v20220622 - 
http://www.eclipse.org/jetty/javax-websocket-client-impl)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: Websocket :: javax.websocket.server :: Server Implementation 
(org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.48.v20220622 - 
http://www.eclipse.org/jetty/javax-websocket-server-impl)
+    (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty 
:: XML utilities (org.eclipse.jetty:jetty-xml:9.4.48.v20220622 - 
http://www.eclipse.org/jetty)
     (Apache License, Version 2.0) (GNU Lesser General Public License (LGPL), 
Version 2.1) JAX-RS provider for JSON content type 
(org.codehaus.jackson:jackson-jaxrs:1.9.13 - http://jackson.codehaus.org)
     (Apache License, Version 2.0) (GNU Lesser General Public License (LGPL), 
Version 2.1) Xml Compatibility extensions for Jackson 
(org.codehaus.jackson:jackson-xc:1.9.13 - http://jackson.codehaus.org)
     (Apache License, Version 2.0) (GNU Library or Lesser General Public 
License (LGPL) V2.1) JSQLParser library (com.github.jsqlparser:jsqlparser:1.0 - 
https://github.com/JSQLParser/JSqlParser)
diff --git a/pom.xml b/pom.xml
index 66e98e025..1bbb693b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
         <jline.version>2.14.6</jline.version>
         <!-- hadoop 2.7 use curator 2.7.1, hadoop3.3 use curator 4.2.0-->
         <curator.version>2.7.1</curator.version>
-        <jetty.version>9.4.44.v20210927</jetty.version>
+        <jetty.version>9.4.48.v20220622</jetty.version>
         <httpclient.version>4.5.13</httpclient.version>
         <httpmime.version>4.5.4</httpmime.version>
         <slf4j.version>1.7.30</slf4j.version>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to