This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new da67eb2dd BIGTOP-4249. Fix build failure of Hadoop 3.3.6 against
ZooKeeper 3.8.4. (#1299)
da67eb2dd is described below
commit da67eb2dd7024994b0153139dc6d89572342dd61
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Thu Nov 7 10:00:21 2024 +0900
BIGTOP-4249. Fix build failure of Hadoop 3.3.6 against ZooKeeper 3.8.4.
(#1299)
---
.../common/hadoop/patch1-HADOOP-19116-3.3.6.diff | 50 ++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/bigtop-packages/src/common/hadoop/patch1-HADOOP-19116-3.3.6.diff
b/bigtop-packages/src/common/hadoop/patch1-HADOOP-19116-3.3.6.diff
new file mode 100644
index 000000000..a37aa06e5
--- /dev/null
+++ b/bigtop-packages/src/common/hadoop/patch1-HADOOP-19116-3.3.6.diff
@@ -0,0 +1,50 @@
+commit da1e732026cb4811ffe78ff98dc069e61ef71eaa
+Author: PJ Fanning <[email protected]>
+Date: Tue Jun 11 13:09:23 2024 +0100
+
+ HADOOP-19116. Update to zookeeper client 3.8.4 due to CVE-2024-23944.
(#6638)
+
+ Updated ZK client dependency to 3.8.4 to address CVE-2024-23944.
+
+ Contributed by PJ Fanning
+
+ (cherry picked from commit bd63358c0bb53bb1097f38ebf6c125547fe5e547)
+
+ Conflicts:
+ LICENSE-binary
+ hadoop-project/pom.xml
+
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 1503a86f15c6..ffe339636716 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -1415,6 +1415,14 @@
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
++ <exclusion>
++ <groupId>ch.qos.logback</groupId>
++ <artifactId>logback-core</artifactId>
++ </exclusion>
++ <exclusion>
++ <groupId>ch.qos.logback</groupId>
++ <artifactId>logback-classic</artifactId>
++ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+@@ -1459,6 +1467,14 @@
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
++ <exclusion>
++ <groupId>ch.qos.logback</groupId>
++ <artifactId>logback-core</artifactId>
++ </exclusion>
++ <exclusion>
++ <groupId>ch.qos.logback</groupId>
++ <artifactId>logback-classic</artifactId>
++ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
