From ec988e4fcf5a7d0b0915e7d29d776eaa362ef1ff Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Mon, 20 Apr 2015 22:20:19 -0700 Subject: [PATCH] HBASE-13517 Publish a client artifact with shaded dependencies Summary: Add in shaded versions of server and shaded versions of client Test Plan: HBase downstreamer Differential Revision: https://reviews.facebook.net/D37467 --- .gitignore | 1 + .../src/main/assembly/hadoop-two-compat.xml | 18 ++- hbase-assembly/src/main/assembly/src.xml | 16 +++ hbase-shaded/hbase-shaded-client/pom.xml | 61 +++++++++ hbase-shaded/hbase-shaded-server/pom.xml | 62 +++++++++ hbase-shaded/pom.xml | 145 +++++++++++++++++++++ pom.xml | 1 + 7 files changed, 302 insertions(+), 2 deletions(-) create mode 100644 hbase-shaded/hbase-shaded-client/pom.xml create mode 100644 hbase-shaded/hbase-shaded-server/pom.xml create mode 100644 hbase-shaded/pom.xml diff --git a/.gitignore b/.gitignore index f9fc9f7..626a4d0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ hbase-*/test *.iml *.ipr patchprocess/ +dependency-reduced-pom.xml diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml index f8ebcda..60699e0 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -30,9 +30,23 @@ - true + + org.apache.hbase:hbase-annotations + org.apache.hbase:hbase-client + org.apache.hbase:hbase-common + org.apache.hbase:hbase-examples + org.apache.hbase:hbase-hadoop2-compat + org.apache.hbase:hbase-hadoop-compat + org.apache.hbase:hbase-it + org.apache.hbase:hbase-prefix-tree + org.apache.hbase:hbase-procedure + org.apache.hbase:hbase-protocol + org.apache.hbase:hbase-rest + org.apache.hbase:hbase-server + org.apache.hbase:hbase-shell + org.apache.hbase:hbase-thrift + lib diff --git a/hbase-assembly/src/main/assembly/src.xml b/hbase-assembly/src/main/assembly/src.xml index b7a21a4..8d801ca 100644 --- a/hbase-assembly/src/main/assembly/src.xml +++ b/hbase-assembly/src/main/assembly/src.xml @@ -30,6 +30,22 @@ true + + org.apache.hbase:hbase-annotations + org.apache.hbase:hbase-client + org.apache.hbase:hbase-common + org.apache.hbase:hbase-examples + org.apache.hbase:hbase-hadoop2-compat + org.apache.hbase:hbase-hadoop-compat + org.apache.hbase:hbase-it + org.apache.hbase:hbase-prefix-tree + org.apache.hbase:hbase-procedure + org.apache.hbase:hbase-protocol + org.apache.hbase:hbase-rest + org.apache.hbase:hbase-server + org.apache.hbase:hbase-shell + org.apache.hbase:hbase-thrift + diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml new file mode 100644 index 0000000..b726ade --- /dev/null +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + hbase-shaded + org.apache.hbase + 2.0.0-SNAPSHOT + .. + + hbase-shaded-client + HBase - Shaded - Client + + + + org.apache.maven.plugins + maven-site-plugin + + true + + + + org.apache.maven.plugins + maven-shade-plugin + + + + maven-assembly-plugin + + true + + + + + + + org.apache.hbase + hbase-client + + + + \ No newline at end of file diff --git a/hbase-shaded/hbase-shaded-server/pom.xml b/hbase-shaded/hbase-shaded-server/pom.xml new file mode 100644 index 0000000..c54bfc8 --- /dev/null +++ b/hbase-shaded/hbase-shaded-server/pom.xml @@ -0,0 +1,62 @@ + + + 4.0.0 + + hbase-shaded + org.apache.hbase + 2.0.0-SNAPSHOT + .. + + hbase-shaded-server + HBase - Shaded - Server + + + + org.apache.maven.plugins + maven-site-plugin + + true + + + + org.apache.maven.plugins + maven-shade-plugin + + + + maven-assembly-plugin + + true + + + + + + + + org.apache.hbase + hbase-server + + + + \ No newline at end of file diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml new file mode 100644 index 0000000..3fbe273 --- /dev/null +++ b/hbase-shaded/pom.xml @@ -0,0 +1,145 @@ + + + + 4.0.0 + + hbase + org.apache.hbase + 2.0.0-SNAPSHOT + .. + + hbase-shaded + HBase - Shaded + Module of HBase with most deps shaded. + pom + + hbase-shaded-client + hbase-shaded-server + + + + + org.apache.maven.plugins + maven-site-plugin + + true + + + + + maven-assembly-plugin + + true + + + + + + + + maven-assembly-plugin + + true + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + package + + shade + + + false + true + true + + + org.apache.hbase:* + org.apache.hadoop:* + org.apache.zookeeper* + com.google.protobuf:* + io.netty:* + org.jboss.netty:* + com.google.guava:* + org.mortbay.jetty:* + org.codehaus.jackson:* + org.apache.avro:* + com.sun.jersey:* + com.sun.jersey.contribs:* + tomcat:* + + + + + + com.google.common + org.apache.hadoop.hbase.com.google.common + + + + + com.google.protobuf + org.apache.hadoop.hbase.com.google.protobuf + + + + + io.netty + org.apache.hadoop.hbase.io.netty + + + + org.jboss.netty + org.apache.hadoop.hbase.org.jboss.netty + + + + org.mortbay + org.apache.hadoop.hbase.org.mortbay + + + + org.codehaus.jackson + org.apache.hadoop.hbase.org.codehaus.jackson + + + + org.apache.avro + org.apache.hadoop.hbase.org.apache.avro + + + + com.sun.jersey + org.apache.hadoop.hbase.com.sun.jersey + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index d188137..326e545 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,7 @@ hbase-annotations hbase-rest hbase-checkstyle + hbase-shaded -- 2.3.0