This is an automated email from the ASF dual-hosted git repository. zhangduo pushed a commit to branch branch-2 in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push: new 0d04a6053a0 HBASE-28153 Upgrade zookeeper to a newer version (#5484) 0d04a6053a0 is described below commit 0d04a6053a05525e0ba8fd6525c3af7f3412c9de Author: Duo Zhang <zhang...@apache.org> AuthorDate: Wed Nov 1 10:48:01 2023 +0800 HBASE-28153 Upgrade zookeeper to a newer version (#5484) Backport of #5475 --- hbase-backup/pom.xml | 5 ++ hbase-it/pom.xml | 7 -- hbase-server/pom.xml | 7 -- hbase-zookeeper/pom.xml | 9 +++ pom.xml | 204 +++++++++--------------------------------------- 5 files changed, 50 insertions(+), 182 deletions(-) diff --git a/hbase-backup/pom.xml b/hbase-backup/pom.xml index 176746d2cda..be057a4c3c5 100644 --- a/hbase-backup/pom.xml +++ b/hbase-backup/pom.xml @@ -43,6 +43,11 @@ <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-client</artifactId> diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 96766fa5e56..180bb076668 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -155,13 +155,6 @@ <groupId>io.opentelemetry</groupId> <artifactId>opentelemetry-api</artifactId> </dependency> - <!-- Hadoop needs Netty 3.x at test scope for the minicluster --> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - <version>${netty.hadoop.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index f27c4112536..132e1faa6ca 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -835,13 +835,6 @@ </exclusion> </exclusions> </dependency> - <!-- Hadoop needs Netty 3.x at test scope for the minicluster> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - <version>${netty.hadoop.version}</version> - <scope>test</scope> - </dependency--> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minikdc</artifactId> diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml index 19eb33dfb55..f2b997b09f1 100644 --- a/hbase-zookeeper/pom.xml +++ b/hbase-zookeeper/pom.xml @@ -143,6 +143,15 @@ <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> + <!-- ZooKeeperServer needs the below dependencies, thus MiniZooKeeperCluster also needs them --> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> </dependencies> <build> diff --git a/pom.xml b/pom.xml index bd50ebda011..414a155fa9b 100644 --- a/pom.xml +++ b/pom.xml @@ -555,10 +555,18 @@ <hadoop.guava.version>11.0.2</hadoop.guava.version> <compat.module>hbase-hadoop2-compat</compat.module> <assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file> - <!--This property is for hadoops netty. HBase netty - comes in via hbase-thirdparty hbase-shaded-netty. - Note this is overridden by hadoop-specific profiles below. --> - <netty.hadoop.version>3.10.6.Final</netty.hadoop.version> + <!-- + These property is for transitive netty dependencies from thirdparty dependencies, like + hadoop and zookeeper. HBase netty comes in via hbase-thirdparty hbase-shaded-netty + In the old time, netty-all includes all the classes but maven does not know it so it is + possible that we have netty-all and netty-handler both on the classpath but they have + different version and cause conflicts. Newer version of netty-all solved the this problem + by depending all other netty modules, but we'd better still specify the version by our own + in the dependencyManagement section as it could still lead to different versions of netty + modules and cause trouble if we only rely on transitive dependencies. + --> + <netty3.version>3.10.6.Final</netty3.version> + <netty4.version>4.1.100.Final</netty4.version> <!-- end HBASE-15925 default hadoop compatibility values --> <audience-annotations.version>0.13.0</audience-annotations.version> <!-- @@ -572,7 +580,8 @@ <commons-io.version>2.11.0</commons-io.version> <commons-lang3.version>3.9</commons-lang3.version> <commons-math.version>3.6.1</commons-math.version> - <disruptor.version>3.4.2</disruptor.version> + <commons-cli.version>1.5.0</commons-cli.version> + <disruptor.version>3.4.4</disruptor.version> <httpclient.version>4.5.13</httpclient.version> <httpcore.version>4.4.13</httpcore.version> <metrics-core.version>3.2.6</metrics-core.version> @@ -597,7 +606,7 @@ <protobuf.plugin.version>0.6.1</protobuf.plugin.version> <thrift.path>thrift</thrift.path> <thrift.version>0.14.1</thrift.version> - <zookeeper.version>3.5.7</zookeeper.version> + <zookeeper.version>3.8.3</zookeeper.version> <jline.version>2.11</jline.version> <slf4j.version>1.7.33</slf4j.version> <clover.version>4.0.3</clover.version> @@ -1172,6 +1181,11 @@ <artifactId>commons-math3</artifactId> <version>${commons-math.version}</version> </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>${commons-cli.version}</version> + </dependency> <dependency> <!-- commons-logging is only used by hbase-http's HttpRequestLog and hbase-server's HBaseTestingUtil. @@ -1186,44 +1200,12 @@ <version>${zookeeper.version}</version> <exclusions> <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> - <exclusion> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-annotations</artifactId> - </exclusion> - <exclusion> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> </exclusion> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> </exclusion> </exclusions> </dependency> @@ -1551,6 +1533,18 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + <version>${netty3.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-bom</artifactId> + <version>${netty4.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> </dependencies> </dependencyManagement> <dependencies> @@ -3251,14 +3245,6 @@ <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-xc</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -3318,14 +3304,6 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -3359,14 +3337,6 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -3458,14 +3428,6 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>stax</groupId> <artifactId>stax-api</artifactId> @@ -3519,14 +3481,6 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>stax</groupId> <artifactId>stax-api</artifactId> @@ -3633,14 +3587,6 @@ <groupId>stax</groupId> <artifactId>stax-api</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> @@ -3722,10 +3668,6 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -3812,14 +3754,6 @@ <groupId>stax</groupId> <artifactId>stax-api</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> @@ -3942,14 +3876,6 @@ <groupId>org.codehaus.jackson</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -4005,11 +3931,6 @@ <groupId>org.codehaus.jackson</groupId> <artifactId>*</artifactId> </exclusion> - <!--HERE--> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -4039,14 +3960,6 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -4166,14 +4079,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-reload4j</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>org.fusesource.leveldbjni</groupId> <artifactId>leveldbjni-all</artifactId> @@ -4235,13 +4140,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-reload4j</artifactId> </exclusion> - <!-- - Needed in test context when hadoop-3.3 runs. - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - --> </exclusions> </dependency> <dependency> @@ -4308,14 +4206,6 @@ <groupId>stax</groupId> <artifactId>stax-api</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> @@ -4402,10 +4292,6 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -4422,13 +4308,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-reload4j</artifactId> </exclusion> - <!-- - Needed in test context when hadoop-3.3 runs. - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - --> <exclusion> <groupId>org.codehaus.jackson</groupId> <artifactId>*</artifactId> @@ -4492,17 +4371,6 @@ <groupId>stax</groupId> <artifactId>stax-api</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <!-- MiniMRCluster needs the hadoop netty-all transitive include... a - netty-all 4.0.52 version.... so we have to let it through. - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - --> <exclusion> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId>