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 d752d65fc11d HADOOP-18942. Upgrade ZooKeeper to 3.7.2. (#6200) d752d65fc11d is described below commit d752d65fc11dd133d25c835dd29d145959be05eb Author: Masatake Iwasaki <iwasak...@apache.org> AuthorDate: Thu Oct 19 18:47:45 2023 +0900 HADOOP-18942. Upgrade ZooKeeper to 3.7.2. (#6200) Signed-off-by: Masatake Iwasaki <iwasak...@apache.org> (cherry picked from commit 8bf72346a59c2eb785fb2a8e55c0246a4f158646) Conflicts: hadoop-project/pom.xml --- hadoop-project/pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index b33b55522472..884140f9309e 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.4</zookeeper.version> + <zookeeper.version>3.7.2</zookeeper.version> <curator.version>5.2.0</curator.version> <findbugs.version>3.0.5</findbugs.version> <dnsjava.version>2.1.7</dnsjava.version> @@ -1423,6 +1423,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-reload4j</artifactId> </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-client</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1459,6 +1463,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-client</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