Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C74A717A58 for ; Mon, 29 Jun 2015 21:08:09 +0000 (UTC) Received: (qmail 60787 invoked by uid 500); 29 Jun 2015 21:08:09 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 60760 invoked by uid 500); 29 Jun 2015 21:08:09 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 60751 invoked by uid 99); 29 Jun 2015 21:08:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2015 21:08:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 934FAE35E9; Mon, 29 Jun 2015 21:08:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: joshrosen@apache.org To: commits@spark.apache.org Message-Id: <3b206bf280804a369d89b9cddecd30fa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-8709] Exclude hadoop-client's mockito-all dependency Date: Mon, 29 Jun 2015 21:08:09 +0000 (UTC) Repository: spark Updated Branches: refs/heads/master afae9766f -> 27ef85451 [SPARK-8709] Exclude hadoop-client's mockito-all dependency This patch excludes `hadoop-client`'s dependency on `mockito-all`. As of #7061, Spark depends on `mockito-core` instead of `mockito-all`, so the dependency from Hadoop was leading to test compilation failures for some of the Hadoop 2 SBT builds. Author: Josh Rosen Closes #7090 from JoshRosen/SPARK-8709 and squashes the following commits: e190122 [Josh Rosen] [SPARK-8709] Exclude hadoop-client's mockito-all dependency. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/27ef8545 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/27ef8545 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/27ef8545 Branch: refs/heads/master Commit: 27ef85451cd237caa7016baa69957a35ab365aa8 Parents: afae976 Author: Josh Rosen Authored: Mon Jun 29 14:07:55 2015 -0700 Committer: Josh Rosen Committed: Mon Jun 29 14:07:55 2015 -0700 ---------------------------------------------------------------------- LICENSE | 2 +- core/pom.xml | 10 ---------- launcher/pom.xml | 6 ------ pom.xml | 8 ++++++++ 4 files changed, 9 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/27ef8545/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 8672be5..f9e412c 100644 --- a/LICENSE +++ b/LICENSE @@ -948,6 +948,6 @@ The following components are provided under the MIT License. See project link fo (MIT License) SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.5 - http://www.slf4j.org) (MIT License) pyrolite (org.spark-project:pyrolite:2.0.1 - http://pythonhosted.org/Pyro4/) (MIT License) scopt (com.github.scopt:scopt_2.10:3.2.0 - https://github.com/scopt/scopt) - (The MIT License) Mockito (org.mockito:mockito-core:1.8.5 - http://www.mockito.org) + (The MIT License) Mockito (org.mockito:mockito-core:1.9.5 - http://www.mockito.org) (MIT License) jquery (https://jquery.org/license/) (MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs) http://git-wip-us.apache.org/repos/asf/spark/blob/27ef8545/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 565437c..aee0d92 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -69,16 +69,6 @@ org.apache.hadoop hadoop-client - - - javax.servlet - servlet-api - - - org.codehaus.jackson - jackson-mapper-asl - - org.apache.spark http://git-wip-us.apache.org/repos/asf/spark/blob/27ef8545/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/launcher/pom.xml b/launcher/pom.xml index a853e67..2fd768d 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -68,12 +68,6 @@ org.apache.hadoop hadoop-client test - - - org.codehaus.jackson - jackson-mapper-asl - - http://git-wip-us.apache.org/repos/asf/spark/blob/27ef8545/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4c18bd5..94dd512 100644 --- a/pom.xml +++ b/pom.xml @@ -748,6 +748,10 @@ asm + org.codehaus.jackson + jackson-mapper-asl + + org.ow2.asm asm @@ -760,6 +764,10 @@ commons-logging + org.mockito + mockito-all + + org.mortbay.jetty servlet-api-2.5 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org