Repository: hbase Updated Branches: refs/heads/master 8a28c2343 -> 91291e378
HBASE-15732 hbase-rsgroups should be in the assembly Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/91291e37 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/91291e37 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/91291e37 Branch: refs/heads/master Commit: 91291e37803e193b39c1f86219d53ec2d44f0fb1 Parents: 8a28c23 Author: Enis Soztutar <[email protected]> Authored: Thu Apr 28 17:14:54 2016 -0700 Committer: Enis Soztutar <[email protected]> Committed: Thu Apr 28 17:14:54 2016 -0700 ---------------------------------------------------------------------- hbase-assembly/pom.xml | 18 ++++++++++++++++++ hbase-assembly/src/main/assembly/components.xml | 8 ++++++++ .../src/main/assembly/hadoop-two-compat.xml | 1 + hbase-assembly/src/main/assembly/src.xml | 1 + pom.xml | 1 + 5 files changed, 29 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/91291e37/hbase-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index 87e82ad..c21d174 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -207,4 +207,22 @@ <version>${project.version}</version> </dependency> </dependencies> + + <profiles> + <profile> + <id>rsgroup</id> + <activation> + <property> + <name>!skip-rsgroup</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-rsgroup</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/hbase/blob/91291e37/hbase-assembly/src/main/assembly/components.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/src/main/assembly/components.xml b/hbase-assembly/src/main/assembly/components.xml index 3ec1883..a6babc8 100644 --- a/hbase-assembly/src/main/assembly/components.xml +++ b/hbase-assembly/src/main/assembly/components.xml @@ -138,5 +138,13 @@ </includes> <fileMode>0644</fileMode> </fileSet> + <fileSet> + <directory>${project.basedir}/../hbase-rsgroup/target/</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>${rsgroup.test.jar}</include> + </includes> + <fileMode>0644</fileMode> + </fileSet> </fileSets> </component> http://git-wip-us.apache.org/repos/asf/hbase/blob/91291e37/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 2033e9c..894ca67 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -43,6 +43,7 @@ <include>org.apache.hbase:hbase-procedure</include> <include>org.apache.hbase:hbase-protocol</include> <include>org.apache.hbase:hbase-rest</include> + <include>org.apache.hbase:hbase-rsgroup</include> <include>org.apache.hbase:hbase-server</include> <include>org.apache.hbase:hbase-shell</include> <include>org.apache.hbase:hbase-spark</include> http://git-wip-us.apache.org/repos/asf/hbase/blob/91291e37/hbase-assembly/src/main/assembly/src.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/src/main/assembly/src.xml b/hbase-assembly/src/main/assembly/src.xml index cf73493..aa3520d 100644 --- a/hbase-assembly/src/main/assembly/src.xml +++ b/hbase-assembly/src/main/assembly/src.xml @@ -46,6 +46,7 @@ <include>org.apache.hbase:hbase-protocol</include> <include>org.apache.hbase:hbase-rest</include> <include>org.apache.hbase:hbase-resource-bundle</include> + <include>org.apache.hbase:hbase-rsgroup</include> <include>org.apache.hbase:hbase-server</include> <include>org.apache.hbase:hbase-shaded</include> <include>org.apache.hbase:hbase-shell</include> http://git-wip-us.apache.org/repos/asf/hbase/blob/91291e37/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8bd3706..cf6501c 100644 --- a/pom.xml +++ b/pom.xml @@ -1265,6 +1265,7 @@ <procedure.test.jar>hbase-procedure-${project.version}-tests.jar</procedure.test.jar> <it.test.jar>hbase-it-${project.version}-tests.jar</it.test.jar> <annotations.test.jar>hbase-annotations-${project.version}-tests.jar</annotations.test.jar> + <rsgroup.test.jar>hbase-rsgroup-${project.version}-tests.jar</rsgroup.test.jar> <surefire.version>2.18.1</surefire.version> <surefire.provider>surefire-junit47</surefire.provider> <!-- default: run small & medium, medium with 2 threads -->
