From caa396539985a461e93cee31e07bb46d38776008 Mon Sep 17 00:00:00 2001 From: Apekshit Sharma Date: Wed, 25 Oct 2017 14:08:19 -0700 Subject: [PATCH] HBASE-19089 Fix the list of included moduleSets in src and binary tars. Change-Id: I2c4c3fab111fdc311c730c857bb09739dae5585b --- hbase-assembly/pom.xml | 32 ++++++++------ .../main/assembly/common-moduleset-includes.xml | 50 ++++++++++++++++++++++ hbase-assembly/src/main/assembly/components.xml | 24 +++++------ .../src/main/assembly/hadoop-two-compat.xml | 21 ++++++--- hbase-assembly/src/main/assembly/src.xml | 27 ++++++------ pom.xml | 27 ++++++++++++ 6 files changed, 140 insertions(+), 41 deletions(-) create mode 100644 hbase-assembly/src/main/assembly/common-moduleset-includes.xml diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index 18b63b5414..473f0d3777 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -223,53 +223,51 @@ org.apache.hbase ${compat.module} - ${project.version} org.apache.hbase hbase-shell - ${project.version} org.apache.hbase hbase-thrift - ${project.version} org.apache.hbase hbase-rest - ${project.version} org.apache.hbase hbase-external-blockcache - ${project.version} org.apache.hbase hbase-testing-util - ${project.version} org.apache.hbase hbase-metrics-api - ${project.version} org.apache.hbase hbase-metrics - ${project.version} + + + org.apache.hbase + hbase-protocol + + + org.apache.hbase + hbase-protocol-shaded org.apache.hbase hbase-resource-bundle - ${project.version} true org.apache.hbase hbase-spark - ${project.version} org.apache.httpcomponents @@ -282,13 +280,23 @@ org.apache.hbase hbase-spark-it - ${project.version} test-jar org.apache.hbase hbase-backup - ${project.version} + + + org.apache.hbase + hbase-replication + + + org.apache.hbase + hbase-http + + + org.apache.hbase + hbase-examples diff --git a/hbase-assembly/src/main/assembly/common-moduleset-includes.xml b/hbase-assembly/src/main/assembly/common-moduleset-includes.xml new file mode 100644 index 0000000000..ad33a196f1 --- /dev/null +++ b/hbase-assembly/src/main/assembly/common-moduleset-includes.xml @@ -0,0 +1,50 @@ + + + + +org.apache.hbase:hbase-annotations +org.apache.hbase:hbase-backup +org.apache.hbase:hbase-client +org.apache.hbase:hbase-common +org.apache.hbase:hbase-endpoint +org.apache.hbase:hbase-examples +org.apache.hbase:hbase-external-blockcache +org.apache.hbase:hbase-hadoop-compat +org.apache.hbase:hbase-hadoop2-compat +org.apache.hbase:hbase-http +org.apache.hbase:hbase-it +org.apache.hbase:hbase-mapreduce +org.apache.hbase:hbase-metrics +org.apache.hbase:hbase-metrics-api +org.apache.hbase:hbase-native-client +org.apache.hbase:hbase-prefix-tree +org.apache.hbase:hbase-procedure +org.apache.hbase:hbase-protocol +org.apache.hbase:hbase-protocol-shaded +org.apache.hbase:hbase-replication +org.apache.hbase:hbase-rest +org.apache.hbase:hbase-rsgroup +org.apache.hbase:hbase-server +org.apache.hbase:hbase-shell +org.apache.hbase:hbase-spark +org.apache.hbase:hbase-spark-it +org.apache.hbase:hbase-testing-util +org.apache.hbase:hbase-thrift diff --git a/hbase-assembly/src/main/assembly/components.xml b/hbase-assembly/src/main/assembly/components.xml index 42962f9e5e..e6c45e0a42 100644 --- a/hbase-assembly/src/main/assembly/components.xml +++ b/hbase-assembly/src/main/assembly/components.xml @@ -19,12 +19,12 @@ */ --> - + - ${project.basedir}/../target/site + ${project.basedir}/../target/site docs @@ -50,7 +50,7 @@ ${project.basedir}/../bin bin - **/*.cmd + **/*.cmd 0755 0755 @@ -60,19 +60,19 @@ ${project.basedir}/../bin bin - **/*.cmd + **/*.cmd - ${project.basedir}/../hbase-shell/src/main/ruby + ${project.basedir}/../hbase-shell/src/main/ruby lib/ruby 0644 0755 - ${project.basedir}/../hbase-server/target/hbase-webapps + ${project.basedir}/../hbase-server/target/hbase-webapps hbase-webapps 0644 0755 @@ -91,8 +91,8 @@ - ${project.basedir}/../hbase-server/target/native - lib/native + ${project.basedir}/../hbase-server/target/native + lib/native 0755 0755 @@ -107,7 +107,7 @@ have 1 submodule to accumulate, but we can copy/paste as necessary until maven is fixed. --> - ${project.basedir}/../hbase-server/target/ + ${project.basedir}/../hbase-server/target/ lib ${server.test.jar} @@ -115,7 +115,7 @@ 0644 - ${project.basedir}/../hbase-it/target/ + ${project.basedir}/../hbase-it/target/ lib ${it.test.jar} @@ -123,7 +123,7 @@ 0644 - ${project.basedir}/../hbase-annotations/target/ + ${project.basedir}/../hbase-annotations/target/ lib ${annotations.test.jar} @@ -131,7 +131,7 @@ 0644 - ${project.basedir}/../hbase-common/target/ + ${project.basedir}/../hbase-common/target/ lib ${common.test.jar} diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml index a66237bf0d..2b75977933 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -26,31 +26,42 @@ tar.gz - src/main/assembly/components.xml + src/main/assembly/components.xml true + org.apache.hbase:hbase-annotations + org.apache.hbase:hbase-backup org.apache.hbase:hbase-client org.apache.hbase:hbase-common + org.apache.hbase:hbase-endpoint org.apache.hbase:hbase-examples - org.apache.hbase:hbase-hadoop2-compat + org.apache.hbase:hbase-external-blockcache org.apache.hbase:hbase-hadoop-compat + org.apache.hbase:hbase-hadoop2-compat + org.apache.hbase:hbase-http org.apache.hbase:hbase-it + org.apache.hbase:hbase-mapreduce + org.apache.hbase:hbase-metrics + org.apache.hbase:hbase-metrics-api + org.apache.hbase:hbase-native-client org.apache.hbase:hbase-prefix-tree org.apache.hbase:hbase-procedure org.apache.hbase:hbase-protocol + org.apache.hbase:hbase-protocol-shaded + org.apache.hbase:hbase-replication org.apache.hbase:hbase-rest org.apache.hbase:hbase-rsgroup org.apache.hbase:hbase-server org.apache.hbase:hbase-shell org.apache.hbase:hbase-spark + org.apache.hbase:hbase-spark-it + org.apache.hbase:hbase-testing-util org.apache.hbase:hbase-thrift - org.apache.hbase:hbase-external-blockcache - org.apache.hbase:hbase-backup - org.apache.hbase:hbase-mapreduce diff --git a/hbase-assembly/src/main/assembly/src.xml b/hbase-assembly/src/main/assembly/src.xml index 91163bbdc9..de47ac00b0 100644 --- a/hbase-assembly/src/main/assembly/src.xml +++ b/hbase-assembly/src/main/assembly/src.xml @@ -31,22 +31,18 @@ says this is an error, but builds from the command line just fine. --> true + org.apache.hbase:hbase-annotations - org.apache.hbase:hbase-archetypes - org.apache.hbase:hbase-build-support - org.apache.hbase:hbase-build-configuration - org.apache.hbase:hbase-assembly org.apache.hbase:hbase-backup - org.apache.hbase:hbase-build-configuration - org.apache.hbase:hbase-build-support - org.apache.hbase:hbase-checkstyle org.apache.hbase:hbase-client org.apache.hbase:hbase-common - org.apache.hbase:hbase-examples org.apache.hbase:hbase-endpoint + org.apache.hbase:hbase-examples org.apache.hbase:hbase-external-blockcache - org.apache.hbase:hbase-hadoop2-compat org.apache.hbase:hbase-hadoop-compat + org.apache.hbase:hbase-hadoop2-compat + org.apache.hbase:hbase-http org.apache.hbase:hbase-it org.apache.hbase:hbase-mapreduce org.apache.hbase:hbase-metrics @@ -54,19 +50,26 @@ org.apache.hbase:hbase-native-client org.apache.hbase:hbase-prefix-tree org.apache.hbase:hbase-procedure - org.apache.hbase:hbase-protocol-shaded org.apache.hbase:hbase-protocol + org.apache.hbase:hbase-protocol-shaded org.apache.hbase:hbase-replication org.apache.hbase:hbase-rest - org.apache.hbase:hbase-resource-bundle org.apache.hbase:hbase-rsgroup org.apache.hbase:hbase-server - org.apache.hbase:hbase-shaded org.apache.hbase:hbase-shell org.apache.hbase:hbase-spark org.apache.hbase:hbase-spark-it org.apache.hbase:hbase-testing-util org.apache.hbase:hbase-thrift + + + org.apache.hbase:hbase-assembly + org.apache.hbase:hbase-archetypes + org.apache.hbase:hbase-build-configuration + org.apache.hbase:hbase-build-support + org.apache.hbase:hbase-checkstyle + org.apache.hbase:hbase-resource-bundle + org.apache.hbase:hbase-shaded diff --git a/pom.xml b/pom.xml index 6e3bfb3296..0a54524b77 100755 --- a/pom.xml +++ b/pom.xml @@ -1552,6 +1552,11 @@ test-jar + + hbase-backup + org.apache.hbase + ${project.version} + org.apache.hbase hbase-error-prone @@ -1756,6 +1761,28 @@ test-jar test + + hbase-rest + org.apache.hbase + ${project.version} + + + hbase-resource-bundle + org.apache.hbase + ${project.version} + + + hbase-spark + org.apache.hbase + ${project.version} + + + hbase-spark-it + org.apache.hbase + ${project.version} + test-jar + test + com.github.stephenc.findbugs -- 2.14.1