From 5f5ac2dafaf849d2375c81d699d82874ac462b49 Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Wed, 19 Nov 2014 00:55:39 -0800
Subject: [PATCH] SPARK-4455 Exclude dependency on hbase-annotations module
pwendell
Please take a look
Author: tedyu <yuzhihong@gmail.com>
Closes #3286 from tedyu/master and squashes the following commits:
e61e610 [tedyu] SPARK-4455 Exclude dependency on hbase-annotations module
7e3a57a [tedyu] Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/spark
2f28b08 [tedyu] Exclude dependency on hbase-annotations module
---
examples/pom.xml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/examples/pom.xml b/examples/pom.xml
index c64d3e6d24..8713230e1e 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -106,6 +106,11 @@
<artifactId>hbase-testing-util</artifactId>
<version>${hbase.version}</version>
<exclusions>
+ <exclusion>
+ <!-- SPARK-4455 -->
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
@@ -121,12 +126,24 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
<version>${hbase.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- SPARK-4455 -->
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase.version}</version>
<exclusions>
+ <exclusion>
+ <!-- SPARK-4455 -->
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
@@ -158,6 +175,11 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
</exclusion>
+ <exclusion>
+ <!-- SPARK-4455 -->
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
--
GitLab