This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 02b6446ac135 HADOOP-18867. Upgrade ZooKeeper to 3.6.4. (#5988)
02b6446ac135 is described below
commit 02b6446ac1355a7678533fb0224821060edab9a9
Author: Masatake Iwasaki <iwasak...@apache.org>
AuthorDate: Wed Oct 18 10:31:41 2023 +0900
HADOOP-18867. Upgrade ZooKeeper to 3.6.4. (#5988)
(cherry picked from commit 13843f4a880f9bfd2c65097699297fc218a2fb5f)
Conflicts:
hadoop-project/pom.xml
---
hadoop-project/pom.xml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index e7c5ea0c1e9e..b33b55522472 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -105,7 +105,7 @@
<hadoop-thirdparty-shaded-protobuf-prefix>${hadoop-thirdparty-shaded-prefix}.protobuf</hadoop-thirdparty-shaded-protobuf-prefix>
<hadoop-thirdparty-shaded-guava-prefix>${hadoop-thirdparty-shaded-prefix}.com.google.common</hadoop-thirdparty-shaded-guava-prefix>
- <zookeeper.version>3.6.3</zookeeper.version>
+ <zookeeper.version>3.6.4</zookeeper.version>
<curator.version>5.2.0</curator.version>
<findbugs.version>3.0.5</findbugs.version>
<dnsjava.version>2.1.7</dnsjava.version>
@@ -1736,6 +1736,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1765,6 +1769,10 @@
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1781,6 +1789,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
