Repository: oozie Updated Branches: refs/heads/master 213246115 -> 83527ebe6
Amendment patch for OOZIE-1730 Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/83527ebe Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/83527ebe Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/83527ebe Branch: refs/heads/master Commit: 83527ebe6a51a92eb7608f2e4941bc8e07ebf803 Parents: 2132461 Author: Robert Kanter <[email protected]> Authored: Wed Jan 21 11:38:26 2015 -0800 Committer: Robert Kanter <[email protected]> Committed: Wed Jan 21 11:38:26 2015 -0800 ---------------------------------------------------------------------- pom.xml | 4 ++++ sharelib/hcatalog/pom.xml | 4 ++++ sharelib/hive/pom.xml | 4 ++++ sharelib/spark/pom.xml | 8 ++++++++ 4 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/83527ebe/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e662b7a..db54451 100644 --- a/pom.xml +++ b/pom.xml @@ -752,6 +752,10 @@ <groupId>org.apache.avro</groupId> <artifactId>avro-ipc</artifactId> </exclusion> + <exclusion> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/83527ebe/sharelib/hcatalog/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/hcatalog/pom.xml b/sharelib/hcatalog/pom.xml index fb6bc34..76e7ca1 100644 --- a/sharelib/hcatalog/pom.xml +++ b/sharelib/hcatalog/pom.xml @@ -199,6 +199,10 @@ <groupId>antlr</groupId> <artifactId>antlr</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/83527ebe/sharelib/hive/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/hive/pom.xml b/sharelib/hive/pom.xml index 1a0c10c..3da0bdc 100644 --- a/sharelib/hive/pom.xml +++ b/sharelib/hive/pom.xml @@ -87,6 +87,10 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/83527ebe/sharelib/spark/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/spark/pom.xml b/sharelib/spark/pom.xml index 7df4b57..db46b8c 100644 --- a/sharelib/spark/pom.xml +++ b/sharelib/spark/pom.xml @@ -57,6 +57,14 @@ <scope>compile</scope> <exclusions> <exclusion> + <groupId>org.apache.mesos</groupId> + <artifactId>mesos</artifactId> + </exclusion> + <exclusion> + <groupId>org.spark-project.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> </exclusion>
