Repository: spark Updated Branches: refs/heads/branch-1.2 e0a20994f -> 1d0fa7fb0
SPARK-4455 Exclude dependency on hbase-annotations module pwendell Please take a look Author: tedyu <[email protected]> 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 (cherry picked from commit 5f5ac2dafaf849d2375c81d699d82874ac462b49) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1d0fa7fb Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1d0fa7fb Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1d0fa7fb Branch: refs/heads/branch-1.2 Commit: 1d0fa7fb073e5760a9d7d7d3bfa13f3e7ea48e1a Parents: e0a2099 Author: tedyu <[email protected]> Authored: Wed Nov 19 00:55:39 2014 -0800 Committer: Patrick Wendell <[email protected]> Committed: Wed Nov 19 00:55:49 2014 -0800 ---------------------------------------------------------------------- examples/pom.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1d0fa7fb/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 4955bd1..f5a7ed2 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: [email protected] For additional commands, e-mail: [email protected]
