You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ar...@apache.org on 2021/04/07 17:40:56 UTC
[zookeeper] branch branch-3.5 updated: ZOOKEEPER-4277: update jetty
to 9.4.39 due to CVE-2021-28165
This is an automated email from the ASF dual-hosted git repository.
arshad pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new 57db922 ZOOKEEPER-4277: update jetty to 9.4.39 due to CVE-2021-28165
57db922 is described below
commit 57db922b4c51e472d5610bb28df3d2cbaca45549
Author: Norbert Kalmar <nk...@apache.org>
AuthorDate: Wed Apr 7 23:13:05 2021 +0530
ZOOKEEPER-4277: update jetty to 9.4.39 due to CVE-2021-28165
Author: Norbert Kalmar <nk...@apache.org>
Reviewers: Mohammad Arshad <ar...@apache.org>
Closes #1676 from nkalmar/branch-3.5
---
build.xml | 2 +-
pom.xml | 2 +-
...38.v20210224.LICENSE.txt => jetty-http-9.4.39.v20210325.LICENSE.txt} | 0
...4.38.v20210224.LICENSE.txt => jetty-io-9.4.39.v20210325.LICENSE.txt} | 0
...20210224.LICENSE.txt => jetty-security-9.4.39.v20210325.LICENSE.txt} | 0
....v20210224.LICENSE.txt => jetty-server-9.4.39.v20210325.LICENSE.txt} | 0
...v20210224.LICENSE.txt => jetty-servlet-9.4.39.v20210325.LICENSE.txt} | 0
...38.v20210224.LICENSE.txt => jetty-util-9.4.39.v20210325.LICENSE.txt} | 0
...0210224.LICENSE.txt => jetty-util-ajax-9.4.39.v20210325.LICENSE.txt} | 0
9 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 04ac6a3..bac50f2 100644
--- a/build.xml
+++ b/build.xml
@@ -54,7 +54,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<property name="javacc.version" value="5.0"/>
- <property name="jetty.version" value="9.4.38.v20210224"/>
+ <property name="jetty.version" value="9.4.39.v20210325"/>
<property name="jackson.version" value="2.10.3"/>
<property name="dependency-check-ant.version" value="5.2.4"/>
diff --git a/pom.xml b/pom.xml
index 8b24c58..d0b804d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -297,7 +297,7 @@
<mockito.version>2.27.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
<commons-cli.version>1.2</commons-cli.version>
- <jetty.version>9.4.38.v20210224</jetty.version>
+ <jetty.version>9.4.39.v20210325</jetty.version>
<netty.version>4.1.60.Final</netty.version>
<jackson.version>2.10.5.1</jackson.version>
<json.version>1.1.1</json.version>
diff --git a/zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.38.v20210224.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-http-9.4.39.v20210325.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.38.v20210224.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-http-9.4.39.v20210325.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-util-9.4.38.v20210224.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-io-9.4.39.v20210325.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-util-9.4.38.v20210224.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-io-9.4.39.v20210325.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.38.v20210224.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-security-9.4.39.v20210325.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.38.v20210224.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-security-9.4.39.v20210325.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-server-9.4.38.v20210224.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-server-9.4.39.v20210325.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-server-9.4.38.v20210224.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-server-9.4.39.v20210325.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-security-9.4.38.v20210224.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.39.v20210325.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-security-9.4.38.v20210224.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.39.v20210325.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-io-9.4.38.v20210224.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-util-9.4.39.v20210325.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-io-9.4.38.v20210224.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-util-9.4.39.v20210325.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/jetty-http-9.4.38.v20210224.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.39.v20210325.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jetty-http-9.4.38.v20210224.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.39.v20210325.LICENSE.txt