From 2a7fc70405bf942cdf2c933175aae045d560fddc Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Mon, 24 Aug 2015 05:21:12 +0000 Subject: [PATCH] HBASE-14298 Source assemblies incorrect after recent POM changes (0.98) --- hbase-assembly/src/main/assembly/components.xml | 11 ++++-- .../src/main/assembly/hadoop-one-compat.xml | 41 ++++++++++++++++++++-- .../src/main/assembly/hadoop-two-compat.xml | 18 ++++++++-- hbase-assembly/src/main/assembly/src.xml | 35 +++++++++++++++--- 4 files changed, 94 insertions(+), 11 deletions(-) diff --git a/hbase-assembly/src/main/assembly/components.xml b/hbase-assembly/src/main/assembly/components.xml index d43748d..3ec1883 100644 --- a/hbase-assembly/src/main/assembly/components.xml +++ b/hbase-assembly/src/main/assembly/components.xml @@ -19,8 +19,7 @@ */ --> - + @@ -124,6 +123,14 @@ 0644 + ${project.basedir}/../hbase-annotations/target/ + lib + + ${annotations.test.jar} + + 0644 + + ${project.basedir}/../hbase-common/target/ lib diff --git a/hbase-assembly/src/main/assembly/hadoop-one-compat.xml b/hbase-assembly/src/main/assembly/hadoop-one-compat.xml index 0f9580a..6c7a55f 100644 --- a/hbase-assembly/src/main/assembly/hadoop-one-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-one-compat.xml @@ -30,10 +30,24 @@ - 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-hadoop1-compat + 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-protocol + org.apache.hbase:hbase-rest + org.apache.hbase:hbase-server + org.apache.hbase:hbase-shell + org.apache.hbase:hbase-thrift + + lib false @@ -43,4 +57,25 @@ + + + + ${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 + + diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml index 1109b38..6c7a55f 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-hadoop1-compat + 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-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 fba4155..28e46ad 100644 --- a/hbase-assembly/src/main/assembly/src.xml +++ b/hbase-assembly/src/main/assembly/src.xml @@ -30,10 +30,37 @@ true + + org.apache.hbase:hbase-annotations + org.apache.hbase:hbase-assembly + org.apache.hbase:hbase-checkstyle + org.apache.hbase:hbase-client + org.apache.hbase:hbase-common + org.apache.hbase:hbase-examples + org.apache.hbase:hbase-hadoop1-compat + 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-protocol + org.apache.hbase:hbase-rest + org.apache.hbase:hbase-resource-bundle + org.apache.hbase:hbase-server + org.apache.hbase:hbase-shaded + org.apache.hbase:hbase-shaded-client + org.apache.hbase:hbase-shaded-server + org.apache.hbase:hbase-shell + org.apache.hbase:hbase-testing-util + org.apache.hbase:hbase-thrift + + false + + ** + @@ -50,11 +77,11 @@ + at the moment is hadoop1. But we should include the hadoop2 compat module + too so can build hadoop2 from src --> - ${project.basedir}/../hbase-hadoop1-compat - hbase-hadoop1-compat + ${project.basedir}/../hbase-hadoop2-compat + hbase-hadoop2-compat 0644 0755 -- 2.1.0