You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by nk...@apache.org on 2021/10/28 08:25:03 UTC

[zookeeper] branch branch-3.6 updated: Update Jetty: 9.4.39.v20210325 → 9.4.43.v20210629

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

nkalmar pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.6 by this push:
     new 507fd62  Update Jetty: 9.4.39.v20210325 → 9.4.43.v20210629
507fd62 is described below

commit 507fd6207396e5c8d1dee1f777262a6150fd56ed
Author: Ananya Singh <pu...@gmail.com>
AuthorDate: Thu Oct 28 10:24:34 2021 +0200

    Update Jetty: 9.4.39.v20210325 → 9.4.43.v20210629
    
    Update Jetty: 9.4.39.v20210325 → 9.4.43.v20210629 due to CVE-2021-28169 , CVE-2021-28163, CVE-2021-34428
    Backport ZOOKEEPER-4337 for branch-3.6
    
    Author: Ananya Singh <pu...@gmail.com>
    
    Reviewers: Enrico Olivelli <eo...@apache.org>, Norbert Kalmar <nk...@apache.org>
    
    Closes #1769 from AnanyaSingh2121/zookeeper-4390-x-3.6
---
 pom.xml                                                                 | 2 +-
 ...39.v20210325.LICENSE.txt => jetty-http-9.4.43.v20210629.LICENSE.txt} | 0
 ...4.39.v20210325.LICENSE.txt => jetty-io-9.4.43.v20210629.LICENSE.txt} | 0
 ...20210325.LICENSE.txt => jetty-security-9.4.43.v20210629.LICENSE.txt} | 0
 ....v20210325.LICENSE.txt => jetty-server-9.4.43.v20210629.LICENSE.txt} | 0
 ...v20210325.LICENSE.txt => jetty-servlet-9.4.43.v20210629.LICENSE.txt} | 0
 ...39.v20210325.LICENSE.txt => jetty-util-9.4.43.v20210629.LICENSE.txt} | 0
 ...0210325.LICENSE.txt => jetty-util-ajax-9.4.43.v20210629.LICENSE.txt} | 0
 8 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 84b47c7..fd9d41b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -356,7 +356,7 @@
     <hamcrest.version>1.3</hamcrest.version>
     <commons-cli.version>1.2</commons-cli.version>
     <netty.version>4.1.63.Final</netty.version>
-    <jetty.version>9.4.39.v20210325</jetty.version>
+    <jetty.version>9.4.43.v20210629</jetty.version>
     <jackson.version>2.10.5.1</jackson.version>
     <json.version>1.1.1</json.version>
     <jline.version>2.14.6</jline.version>
diff --git a/zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.39.v20210325.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-http-9.4.43.v20210629.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.39.v20210325.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-http-9.4.43.v20210629.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-util-9.4.39.v20210325.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-io-9.4.43.v20210629.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-util-9.4.39.v20210325.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-io-9.4.43.v20210629.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.39.v20210325.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-security-9.4.43.v20210629.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.39.v20210325.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-security-9.4.43.v20210629.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-server-9.4.39.v20210325.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-server-9.4.43.v20210629.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-server-9.4.39.v20210325.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-server-9.4.43.v20210629.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-security-9.4.39.v20210325.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.43.v20210629.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-security-9.4.39.v20210325.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.43.v20210629.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-io-9.4.39.v20210325.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-util-9.4.43.v20210629.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-io-9.4.39.v20210325.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-util-9.4.43.v20210629.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-http-9.4.39.v20210325.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.43.v20210629.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-http-9.4.39.v20210325.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.43.v20210629.LICENSE.txt