From 23a9059cb206897fc1f996a7858a59c9ec4f5803 Mon Sep 17 00:00:00 2001 From: Mike Drob Date: Thu, 14 Dec 2017 09:19:34 -0600 Subject: [PATCH] HBASE-18838 Fix hadoop3 check-shaded-invariants --- hbase-client/pom.xml | 6 - .../hadoop/hbase/util/JSONMetricUtil.java | 3 +- hbase-endpoint/pom.xml | 6 - hbase-examples/pom.xml | 6 - hbase-external-blockcache/pom.xml | 13 - hbase-it/pom.xml | 12 - hbase-mapreduce/pom.xml | 27 +-- hbase-procedure/pom.xml | 9 - hbase-replication/pom.xml | 6 - hbase-rest/pom.xml | 6 - hbase-rsgroup/pom.xml | 6 - hbase-server/pom.xml | 18 +- hbase-shaded/pom.xml | 226 ++++++++++++------ hbase-shell/pom.xml | 6 - hbase-testing-util/pom.xml | 10 - hbase-thrift/pom.xml | 9 - pom.xml | 32 ++- 17 files changed, 195 insertions(+), 206 deletions(-) diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 9a8f2c5595b..6ebe40c3618 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -309,12 +309,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JSONMetricUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JSONMetricUtil.java index d10610e37b1..c11c52a68e9 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JSONMetricUtil.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JSONMetricUtil.java @@ -43,7 +43,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codehaus.jettison.json.JSONException; public final class JSONMetricUtil { @@ -180,7 +179,7 @@ public final class JSONMetricUtil { } public static String getCommmand() throws MalformedObjectNameException, - IOException, JSONException { + IOException { RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean(); return runtimeBean.getSystemProperties().get("sun.java.command"); } diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index 98d994d695e..b92a7922ba5 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -337,12 +337,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - org.apache.hadoop diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index d0ad1706ed7..19556e496c4 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -282,12 +282,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - org.apache.hadoop diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index ff5a7229902..8b4aa269755 100644 --- a/hbase-external-blockcache/pom.xml +++ b/hbase-external-blockcache/pom.xml @@ -279,23 +279,10 @@ 3.0 - - 3.0-SNAPSHOT - org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - - com.google.guava - guava - - diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 99872d1c2ba..1643a640102 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -393,22 +393,10 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - org.apache.hadoop hadoop-minicluster - - - org.apache.htrace - htrace-core - - org.apache.hadoop diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index eaa9d69ce9d..facdf3fa6a9 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -273,13 +273,6 @@ junit test - - - io.netty - netty - ${netty.hadoop.version} - test - com.fasterxml.jackson.core jackson-databind @@ -417,6 +410,13 @@ + + + io.netty + netty + ${netty.hadoop.version} + test + @@ -440,23 +440,12 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - org.apache.hadoop hadoop-minicluster - - - org.apache.htrace - htrace-core - - + test diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml index 4461fce04f0..0f0f00d1c8e 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -157,19 +157,10 @@ 3.0 - - 3.0-SNAPSHOT - org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - diff --git a/hbase-replication/pom.xml b/hbase-replication/pom.xml index e04a84893a9..8c6b4285c23 100644 --- a/hbase-replication/pom.xml +++ b/hbase-replication/pom.xml @@ -224,12 +224,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 810fbd5c742..58e988babbf 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -432,12 +432,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - org.apache.hadoop diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index 528d6310013..de5b9496747 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -256,12 +256,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index ac4369da667..61be98a4322 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -803,9 +803,6 @@ 3.0 - - ${hadoop-three.version} - org.apache.hadoop @@ -816,6 +813,10 @@ org.apache.hadoop hadoop-common + + org.apache.hadoop + hadoop-hdfs + org.apache.hadoop hadoop-annotations @@ -824,20 +825,15 @@ org.apache.hadoop hadoop-minicluster - - - com.google.guava - guava - - + test - + diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 1a2117b19d8..8720c5a532d 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -36,6 +36,7 @@ true true + org.apache.hadoop.hbase.shaded hbase-shaded-client @@ -148,223 +149,282 @@ + + com.cedarsoftware + ${shaded.prefix}.com.cedarsoftware + com.codahale - org.apache.hadoop.hbase.shaded.com.codahale + ${shaded.prefix}.com.codahale - com.google - org.apache.hadoop.hbase.shaded.com.google - - - com.jcraft - org.apache.hadoop.hbase.shaded.com.jcraft - - - com.thoughtworks - org.apache.hadoop.hbase.shaded.com.thoughtworks - - - com.jamesmurty - org.apache.hadoop.hbase.shaded.com.jamesmurty - - - com.lmax - org.apache.hadoop.hbase.shaded.com.lmax + com.ctc + ${shaded.prefix}.com.ctc com.dropwizard - org.apache.hadoop.hbase.shaded.com.dropwizard + ${shaded.prefix}.com.dropwizard com.fasterxml - org.apache.hadoop.hbase.shaded.com.fasterxml + ${shaded.prefix}.com.fasterxml + + + com.google + ${shaded.prefix}.com.google + + + com.jamesmurty + ${shaded.prefix}.com.jamesmurty + + + com.jcraft + ${shaded.prefix}.com.jcraft + + + com.lmax + ${shaded.prefix}.com.lmax + + + com.microsoft + ${shaded.prefix}.com.microsoft + + + com.nimbusds + ${shaded.prefix}.com.nimbusds + + + com.squareup + ${shaded.prefix}.com.squareup + + + com.thoughtworks + ${shaded.prefix}.com.thoughtworks + + + com.zaxxer + ${shaded.prefix}.com.zaxxer - + + + + org.jboss.netty + ${shaded.prefix}.org.jboss.netty + io.netty - org.apache.hadoop.hbase.shaded.io.netty + ${shaded.prefix}.io.netty + + + + + okio + ${shaded.prefix}.okio org.codehaus - org.apache.hadoop.hbase.shaded.org.codehaus + ${shaded.prefix}.org.codehaus + + + org.eclipse + ${shaded.prefix}.org.eclipse + + + org.ehcache + ${shaded.prefix}.org.ehcache org.jcodings - org.apache.hadoop.hbase.shaded.org.jcodings + ${shaded.prefix}.org.jcodings org.joni - org.apache.hadoop.hbase.shaded.org.joni + ${shaded.prefix}.org.joni org.mortbay - org.apache.hadoop.hbase.shaded.org.mortbay + ${shaded.prefix}.org.mortbay + + + org.nustaq + ${shaded.prefix}.org.nustaq + + + org.terracotta + ${shaded.prefix}.org.terracotta org.tukaani - org.apache.hadoop.hbase.shaded.org.tukaani + ${shaded.prefix}.org.tukaani org.xerial - org.apache.hadoop.hbase.shaded.org.xerial + ${shaded.prefix}.org.xerial org.znerd - org.apache.hadoop.hbase.shaded.org.znerd + ${shaded.prefix}.org.znerd org.aopalliance - org.apache.hadoop.hbase.shaded.org.aopalliance + ${shaded.prefix}.org.aopalliance org.fusesource - org.apache.hadoop.hbase.shaded.org.fusesource + ${shaded.prefix}.org.fusesource org.iq80 - org.apache.hadoop.hbase.shaded.org.iq80 + ${shaded.prefix}.org.iq80 org.jamon - org.apache.hadoop.hbase.shaded.org.jamon + ${shaded.prefix}.org.jamon org.jets3t - org.apache.hadoop.hbase.shaded.org.jets3t + ${shaded.prefix}.org.jets3t contribs.mx - org.apache.hadoop.hbase.shaded.contribs.mx + ${shaded.prefix}.contribs.mx org.objectweb - org.apache.hadoop.hbase.shaded.org.objectweb + ${shaded.prefix}.org.objectweb org.apache.avro - org.apache.hadoop.hbase.shaded.org.apache.avro + ${shaded.prefix}.org.apache.avro org.apache.curator - org.apache.hadoop.hbase.shaded.org.apache.curator + ${shaded.prefix}.org.apache.curator org.apache.directory - org.apache.hadoop.hbase.shaded.org.apache.directory + ${shaded.prefix}.org.apache.directory org.apache.http - org.apache.hadoop.hbase.shaded.org.apache.http - - - org.apache.jute - org.apache.hadoop.hbase.shaded.org.apache.jute - - - org.apache.zookeeper - org.apache.hadoop.hbase.shaded.org.apache.zookeeper + ${shaded.prefix}.org.apache.http org.apache.jasper - org.apache.hadoop.hbase.shaded.org.apache.jasper + ${shaded.prefix}.org.apache.jasper + + + org.apache.jute + ${shaded.prefix}.org.apache.jute + + + org.apache.kerby + ${shaded.prefix}.org.apache.kerby org.apache.taglibs - org.apache.hadoop.hbase.shaded.org.apache.commons + ${shaded.prefix}.org.apache.taglibs + + + org.apache.zookeeper + ${shaded.prefix}.org.apache.zookeeper org.apache.commons.beanutils - org.apache.hadoop.hbase.shaded.org.apache.commons.beanutils + ${shaded.prefix}.org.apache.commons.beanutils org.apache.commons.cli - org.apache.hadoop.hbase.shaded.org.apache.commons.cli + ${shaded.prefix}.org.apache.commons.cli org.apache.commons.collections - org.apache.hadoop.hbase.shaded.org.apache.commons.collections + ${shaded.prefix}.org.apache.commons.collections org.apache.commons.configuration - org.apache.hadoop.hbase.shaded.org.apache.commons.configuration + ${shaded.prefix}.org.apache.commons.configuration org.apache.commons.crypto - org.apache.hadoop.hbase.shaded.org.apache.commons.crypto + ${shaded.prefix}.org.apache.commons.crypto + + + org.apache.commons.csv + ${shaded.prefix}.org.apache.commons.csv org.apache.commons.daemon - org.apache.hadoop.hbase.shaded.org.apache.commons.daemon + ${shaded.prefix}.org.apache.commons.daemon org.apache.commons.io - org.apache.hadoop.hbase.shaded.org.apache.commons.io + ${shaded.prefix}.org.apache.commons.io org.apache.commons.math - org.apache.hadoop.hbase.shaded.org.apache.commons.math + ${shaded.prefix}.org.apache.commons.math org.apache.commons.math3 - org.apache.hadoop.hbase.shaded.org.apache.commons.math3 + ${shaded.prefix}.org.apache.commons.math3 org.apache.commons.net - org.apache.hadoop.hbase.shaded.org.apache.commons.net + ${shaded.prefix}.org.apache.commons.net org.apache.commons.lang - org.apache.hadoop.hbase.shaded.org.apache.commons.lang + ${shaded.prefix}.org.apache.commons.lang org.apache.commons.lang3 - org.apache.hadoop.hbase.shaded.org.apache.commons.lang3 + ${shaded.prefix}.org.apache.commons.lang3 org.apache.commons.el - org.apache.hadoop.hbase.shaded.org.apache.commons.el + ${shaded.prefix}.org.apache.commons.el org.apache.commons.httpclient - org.apache.hadoop.hbase.shaded.org.apache.commons.httpclient + ${shaded.prefix}.org.apache.commons.httpclient org.apache.commons.compress - org.apache.hadoop.hbase.shaded.org.apache.commons.compress + ${shaded.prefix}.org.apache.commons.compress org.apache.commons.digester - org.apache.hadoop.hbase.shaded.org.apache.commons.digester + ${shaded.prefix}.org.apache.commons.digester org.apache.commons.codec - org.apache.hadoop.hbase.shaded.org.apache.commons.codec + ${shaded.prefix}.org.apache.commons.codec - net.iharder - org.apache.hadoop.hbase.shaded.net.iharder + net + ${shaded.prefix}.net junit - org.apache.hadoop.hbase.shaded.junit + ${shaded.prefix}.junit org.junit - org.apache.hadoop.hbase.shaded.org.junit + ${shaded.prefix}.org.junit @@ -414,11 +474,14 @@ - *:* + *.proto **/*.proto + + LICENSE + NOTICE @@ -435,6 +498,23 @@ mapred-default.xml.orig + + + org.eclipse.jetty:* + + about.html + jetty-dir.css + + + + org.apache.kerby:* + + krb5-template.conf + krb5_udp-template.conf + ccache.txt + keytab.txt + + diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index 9eea4606418..c365926ea80 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -414,12 +414,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - org.apache.hadoop diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index b8e5eab3708..07eb286a8fa 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -241,20 +241,10 @@ 3.0 - - 3.0-SNAPSHOT - org.apache.hadoop hadoop-common - compile - - - org.apache.htrace - htrace-core - - org.apache.hadoop diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 5f925cfd4ea..ad18dbb39e3 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -561,19 +561,10 @@ 3.0 - - 3.0-SNAPSHOT - org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - org.apache.hadoop diff --git a/pom.xml b/pom.xml index 15f712f2921..c25c55b0f3b 100644 --- a/pom.xml +++ b/pom.xml @@ -2667,11 +2667,16 @@ org.apache.hadoop hadoop-hdfs + ${hadoop-three.version} org.apache.htrace htrace-core + + com.sun.jersey + jersey-core + javax.servlet.jsp jsp-api @@ -2701,7 +2706,6 @@ guava - ${hadoop-three.version} org.apache.hadoop @@ -2738,10 +2742,10 @@ org.codehaus.jackson jackson-mapper-asl - - com.google.guava - guava - + + com.google.guava + guava + @@ -2760,6 +2764,22 @@ hadoop-common ${hadoop-three.version} + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-servlet + + + com.sun.jersey + jersey-server + org.apache.htrace htrace-core @@ -2774,7 +2794,7 @@ javax.servlet - servlet-api + javax.servlet-api stax