Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-18838 Fix hadoop3 check-shaded-invariants

This commit is contained in:
Mike Drob 2017-12-14 09:19:34 -06:00
parent 672c440b9f
commit 23a9059cb2
17 changed files with 195 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-client/pom.xml
View File

@ -309,12 +309,6 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>

3
hbase-common/src/main/java/org/apache/hadoop/hbase/util/JSONMetricUtil.java
View File

@ -43,7 +43,6 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.codehaus.jettison.json.JSONException;
public final class JSONMetricUtil { public final class JSONMetricUtil {
@ -180,7 +179,7 @@ public final class JSONMetricUtil {
} }
public static String getCommmand() throws MalformedObjectNameException, public static String getCommmand() throws MalformedObjectNameException,
IOException, JSONException { IOException {
RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean(); RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean();
return runtimeBean.getSystemProperties().get("sun.java.command"); return runtimeBean.getSystemProperties().get("sun.java.command");
} }

6
hbase-endpoint/pom.xml
View File

@ -337,12 +337,6 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

6
hbase-examples/pom.xml
View File

@ -282,12 +282,6 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

13
hbase-external-blockcache/pom.xml
View File

@ -279,23 +279,10 @@
<value>3.0</value> <value>3.0</value>
</property> </property>
</activation> </activation>
<properties>
<hadoop.version>3.0-SNAPSHOT</hadoop.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

12
hbase-it/pom.xml
View File

@ -393,22 +393,10 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId> <artifactId>hadoop-minicluster</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

27
hbase-mapreduce/pom.xml
View File

@ -273,13 +273,6 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </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> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
@ -417,6 +410,13 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </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>
</dependencies> </dependencies>
</profile> </profile>
@ -440,23 +440,12 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<!--maven dependency:analyze says not needed but tests fail w/o--> <!--maven dependency:analyze says not needed but tests fail w/o-->
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId> <artifactId>hadoop-minicluster</artifactId>
<exclusions> <scope>test</scope>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>

9
hbase-procedure/pom.xml
View File

@ -157,19 +157,10 @@
<value>3.0</value> <value>3.0</value>
</property> </property>
</activation> </activation>
<properties>
<hadoop.version>3.0-SNAPSHOT</hadoop.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>

6
hbase-replication/pom.xml
View File

@ -224,12 +224,6 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>

6
hbase-rest/pom.xml
View File

@ -432,12 +432,6 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

6
hbase-rsgroup/pom.xml
View File

@ -256,12 +256,6 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>

18
hbase-server/pom.xml
View File

@ -803,9 +803,6 @@
<value>3.0</value> <value>3.0</value>
</property> </property>
</activation> </activation>
<properties>
<hadoop.version>${hadoop-three.version}</hadoop.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
@ -816,6 +813,10 @@
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId> <artifactId>hadoop-annotations</artifactId>
@ -824,20 +825,15 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId> <artifactId>hadoop-minicluster</artifactId>
<exclusions> <scope>test</scope>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- Hadoop needs Netty 3.x at test scope for the minicluster --> <!-- Hadoop needs Netty 3.x at test scope for the minicluster>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
<version>${netty.hadoop.version}</version> <version>${netty.hadoop.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency-->
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

226
hbase-shaded/pom.xml
View File

@ -36,6 +36,7 @@
<!-- Don't make a source-jar --> <!-- Don't make a source-jar -->
<source.skip>true</source.skip> <source.skip>true</source.skip>
<license.bundles.dependencies>true</license.bundles.dependencies> <license.bundles.dependencies>true</license.bundles.dependencies>
<shaded.prefix>org.apache.hadoop.hbase.shaded</shaded.prefix>
</properties> </properties>
<modules> <modules>
<module>hbase-shaded-client</module> <module>hbase-shaded-client</module>
@ -148,223 +149,282 @@
</artifactSet> </artifactSet>
<relocations> <relocations>
<!-- top level com not including sun--> <!-- top level com not including sun-->
<relocation>
<pattern>com.cedarsoftware</pattern>
<shadedPattern>${shaded.prefix}.com.cedarsoftware</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>com.codahale</pattern> <pattern>com.codahale</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.com.codahale</shadedPattern> <shadedPattern>${shaded.prefix}.com.codahale</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.google</pattern> <pattern>com.ctc</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.com.google</shadedPattern> <shadedPattern>${shaded.prefix}.com.ctc</shadedPattern>
</relocation>
<relocation>
<pattern>com.jcraft</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.com.jcraft</shadedPattern>
</relocation>
<relocation>
<pattern>com.thoughtworks</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.com.thoughtworks</shadedPattern>
</relocation>
<relocation>
<pattern>com.jamesmurty</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.com.jamesmurty</shadedPattern>
</relocation>
<relocation>
<pattern>com.lmax</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.com.lmax</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.dropwizard</pattern> <pattern>com.dropwizard</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.com.dropwizard</shadedPattern> <shadedPattern>${shaded.prefix}.com.dropwizard</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.fasterxml</pattern> <pattern>com.fasterxml</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.com.fasterxml</shadedPattern> <shadedPattern>${shaded.prefix}.com.fasterxml</shadedPattern>
</relocation>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>${shaded.prefix}.com.google</shadedPattern>
</relocation>
<relocation>
<pattern>com.jamesmurty</pattern>
<shadedPattern>${shaded.prefix}.com.jamesmurty</shadedPattern>
</relocation>
<relocation>
<pattern>com.jcraft</pattern>
<shadedPattern>${shaded.prefix}.com.jcraft</shadedPattern>
</relocation>
<relocation>
<pattern>com.lmax</pattern>
<shadedPattern>${shaded.prefix}.com.lmax</shadedPattern>
</relocation>
<relocation>
<pattern>com.microsoft</pattern>
<shadedPattern>${shaded.prefix}.com.microsoft</shadedPattern>
</relocation>
<relocation>
<pattern>com.nimbusds</pattern>
<shadedPattern>${shaded.prefix}.com.nimbusds</shadedPattern>
</relocation>
<relocation>
<pattern>com.squareup</pattern>
<shadedPattern>${shaded.prefix}.com.squareup</shadedPattern>
</relocation>
<relocation>
<pattern>com.thoughtworks</pattern>
<shadedPattern>${shaded.prefix}.com.thoughtworks</shadedPattern>
</relocation>
<relocation>
<pattern>com.zaxxer</pattern>
<shadedPattern>${shaded.prefix}.com.zaxxer</shadedPattern>
</relocation> </relocation>
<!-- top level io -->
<!-- netty family -->
<relocation>
<pattern>org.jboss.netty</pattern>
<shadedPattern>${shaded.prefix}.org.jboss.netty</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>io.netty</pattern> <pattern>io.netty</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.io.netty</shadedPattern> <shadedPattern>${shaded.prefix}.io.netty</shadedPattern>
</relocation>
<!-- top level okio -->
<relocation>
<pattern>okio</pattern>
<shadedPattern>${shaded.prefix}.okio</shadedPattern>
</relocation> </relocation>
<!-- top level org --> <!-- top level org -->
<relocation> <relocation>
<pattern>org.codehaus</pattern> <pattern>org.codehaus</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.codehaus</shadedPattern> <shadedPattern>${shaded.prefix}.org.codehaus</shadedPattern>
</relocation>
<relocation>
<pattern>org.eclipse</pattern>
<shadedPattern>${shaded.prefix}.org.eclipse</shadedPattern>
</relocation>
<relocation>
<pattern>org.ehcache</pattern>
<shadedPattern>${shaded.prefix}.org.ehcache</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.jcodings</pattern> <pattern>org.jcodings</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.jcodings</shadedPattern> <shadedPattern>${shaded.prefix}.org.jcodings</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.joni</pattern> <pattern>org.joni</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.joni</shadedPattern> <shadedPattern>${shaded.prefix}.org.joni</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.mortbay</pattern> <pattern>org.mortbay</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.mortbay</shadedPattern> <shadedPattern>${shaded.prefix}.org.mortbay</shadedPattern>
</relocation>
<relocation>
<pattern>org.nustaq</pattern>
<shadedPattern>${shaded.prefix}.org.nustaq</shadedPattern>
</relocation>
<relocation>
<pattern>org.terracotta</pattern>
<shadedPattern>${shaded.prefix}.org.terracotta</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.tukaani</pattern> <pattern>org.tukaani</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.tukaani</shadedPattern> <shadedPattern>${shaded.prefix}.org.tukaani</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.xerial</pattern> <pattern>org.xerial</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.xerial</shadedPattern> <shadedPattern>${shaded.prefix}.org.xerial</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.znerd</pattern> <pattern>org.znerd</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.znerd</shadedPattern> <shadedPattern>${shaded.prefix}.org.znerd</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.aopalliance</pattern> <pattern>org.aopalliance</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.aopalliance</shadedPattern> <shadedPattern>${shaded.prefix}.org.aopalliance</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.fusesource</pattern> <pattern>org.fusesource</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.fusesource</shadedPattern> <shadedPattern>${shaded.prefix}.org.fusesource</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.iq80</pattern> <pattern>org.iq80</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.iq80</shadedPattern> <shadedPattern>${shaded.prefix}.org.iq80</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.jamon</pattern> <pattern>org.jamon</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.jamon</shadedPattern> <shadedPattern>${shaded.prefix}.org.jamon</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.jets3t</pattern> <pattern>org.jets3t</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.jets3t</shadedPattern> <shadedPattern>${shaded.prefix}.org.jets3t</shadedPattern>
</relocation> </relocation>
<!-- poorly named add-on package from jets3t dependency. TODO can we just exclude these? --> <!-- poorly named add-on package from jets3t dependency. TODO can we just exclude these? -->
<relocation> <relocation>
<pattern>contribs.mx</pattern> <pattern>contribs.mx</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.contribs.mx</shadedPattern> <shadedPattern>${shaded.prefix}.contribs.mx</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.objectweb</pattern> <pattern>org.objectweb</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.objectweb</shadedPattern> <shadedPattern>${shaded.prefix}.org.objectweb</shadedPattern>
</relocation> </relocation>
<!-- org.apache relocations not in org.apache.hadoop or org.apache.commons --> <!-- org.apache relocations not in org.apache.hadoop or org.apache.commons -->
<relocation> <relocation>
<pattern>org.apache.avro</pattern> <pattern>org.apache.avro</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.avro</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.avro</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.curator</pattern> <pattern>org.apache.curator</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.curator</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.curator</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.directory</pattern> <pattern>org.apache.directory</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.directory</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.directory</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.http</pattern> <pattern>org.apache.http</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.http</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.http</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.jute</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.jute</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.zookeeper</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.zookeeper</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.jasper</pattern> <pattern>org.apache.jasper</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.jasper</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.jasper</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.jute</pattern>
<shadedPattern>${shaded.prefix}.org.apache.jute</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.kerby</pattern>
<shadedPattern>${shaded.prefix}.org.apache.kerby</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.taglibs</pattern> <pattern>org.apache.taglibs</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.taglibs</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.zookeeper</pattern>
<shadedPattern>${shaded.prefix}.org.apache.zookeeper</shadedPattern>
</relocation> </relocation>
<!-- org.apache.commons not including logging --> <!-- org.apache.commons not including logging -->
<relocation> <relocation>
<pattern>org.apache.commons.beanutils</pattern> <pattern>org.apache.commons.beanutils</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.beanutils</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.beanutils</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.cli</pattern> <pattern>org.apache.commons.cli</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.cli</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.cli</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.collections</pattern> <pattern>org.apache.commons.collections</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.collections</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.collections</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.configuration</pattern> <pattern>org.apache.commons.configuration</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.configuration</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.configuration</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.crypto</pattern> <pattern>org.apache.commons.crypto</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.crypto</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.crypto</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons.csv</pattern>
<shadedPattern>${shaded.prefix}.org.apache.commons.csv</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.daemon</pattern> <pattern>org.apache.commons.daemon</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.daemon</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.daemon</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.io</pattern> <pattern>org.apache.commons.io</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.io</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.io</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.math</pattern> <pattern>org.apache.commons.math</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.math</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.math</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.math3</pattern> <pattern>org.apache.commons.math3</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.math3</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.math3</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.net</pattern> <pattern>org.apache.commons.net</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.net</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.net</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.lang</pattern> <pattern>org.apache.commons.lang</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.lang</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.lang</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.lang3</pattern> <pattern>org.apache.commons.lang3</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.lang3</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.lang3</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.el</pattern> <pattern>org.apache.commons.el</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.el</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.el</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.httpclient</pattern> <pattern>org.apache.commons.httpclient</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.httpclient</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.httpclient</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.compress</pattern> <pattern>org.apache.commons.compress</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.compress</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.compress</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.digester</pattern> <pattern>org.apache.commons.digester</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.digester</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.digester</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.codec</pattern> <pattern>org.apache.commons.codec</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.codec</shadedPattern> <shadedPattern>${shaded.prefix}.org.apache.commons.codec</shadedPattern>
</relocation> </relocation>
<!-- top level net--> <!-- top level net-->
<relocation> <relocation>
<pattern>net.iharder</pattern> <pattern>net</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.net.iharder</shadedPattern> <shadedPattern>${shaded.prefix}.net</shadedPattern>
</relocation> </relocation>
<!-- junit --> <!-- junit -->
<relocation> <relocation>
<pattern>junit</pattern> <pattern>junit</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.junit</shadedPattern> <shadedPattern>${shaded.prefix}.junit</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.junit</pattern> <pattern>org.junit</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.junit</shadedPattern> <shadedPattern>${shaded.prefix}.org.junit</shadedPattern>
</relocation> </relocation>
@ -414,11 +474,14 @@
</excludes> </excludes>
</filter> </filter>
<filter> <filter>
<!-- proto source files aren't needed -->
<artifact>*:*</artifact> <artifact>*:*</artifact>
<excludes> <excludes>
<!-- proto source files aren't needed -->
<exclude>*.proto</exclude> <exclude>*.proto</exclude>
<exclude>**/*.proto</exclude> <exclude>**/*.proto</exclude>
<!-- We already concat NOTICE, safe to drop individual ones -->
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
</excludes> </excludes>
</filter> </filter>
<filter> <filter>
@ -435,6 +498,23 @@
<exclude>mapred-default.xml.orig</exclude> <exclude>mapred-default.xml.orig</exclude>
</excludes> </excludes>
</filter> </filter>
<!-- unnecessary files that mess up our invariants check -->
<filter>
<artifact>org.eclipse.jetty:*</artifact>
<excludes>
<exclude>about.html</exclude>
<exclude>jetty-dir.css</exclude>
</excludes>
</filter>
<filter>
<artifact>org.apache.kerby:*</artifact>
<excludes>
<exclude>krb5-template.conf</exclude>
<exclude>krb5_udp-template.conf</exclude>
<exclude>ccache.txt</exclude>
<exclude>keytab.txt</exclude>
</excludes>
</filter>
</filters> </filters>
</configuration> </configuration>
</execution> </execution>

6
hbase-shell/pom.xml
View File

@ -414,12 +414,6 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

10
hbase-testing-util/pom.xml
View File

@ -241,20 +241,10 @@
<value>3.0</value> <value>3.0</value>
</property> </property>
</activation> </activation>
<properties>
<hadoop.version>3.0-SNAPSHOT</hadoop.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

9
hbase-thrift/pom.xml
View File

@ -561,19 +561,10 @@
<value>3.0</value> <value>3.0</value>
</property> </property>
</activation> </activation>
<properties>
<hadoop.version>3.0-SNAPSHOT</hadoop.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

24
pom.xml
View File

@ -2667,11 +2667,16 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId> <artifactId>hadoop-hdfs</artifactId>
<version>${hadoop-three.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.htrace</groupId> <groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId> <artifactId>htrace-core</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>javax.servlet.jsp</groupId> <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId> <artifactId>jsp-api</artifactId>
@ -2701,7 +2706,6 @@
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
<version>${hadoop-three.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
@ -2760,6 +2764,22 @@
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<version>${hadoop-three.version}</version> <version>${hadoop-three.version}</version>
<exclusions> <exclusions>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>org.apache.htrace</groupId> <groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId> <artifactId>htrace-core</artifactId>
@ -2774,7 +2794,7 @@
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>stax</groupId> <groupId>stax</groupId>