From 30155602d1bd0c6c03df6abc50eb0850d86a30aa Mon Sep 17 00:00:00 2001 From: Josh Elser Date: Wed, 7 Feb 2018 18:37:39 -0500 Subject: [PATCH] HBASE-19735 Create a client-tarball assembly Provides an extra client descriptor to build a second tarball with a reduced set of dependencies. Not of great impact now, but will build the way for better in the future. --- hbase-assembly/pom.xml | 33 +++-- .../src/main/assembly/client-components.xml | 92 ++++++++++++++ hbase-assembly/src/main/assembly/client.xml | 137 +++++++++++++++++++++ hbase-procedure/pom.xml | 4 +- hbase-spark/pom.xml | 6 + pom.xml | 10 ++ 6 files changed, 268 insertions(+), 14 deletions(-) create mode 100644 hbase-assembly/src/main/assembly/client-components.xml create mode 100644 hbase-assembly/src/main/assembly/client.xml diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index 75cba4dc79..5842fe6462 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -95,6 +95,7 @@ gnu ${assembly.file} + src/main/assembly/client.xml @@ -216,22 +217,22 @@ test - org.apache.hbase - hbase-hadoop-compat - - - com.google.guava - guava - - + org.apache.hbase + hbase-hadoop-compat + + + com.google.guava + guava + + - org.apache.hbase - ${compat.module} + org.apache.hbase + ${compat.module} - org.apache.hbase - hbase-shell + org.apache.hbase + hbase-shell org.apache.hbase @@ -307,6 +308,14 @@ org.apache.hbase hbase-zookeeper + + org.apache.hbase + hbase-shaded-client + + + org.apache.hbase + hbase-shaded-mapreduce + diff --git a/hbase-assembly/src/main/assembly/client-components.xml b/hbase-assembly/src/main/assembly/client-components.xml new file mode 100644 index 0000000000..2fd1b579e2 --- /dev/null +++ b/hbase-assembly/src/main/assembly/client-components.xml @@ -0,0 +1,92 @@ + + + + + + + + + ${project.basedir}/../target/site + docs + + + + ${project.basedir}/.. + . + + CHANGES.txt + README.txt + + 0644 + + + + ${project.basedir}/../conf + conf + 0644 + 0755 + + + + + ${project.basedir}/../bin + bin + + get-active-master.rb + hbase + hbase-common.sh + hbase-config.sh + hbase-jruby + hirb.rb + + + 0755 + 0755 + + + + ${project.basedir}/../bin + bin + + hbase.cmd + hbase-config.cmd + + + + + ${project.basedir}/../hbase-shell/src/main/ruby + lib/ruby + 0644 + 0755 + + + + ${project.basedir}/../hbase-server/target/native + lib/native + 0755 + 0755 + + *.so + *.dylib + + + + diff --git a/hbase-assembly/src/main/assembly/client.xml b/hbase-assembly/src/main/assembly/client.xml new file mode 100644 index 0000000000..79519613c3 --- /dev/null +++ b/hbase-assembly/src/main/assembly/client.xml @@ -0,0 +1,137 @@ + + + + + + client-bin + + tar.gz + + + hbase-${project.version}-client + + src/main/assembly/client-components.xml + + + + true + + + org.apache.hbase:hbase-annotations + org.apache.hbase:hbase-client + org.apache.hbase:hbase-common + org.apache.hbase:hbase-hadoop-compat + org.apache.hbase:hbase-hadoop2-compat + org.apache.hbase:hbase-mapreduce + org.apache.hbase:hbase-metrics + org.apache.hbase:hbase-metrics-api + org.apache.hbase:hbase-procedure + org.apache.hbase:hbase-protocol + org.apache.hbase:hbase-protocol-shaded + org.apache.hbase:hbase-server + org.apache.hbase:hbase-zookeeper + + + + lib + false + + + + + com.sun.jersey:* + com.sun.jersey.contribs:* + + org.apache.hbase:hbase-external-blockcache + org.apache.hbase:hbase-http + org.apache.hbase:hbase-replication + org.apache.hbase:hbase-rest + org.apache.hbase:hbase-rsgroup + org.apache.hbase:hbase-shaded-client + org.apache.hbase:hbase-shaded-mapreduce + + org.apache.hbase:hbase-shell + org.apache.hbase:hbase-thrift + org.jruby:jruby-complete + + + + + + + true + + org.apache.hbase:hbase-shaded-client + org.apache.hbase:hbase-shaded-mapreduce + + + + shaded-lib + false + + + + + org.apache.hbase:hbase-shaded-client + org.apache.hbase:hbase-shaded-mapreduce + + false + + + + + + + + + ${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE + . + LICENSE.txt + unix + + + ${project.build.directory}/NOTICE.aggregate + . + NOTICE.txt + unix + + + ${basedir}/src/main/resources/META-INF/LEGAL + . + LEGAL + unix + + + + + + + lib/ruby + + org.jruby:jruby-complete + + + + + diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml index c791002e72..bbb81003e8 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -60,8 +60,8 @@ org.apache.hbase hbase-common - ${project.version} - tests + test-jar + test org.apache.hbase diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml index a3a41fd79b..5366d84723 100644 --- a/hbase-spark/pom.xml +++ b/hbase-spark/pom.xml @@ -386,6 +386,12 @@ hbase-common ${project.version} + + org.apache.hbase + hbase-common + test-jar + test + org.apache.hbase hbase-annotations diff --git a/pom.xml b/pom.xml index b23a9669d9..19af231c36 100755 --- a/pom.xml +++ b/pom.xml @@ -1794,6 +1794,16 @@ test-jar test + + org.apache.hbase + hbase-shaded-client + ${project.version} + + + org.apache.hbase + hbase-shaded-mapreduce + ${project.version} + com.github.stephenc.findbugs -- 2.16.1