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:38:58 UTC
[zookeeper] branch branch-3.6 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.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 acc19ce ZOOKEEPER-4277: update jetty to 9.4.39 due to CVE-2021-28165
acc19ce is described below
commit acc19ce90bedc8083fb8678050a2c689cb8772b9
Author: Norbert Kalmar <nk...@apache.org>
AuthorDate: Wed Apr 7 23:10:01 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 #1675 from nkalmar/master
(cherry picked from commit b08b6bb2ea7259face0df881dcbc9f5061a35d1e)
Signed-off-by: Mohammad Arshad <ar...@apache.org>
---
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
8 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6d63b38..22ac85b 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.60.Final</netty.version>
- <jetty.version>9.4.38.v20210224</jetty.version>
+ <jetty.version>9.4.39.v20210325</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.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