diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 2eb21038a738..30e5fdbdc9a4 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -151,13 +151,6 @@ org.apache.htrace htrace-core4 - - - io.netty - netty - ${netty.hadoop.version} - test - org.slf4j jcl-over-slf4j diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 3487b0b5d106..86d878ec2c4a 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -803,13 +803,11 @@ - + diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml index 698610f3df12..8fa3318a0a4c 100644 --- a/hbase-zookeeper/pom.xml +++ b/hbase-zookeeper/pom.xml @@ -134,6 +134,15 @@ reload4j test + + + org.xerial.snappy + snappy-java + + + commons-cli + commons-cli + diff --git a/pom.xml b/pom.xml index 5ad0c76e8aa7..577bc97b7380 100755 --- a/pom.xml +++ b/pom.xml @@ -549,9 +549,18 @@ 11.0.2 hbase-hadoop2-compat src/main/assembly/hadoop-two-compat.xml - - 3.6.2.Final + + 3.10.6.Final + 4.1.100.Final 0.13.0 0.8.8 @@ -1105,6 +1116,11 @@ commons-math3 ${commons-math.version} + + commons-cli + commons-cli + ${commons-cli.version} + - - io.netty - netty-all - javax.servlet servlet-api @@ -3695,14 +3623,6 @@ com.sun.jersey jersey-core - - io.netty - netty - - - io.netty - netty-all - javax.servlet servlet-api @@ -3811,12 +3731,20 @@ log4j - io.netty - netty + ch.qos.reload4j + reload4j - io.netty - netty-all + org.slf4j + slf4j-reload4j + + + org.fusesource.leveldbjni + leveldbjni-all + + + org.openlabtesting.leveldbjni + leveldbjni-all @@ -3868,22 +3796,12 @@ log4j - io.netty - netty-all + ch.qos.reload4j + reload4j - - - - org.apache.hadoop - hadoop-hdfs - ${hadoop-three.version} - tests - test-jar - test - - com.sun.jersey - jersey-core + org.slf4j + slf4j-reload4j @@ -3943,14 +3861,6 @@ stax stax-api - - io.netty - netty - - - io.netty - netty-all - com.google.code.findbugs jsr305 @@ -4033,10 +3943,6 @@ com.google.code.findbugs jsr305 - - io.netty - netty - org.slf4j slf4j-log4j12 @@ -4045,6 +3951,30 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + + org.codehaus.jackson + * + + + javax.servlet.jsp + jsp-api + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + @@ -4092,17 +4022,6 @@ stax stax-api - - io.netty - netty - - com.google.code.findbugs jsr305