This is an automated email from the ASF dual-hosted git repository.
nkalmar 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 c86c03d Update Jetty: 9.4.39.v20210325 → 9.4.43.v20210629
c86c03d is described below
commit c86c03d4675ee36a3880da6ef4edff6f4d7126f0
Author: Ananya Singh <[email protected]>
AuthorDate: Thu Oct 28 10:28:49 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.5
Author: Ananya Singh <[email protected]>
Author: Brahma Reddy Battula <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Norbert Kalmar
<[email protected]>
Closes #1768 from AnanyaSingh2121/zookeeper-4390
---
build.xml | 2 +-
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
9 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index fc3fdb7..820eb7d 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.39.v20210325"/>
+ <property name="jetty.version" value="9.4.43.v20210629"/>
<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 a10a8d9..0e32f6f 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.39.v20210325</jetty.version>
+ <jetty.version>9.4.43.v20210629</jetty.version>
<netty.version>4.1.63.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.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
