summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnanya Singh <purpul90@gmail.com>2021-10-28 10:28:49 +0200
committerNorbert Kalmar <nkalmar@cloudera.com>2021-10-28 10:28:49 +0200
commitc86c03d4675ee36a3880da6ef4edff6f4d7126f0 (patch)
tree9b06d72583dda842a69e6ea8959c7f6b4591e02d
parent17416567b77d6602dc3b46298c7c989cd4f15701 (diff)
downloadzookeeper-c86c03d4675ee36a3880da6ef4edff6f4d7126f0.tar.gz
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 <purpul90@gmail.com> Author: Brahma Reddy Battula <brahma@apache.org> Reviewers: Enrico Olivelli <eolivelli@apache.org>, Norbert Kalmar <nkalmar@apache.org> Closes #1768 from AnanyaSingh2121/zookeeper-4390
-rw-r--r--build.xml2
-rwxr-xr-xpom.xml2
-rw-r--r--zookeeper-server/src/main/resources/lib/jetty-http-9.4.43.v20210629.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/jetty-http-9.4.39.v20210325.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/jetty-io-9.4.43.v20210629.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/jetty-io-9.4.39.v20210325.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/jetty-security-9.4.43.v20210629.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/jetty-security-9.4.39.v20210325.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/jetty-server-9.4.43.v20210629.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/jetty-server-9.4.39.v20210325.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.43.v20210629.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.39.v20210325.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/jetty-util-9.4.43.v20210629.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/jetty-util-9.4.39.v20210325.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.43.v20210629.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/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 fc3fdb7dc..820eb7d78 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 a10a8d90c..0e32f6fc4 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-http-9.4.39.v20210325.LICENSE.txt b/zookeeper-server/src/main/resources/lib/jetty-http-9.4.43.v20210629.LICENSE.txt
index 46f4f2524..46f4f2524 100644
--- a/zookeeper-server/src/main/resources/lib/jetty-http-9.4.39.v20210325.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/jetty-http-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-io-9.4.43.v20210629.LICENSE.txt
index 46f4f2524..46f4f2524 100644
--- a/zookeeper-server/src/main/resources/lib/jetty-io-9.4.39.v20210325.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/jetty-io-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-security-9.4.43.v20210629.LICENSE.txt
index 46f4f2524..46f4f2524 100644
--- a/zookeeper-server/src/main/resources/lib/jetty-security-9.4.39.v20210325.LICENSE.txt
+++ b/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
index 46f4f2524..46f4f2524 100644
--- 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
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-servlet-9.4.43.v20210629.LICENSE.txt
index 46f4f2524..46f4f2524 100644
--- a/zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.39.v20210325.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/jetty-servlet-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-util-9.4.43.v20210629.LICENSE.txt
index 46f4f2524..46f4f2524 100644
--- a/zookeeper-server/src/main/resources/lib/jetty-util-9.4.39.v20210325.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/jetty-util-9.4.43.v20210629.LICENSE.txt
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-util-ajax-9.4.43.v20210629.LICENSE.txt
index 46f4f2524..46f4f2524 100644
--- a/zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.39.v20210325.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.43.v20210629.LICENSE.txt