You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by md...@apache.org on 2017/12/15 19:40:47 UTC
[2/2] hbase git commit: HBASE-18838 Fix hadoop3
check-shaded-invariants
HBASE-18838 Fix hadoop3 check-shaded-invariants
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/23a9059c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/23a9059c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/23a9059c
Branch: refs/heads/branch-2
Commit: 23a9059cb206897fc1f996a7858a59c9ec4f5803
Parents: 672c440
Author: Mike Drob <md...@apache.org>
Authored: Thu Dec 14 09:19:34 2017 -0600
Committer: Mike Drob <md...@apache.org>
Committed: Fri Dec 15 13:20:54 2017 -0600
----------------------------------------------------------------------
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 | 204 +++++++++++++------
hbase-shell/pom.xml | 6 -
hbase-testing-util/pom.xml | 10 -
hbase-thrift/pom.xml | 9 -
pom.xml | 32 ++-
17 files changed, 184 insertions(+), 195 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 9a8f2c5..6ebe40c 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -309,12 +309,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JSONMetricUtil.java
----------------------------------------------------------------------
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 d10610e..c11c52a 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");
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-endpoint/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml
index 98d994d..b92a792 100644
--- a/hbase-endpoint/pom.xml
+++ b/hbase-endpoint/pom.xml
@@ -337,12 +337,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-examples/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index d0ad170..19556e4 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -282,12 +282,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-external-blockcache/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml
index ff5a722..8b4aa26 100644
--- a/hbase-external-blockcache/pom.xml
+++ b/hbase-external-blockcache/pom.xml
@@ -279,23 +279,10 @@
<value>3.0</value>
</property>
</activation>
- <properties>
- <hadoop.version>3.0-SNAPSHOT</hadoop.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
<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>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 99872d1..1643a64 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -393,22 +393,10 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index eaa9d69..facdf3f 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -273,13 +273,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</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>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -417,6 +410,13 @@
</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>
</dependencies>
</profile>
@@ -440,23 +440,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<!--maven dependency:analyze says not needed but tests fail w/o-->
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
+ <scope>test</scope>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-procedure/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml
index 4461fce..0f0f00d 100644
--- a/hbase-procedure/pom.xml
+++ b/hbase-procedure/pom.xml
@@ -157,19 +157,10 @@
<value>3.0</value>
</property>
</activation>
- <properties>
- <hadoop.version>3.0-SNAPSHOT</hadoop.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-replication/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-replication/pom.xml b/hbase-replication/pom.xml
index e04a848..8c6b428 100644
--- a/hbase-replication/pom.xml
+++ b/hbase-replication/pom.xml
@@ -224,12 +224,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-rest/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 810fbd5..58e988b 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -432,12 +432,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-rsgroup/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml
index 528d631..de5b949 100644
--- a/hbase-rsgroup/pom.xml
+++ b/hbase-rsgroup/pom.xml
@@ -256,12 +256,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index ac4369d..61be98a 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -803,9 +803,6 @@
<value>3.0</value>
</property>
</activation>
- <properties>
- <hadoop.version>${hadoop-three.version}</hadoop.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -818,26 +815,25 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<version>${hadoop-three.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
+ <scope>test</scope>
</dependency>
- <!-- Hadoop needs Netty 3.x at test scope for the minicluster -->
+ <!-- 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-->
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 1a2117b..8720c5a 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -36,6 +36,7 @@
<!-- Don't make a source-jar -->
<source.skip>true</source.skip>
<license.bundles.dependencies>true</license.bundles.dependencies>
+ <shaded.prefix>org.apache.hadoop.hbase.shaded</shaded.prefix>
</properties>
<modules>
<module>hbase-shaded-client</module>
@@ -149,222 +150,281 @@
<relocations>
<!-- top level com not including sun-->
<relocation>
+ <pattern>com.cedarsoftware</pattern>
+ <shadedPattern>${shaded.prefix}.com.cedarsoftware</shadedPattern>
+ </relocation>
+ <relocation>
<pattern>com.codahale</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.com.codahale</shadedPattern>
+ <shadedPattern>${shaded.prefix}.com.codahale</shadedPattern>
</relocation>
<relocation>
- <pattern>com.google</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.com.google</shadedPattern>
+ <pattern>com.ctc</pattern>
+ <shadedPattern>${shaded.prefix}.com.ctc</shadedPattern>
</relocation>
<relocation>
- <pattern>com.jcraft</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.com.jcraft</shadedPattern>
+ <pattern>com.dropwizard</pattern>
+ <shadedPattern>${shaded.prefix}.com.dropwizard</shadedPattern>
</relocation>
<relocation>
- <pattern>com.thoughtworks</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.com.thoughtworks</shadedPattern>
+ <pattern>com.fasterxml</pattern>
+ <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>org.apache.hadoop.hbase.shaded.com.jamesmurty</shadedPattern>
+ <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>org.apache.hadoop.hbase.shaded.com.lmax</shadedPattern>
+ <shadedPattern>${shaded.prefix}.com.lmax</shadedPattern>
</relocation>
<relocation>
- <pattern>com.dropwizard</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.com.dropwizard</shadedPattern>
+ <pattern>com.microsoft</pattern>
+ <shadedPattern>${shaded.prefix}.com.microsoft</shadedPattern>
</relocation>
<relocation>
- <pattern>com.fasterxml</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.com.fasterxml</shadedPattern>
+ <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>
+
- <!-- top level io -->
+ <!-- netty family -->
+ <relocation>
+ <pattern>org.jboss.netty</pattern>
+ <shadedPattern>${shaded.prefix}.org.jboss.netty</shadedPattern>
+ </relocation>
<relocation>
<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>
<!-- top level org -->
<relocation>
<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>
<pattern>org.jcodings</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.jcodings</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.jcodings</shadedPattern>
</relocation>
<relocation>
<pattern>org.joni</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.joni</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.joni</shadedPattern>
</relocation>
<relocation>
<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>
<pattern>org.tukaani</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.tukaani</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.tukaani</shadedPattern>
</relocation>
<relocation>
<pattern>org.xerial</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.xerial</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.xerial</shadedPattern>
</relocation>
<relocation>
<pattern>org.znerd</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.znerd</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.znerd</shadedPattern>
</relocation>
<relocation>
<pattern>org.aopalliance</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.aopalliance</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.aopalliance</shadedPattern>
</relocation>
<relocation>
<pattern>org.fusesource</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.fusesource</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.fusesource</shadedPattern>
</relocation>
<relocation>
<pattern>org.iq80</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.iq80</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.iq80</shadedPattern>
</relocation>
<relocation>
<pattern>org.jamon</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.jamon</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.jamon</shadedPattern>
</relocation>
<relocation>
<pattern>org.jets3t</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.jets3t</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.jets3t</shadedPattern>
</relocation>
<!-- poorly named add-on package from jets3t dependency. TODO can we just exclude these? -->
<relocation>
<pattern>contribs.mx</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.contribs.mx</shadedPattern>
+ <shadedPattern>${shaded.prefix}.contribs.mx</shadedPattern>
</relocation>
<relocation>
<pattern>org.objectweb</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.objectweb</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.objectweb</shadedPattern>
</relocation>
<!-- org.apache relocations not in org.apache.hadoop or org.apache.commons -->
<relocation>
<pattern>org.apache.avro</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.avro</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.apache.avro</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.curator</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.curator</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.apache.curator</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.directory</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.directory</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.apache.directory</shadedPattern>
</relocation>
<relocation>
<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>
+ <pattern>org.apache.jasper</pattern>
+ <shadedPattern>${shaded.prefix}.org.apache.jasper</shadedPattern>
</relocation>
<relocation>
- <pattern>org.apache.zookeeper</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.zookeeper</shadedPattern>
+ <pattern>org.apache.jute</pattern>
+ <shadedPattern>${shaded.prefix}.org.apache.jute</shadedPattern>
</relocation>
<relocation>
- <pattern>org.apache.jasper</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.jasper</shadedPattern>
+ <pattern>org.apache.kerby</pattern>
+ <shadedPattern>${shaded.prefix}.org.apache.kerby</shadedPattern>
</relocation>
<relocation>
<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>
<!-- org.apache.commons not including logging -->
<relocation>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<!-- top level net-->
<relocation>
- <pattern>net.iharder</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.net.iharder</shadedPattern>
+ <pattern>net</pattern>
+ <shadedPattern>${shaded.prefix}.net</shadedPattern>
</relocation>
<!-- junit -->
<relocation>
<pattern>junit</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.junit</shadedPattern>
+ <shadedPattern>${shaded.prefix}.junit</shadedPattern>
</relocation>
<relocation>
<pattern>org.junit</pattern>
- <shadedPattern>org.apache.hadoop.hbase.shaded.org.junit</shadedPattern>
+ <shadedPattern>${shaded.prefix}.org.junit</shadedPattern>
</relocation>
@@ -414,11 +474,14 @@
</excludes>
</filter>
<filter>
- <!-- proto source files aren't needed -->
<artifact>*:*</artifact>
<excludes>
+ <!-- proto source files aren't needed -->
<exclude>*.proto</exclude>
<exclude>**/*.proto</exclude>
+ <!-- We already concat NOTICE, safe to drop individual ones -->
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
</excludes>
</filter>
<filter>
@@ -435,6 +498,23 @@
<exclude>mapred-default.xml.orig</exclude>
</excludes>
</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>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-shell/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml
index 9eea460..c365926 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -414,12 +414,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-testing-util/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml
index b8e5eab..07eb286 100644
--- a/hbase-testing-util/pom.xml
+++ b/hbase-testing-util/pom.xml
@@ -241,20 +241,10 @@
<value>3.0</value>
</property>
</activation>
- <properties>
- <hadoop.version>3.0-SNAPSHOT</hadoop.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/hbase-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 5f925cf..ad18dbb 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -561,19 +561,10 @@
<value>3.0</value>
</property>
</activation>
- <properties>
- <hadoop.version>3.0-SNAPSHOT</hadoop.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a9059c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 15f712f..c25c55b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2667,12 +2667,17 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
<exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -2701,7 +2706,6 @@
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
- <version>${hadoop-three.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -2738,10 +2742,10 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -2761,6 +2765,22 @@
<version>${hadoop-three.version}</version>
<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>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
@@ -2774,7 +2794,7 @@
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>stax</groupId>