Repository: hbase Updated Branches: refs/heads/master ec92a8a70 -> 3aff98c75
HBASE-15201 Add hbase-spark to hbase assembly Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3aff98c7 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3aff98c7 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3aff98c7 Branch: refs/heads/master Commit: 3aff98c75b5e23a5010be17eecef3140d2bf70bb Parents: ec92a8a Author: Jerry He <jerry...@apache.org> Authored: Mon Feb 8 14:13:46 2016 -0800 Committer: Jerry He <jerry...@apache.org> Committed: Mon Feb 8 14:13:46 2016 -0800 ---------------------------------------------------------------------- hbase-assembly/pom.xml | 5 +++++ hbase-assembly/src/main/assembly/hadoop-two-compat.xml | 1 + hbase-spark/pom.xml | 1 + 3 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3aff98c7/hbase-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index 4851391..87e82ad 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -201,5 +201,10 @@ <version>${project.version}</version> <optional>true</optional> </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-spark</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/hbase/blob/3aff98c7/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 9ef624c..2033e9c 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -45,6 +45,7 @@ <include>org.apache.hbase:hbase-rest</include> <include>org.apache.hbase:hbase-server</include> <include>org.apache.hbase:hbase-shell</include> + <include>org.apache.hbase:hbase-spark</include> <include>org.apache.hbase:hbase-thrift</include> <include>org.apache.hbase:hbase-external-blockcache</include> </includes> http://git-wip-us.apache.org/repos/asf/hbase/blob/3aff98c7/hbase-spark/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml index 8f71a89..251ea59 100644 --- a/hbase-spark/pom.xml +++ b/hbase-spark/pom.xml @@ -88,6 +88,7 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-streaming_${scala.binary.version}</artifactId> <version>${spark.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId>