HBASE-20615 ship shaded client artifacts in binary tarball.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c95a00b9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c95a00b9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c95a00b9 Branch: refs/heads/HBASE-20331 Commit: c95a00b9e7517492c1bcd0bb953ba660e788b6d7 Parents: 7d8352a Author: Sean Busbey <bus...@apache.org> Authored: Fri May 18 11:11:42 2018 -0500 Committer: Sean Busbey <bus...@apache.org> Committed: Wed May 23 14:11:14 2018 -0500 ---------------------------------------------------------------------- hbase-assembly/pom.xml | 16 +++++++++++++ .../src/main/assembly/hadoop-two-compat.xml | 25 ++++++++++++++++++++ 2 files changed, 41 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c95a00b9/hbase-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index 5da105b..acb6f53 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -189,6 +189,22 @@ </plugins> </build> <dependencies> + <!-- client artifacts for downstream use --> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-shaded-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-shaded-client-byo-hadoop</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-shaded-mapreduce</artifactId> + <version>${project.version}</version> + </dependency> <!-- Intra-project dependencies --> <dependency> <groupId>org.apache.hbase</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/c95a00b9/hbase-assembly/src/main/assembly/hadoop-two-compat.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml index 69a800b..6ab621a 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -73,11 +73,36 @@ <exclude>com.sun.jersey:*</exclude> <exclude>com.sun.jersey.contribs:*</exclude> <exclude>jline:jline</exclude> + <exclude>org.apache.hbase:hbase-shaded-client</exclude> + <exclude>org.apache.hbase:hbase-shaded-client-byo-hadoop</exclude> + <exclude>org.apache.hbase:hbase-shaded-mapreduce</exclude> </excludes> </dependencySet> </dependencySets> </binaries> </moduleSet> + <!-- Include shaded clients in their own directory --> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <includes> + <include>org.apache.hbase:hbase-shaded-client</include> + <include>org.apache.hbase:hbase-shaded-mapreduce</include> + <include>org.apache.hbase:hbase-shaded-client-byo-hadoop</include> + </includes> + <binaries> + <outputDirectory>lib/shaded-clients</outputDirectory> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <includes> + <include>org.apache.hbase:hbase-shaded-client</include> + <include>org.apache.hbase:hbase-shaded-mapreduce</include> + <include>org.apache.hbase:hbase-shaded-client-byo-hadoop</include> + </includes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> </moduleSets> <!-- Include the generated LICENSE and NOTICE files --> <files>