From 318614abbd4c6889c70c3dea1adab6ccf41e3f63 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-backup/pom.xml | 6 -- hbase-client/pom.xml | 6 -- hbase-endpoint/pom.xml | 6 -- hbase-examples/pom.xml | 6 -- hbase-external-blockcache/pom.xml | 13 ---- hbase-it/pom.xml | 6 -- hbase-mapreduce/pom.xml | 13 +--- hbase-procedure/pom.xml | 9 --- hbase-replication/pom.xml | 6 -- hbase-rest/pom.xml | 6 -- hbase-rsgroup/pom.xml | 6 -- hbase-server/pom.xml | 10 +--- hbase-shaded/pom.xml | 122 +++++++++++++++++++++++++++++++------- hbase-shell/pom.xml | 6 -- hbase-testing-util/pom.xml | 10 ---- hbase-thrift/pom.xml | 9 --- pom.xml | 26 ++++++-- 17 files changed, 122 insertions(+), 144 deletions(-) diff --git a/hbase-backup/pom.xml b/hbase-backup/pom.xml index 6282471297..5f498d25dc 100644 --- a/hbase-backup/pom.xml +++ b/hbase-backup/pom.xml @@ -291,12 +291,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 45393b5bf7..c22535bee9 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -322,12 +322,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index 45efbaa30f..c6e76cec54 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 49f71e3934..bcd1368490 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -296,12 +296,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 845e8f33e1..378cee9492 100644 --- a/hbase-external-blockcache/pom.xml +++ b/hbase-external-blockcache/pom.xml @@ -292,23 +292,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 a166b91537..a2262cf6e6 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -411,12 +411,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - org.apache.hadoop diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 7e0a87c85a..d3822ccdb2 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -453,23 +453,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 bb9ce84423..a764f2a1e1 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 039f8ac76f..2cd2c2c4dd 100644 --- a/hbase-replication/pom.xml +++ b/hbase-replication/pom.xml @@ -237,12 +237,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 63146bcf8e..e7dc864bd1 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 9b0bfe7557..7720f12efa 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -274,12 +274,6 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 2995981a7c..d971d354f5 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -816,9 +816,6 @@ 3.0 - - ${hadoop-three.version} - org.apache.hadoop @@ -837,12 +834,7 @@ org.apache.hadoop hadoop-minicluster - - - com.google.guava - guava - - + test diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 7f92901cac..075641a30e 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,38 +149,63 @@ + + com.cedarsoftware + ${shaded.prefix}.com.cedarsoftware + com.codahale org.apache.hadoop.hbase.shaded.com.codahale + + com.ctc + ${shaded.prefix}.com.ctc + + + com.dropwizard + org.apache.hadoop.hbase.shaded.com.dropwizard + + + com.fasterxml + org.apache.hadoop.hbase.shaded.com.fasterxml + 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.jcraft + org.apache.hadoop.hbase.shaded.com.jcraft + com.lmax org.apache.hadoop.hbase.shaded.com.lmax - com.dropwizard - org.apache.hadoop.hbase.shaded.com.dropwizard + com.microsoft + ${shaded.prefix}.com.microsoft - com.fasterxml - org.apache.hadoop.hbase.shaded.com.fasterxml + com.nimbusds + ${shaded.prefix}.com.nimbusds + + com.squareup + ${shaded.prefix}.com.squareup + + + com.thoughtworks + org.apache.hadoop.hbase.shaded.com.thoughtworks + + + com.zaxxer + ${shaded.prefix}.com.zaxxer + + @@ -187,11 +213,25 @@ org.apache.hadoop.hbase.shaded.io.netty + + + okio + ${shaded.prefix}.okio + + org.codehaus org.apache.hadoop.hbase.shaded.org.codehaus + + org.eclipse + ${shaded.prefix}.org.eclipse + + + org.ehcache + ${shaded.prefix}.org.ehcache + org.jcodings org.apache.hadoop.hbase.shaded.org.jcodings @@ -204,6 +244,14 @@ org.mortbay org.apache.hadoop.hbase.shaded.org.mortbay + + org.nustaq + ${shaded.prefix}.org.nustaq + + + org.terracotta + ${shaded.prefix}.org.terracotta + org.tukaani org.apache.hadoop.hbase.shaded.org.tukaani @@ -264,22 +312,26 @@ org.apache.http org.apache.hadoop.hbase.shaded.org.apache.http + + org.apache.jasper + org.apache.hadoop.hbase.shaded.org.apache.jasper + org.apache.jute org.apache.hadoop.hbase.shaded.org.apache.jute + + org.apache.kerby + ${shaded.prefix}.org.apache.kerby + + + org.apache.taglibs + ${shaded.prefix}.org.apache.taglibs + org.apache.zookeeper org.apache.hadoop.hbase.shaded.org.apache.zookeeper - - org.apache.jasper - org.apache.hadoop.hbase.shaded.org.apache.jasper - - - org.apache.taglibs - org.apache.hadoop.hbase.shaded.org.apache.commons - @@ -302,6 +354,10 @@ org.apache.commons.crypto org.apache.hadoop.hbase.shaded.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 @@ -353,8 +409,8 @@ - net.iharder - org.apache.hadoop.hbase.shaded.net.iharder + net + ${shaded.prefix}.net @@ -414,11 +470,14 @@ - *:* + *.proto **/*.proto + + LICENSE + NOTICE @@ -435,6 +494,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 9bbeed70d6..1b30f0aae0 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -427,12 +427,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 d8ec6a7dab..2841459a33 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 6457b33d38..98182a0681 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -574,19 +574,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 aece338a89..195dfe137d 100755 --- a/pom.xml +++ b/pom.xml @@ -2849,10 +2849,10 @@ org.codehaus.jackson jackson-mapper-asl - - com.google.guava - guava - + + com.google.guava + guava + @@ -2871,6 +2871,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 @@ -2885,7 +2901,7 @@ javax.servlet - servlet-api + javax.servlet-api stax -- 2.15.0