You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/11/19 09:55:44 UTC

spark git commit: SPARK-4455 Exclude dependency on hbase-annotations module

Repository: spark
Updated Branches:
  refs/heads/master 8327df697 -> 5f5ac2daf


SPARK-4455 Exclude dependency on hbase-annotations module

pwendell
Please take a look

Author: tedyu <yu...@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


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5f5ac2da
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5f5ac2da
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5f5ac2da

Branch: refs/heads/master
Commit: 5f5ac2dafaf849d2375c81d699d82874ac462b49
Parents: 8327df6
Author: tedyu <yu...@gmail.com>
Authored: Wed Nov 19 00:55:39 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Nov 19 00:55:39 2014 -0800

----------------------------------------------------------------------
 examples/pom.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/5f5ac2da/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index c64d3e6..8713230 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -107,6 +107,11 @@
         <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>
           </exclusion>
@@ -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>
@@ -159,6 +176,11 @@
             <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>
           </exclusion>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org