ZOOKEEPER-4778: Update Netty, Jetty and Logback (multiple CVEs) (apac…

…he#2118)
AlphaCanisMajoris · Mar 28, 2024 · 7ccd5d8 · 7ccd5d8
1 parent feb4c99
commit 7ccd5d8
Show file tree

Hide file tree

Showing 26 changed files with 2,195 additions and 1,849 deletions.
diff --git a/pom.xml b/pom.xml
@@ -551,16 +551,16 @@
 
     <!-- dependency versions -->
     <slf4j.version>1.7.30</slf4j.version>
-    <logback-version>1.2.10</logback-version>
+    <logback-version>1.2.13</logback-version>
     <audience-annotations.version>0.12.0</audience-annotations.version>
     <jmockit.version>1.48</jmockit.version>
     <junit.version>5.6.2</junit.version>
     <junit-platform.version>1.6.2</junit-platform.version>
     <mockito.version>4.9.0</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
     <commons-cli.version>1.5.0</commons-cli.version>
-    <netty.version>4.1.94.Final</netty.version>
-    <jetty.version>9.4.52.v20230823</jetty.version>
+    <netty.version>4.1.105.Final</netty.version>
+    <jetty.version>9.4.53.v20231009</jetty.version>
     <jackson.version>2.15.2</jackson.version>
     <jline.version>2.14.6</jline.version>
     <snappy.version>1.1.10.5</snappy.version>

diff --git a/...jetty-client-9.4.52.v20230823.LICENSE.txt → ...jetty-client-9.4.53.v20231009.LICENSE.txt b/...jetty-client-9.4.52.v20230823.LICENSE.txt → ...jetty-client-9.4.53.v20231009.LICENSE.txt
diff --git a/...b/jetty-http-9.4.52.v20230823.LICENSE.txt → ...b/jetty-http-9.4.53.v20231009.LICENSE.txt b/...b/jetty-http-9.4.52.v20230823.LICENSE.txt → ...b/jetty-http-9.4.53.v20231009.LICENSE.txt
diff --git a/...lib/jetty-io-9.4.52.v20230823.LICENSE.txt → ...lib/jetty-io-9.4.53.v20231009.LICENSE.txt b/...lib/jetty-io-9.4.52.v20230823.LICENSE.txt → ...lib/jetty-io-9.4.53.v20231009.LICENSE.txt
diff --git a/...tty-security-9.4.52.v20230823.LICENSE.txt → ...tty-security-9.4.53.v20231009.LICENSE.txt b/...tty-security-9.4.52.v20230823.LICENSE.txt → ...tty-security-9.4.53.v20231009.LICENSE.txt
diff --git a/...jetty-server-9.4.52.v20230823.LICENSE.txt → ...jetty-server-9.4.53.v20231009.LICENSE.txt b/...jetty-server-9.4.52.v20230823.LICENSE.txt → ...jetty-server-9.4.53.v20231009.LICENSE.txt
diff --git a/...etty-servlet-9.4.52.v20230823.LICENSE.txt → ...etty-servlet-9.4.53.v20231009.LICENSE.txt b/...etty-servlet-9.4.52.v20230823.LICENSE.txt → ...etty-servlet-9.4.53.v20231009.LICENSE.txt
diff --git a/...b/jetty-util-9.4.52.v20230823.LICENSE.txt → ...b/jetty-util-9.4.53.v20231009.LICENSE.txt b/...b/jetty-util-9.4.52.v20230823.LICENSE.txt → ...b/jetty-util-9.4.53.v20231009.LICENSE.txt
diff --git a/...ty-util-ajax-9.4.52.v20230823.LICENSE.txt → ...ty-util-ajax-9.4.53.v20231009.LICENSE.txt b/...ty-util-ajax-9.4.52.v20230823.LICENSE.txt → ...ty-util-ajax-9.4.53.v20231009.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/logback-classic-1.2.10.LICENSE.txt b/zookeeper-server/src/main/resources/lib/logback-classic-1.2.10.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/logback-classic-1.2.13.LICENSE.txt b/zookeeper-server/src/main/resources/lib/logback-classic-1.2.13.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/logback-core-1.2.10.LICENSE.txt b/zookeeper-server/src/main/resources/lib/logback-core-1.2.10.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/logback-core-1.2.13.LICENSE.txt b/zookeeper-server/src/main/resources/lib/logback-core-1.2.13.LICENSE.txt
diff --git a/.../lib/netty-codec-4.1.94.Final.LICENSE.txt → ...ib/netty-buffer-4.1.105.Final.LICENSE.txt b/.../lib/netty-codec-4.1.94.Final.LICENSE.txt → ...ib/netty-buffer-4.1.105.Final.LICENSE.txt
@@ -1,7 +1,7 @@
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -193,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/...lib/netty-common-4.1.94.Final.LICENSE.txt → ...lib/netty-codec-4.1.105.Final.LICENSE.txt b/...lib/netty-common-4.1.94.Final.LICENSE.txt → ...lib/netty-codec-4.1.105.Final.LICENSE.txt
@@ -1,7 +1,7 @@
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -193,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/...es/lib/netty-bom-4.1.94.Final.LICENSE.txt → ...ib/netty-common-4.1.105.Final.LICENSE.txt b/...es/lib/netty-bom-4.1.94.Final.LICENSE.txt → ...ib/netty-common-4.1.105.Final.LICENSE.txt
@@ -1,7 +1,7 @@
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -193,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/...lib/netty-buffer-4.1.94.Final.LICENSE.txt → ...b/netty-handler-4.1.105.Final.LICENSE.txt b/...lib/netty-buffer-4.1.94.Final.LICENSE.txt → ...b/netty-handler-4.1.105.Final.LICENSE.txt
@@ -1,7 +1,7 @@
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -193,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.94.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.94.Final.LICENSE.txt