From 6ab96a6fd0db7731c8c5d6478d9e28b619581687 Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Wed, 30 Jul 2014 15:04:33 -0700
Subject: SPARK-2749 [BUILD]. Spark SQL Java tests aren't compiling in Jenkins'
 Maven builds; missing junit:junit dep

The Maven-based builds in the build matrix have been failing for a few days:

https://amplab.cs.berkeley.edu/jenkins/view/Spark/

On inspection, it looks like the Spark SQL Java tests don't compile:

https://amplab.cs.berkeley.edu/jenkins/view/Spark/job/Spark-Master-Maven-pre-YARN/hadoop.version=1.0.4,label=centos/244/consoleFull

I confirmed it by repeating the command vs master:

`mvn -Dhadoop.version=1.0.4 -Dlabel=centos -DskipTests clean package`

The problem is that this module doesn't depend on JUnit. In fact, none of the modules do, but `com.novocode:junit-interface` (the SBT-JUnit bridge) pulls it in, in most places. However this module doesn't depend on `com.novocode:junit-interface`

Adding the `junit:junit` dependency fixes the compile problem. In fact, the other modules with Java tests should probably depend on it explicitly instead of happening to get it via `com.novocode:junit-interface`, since that is a bit SBT/Scala-specific (and I am not even sure it's needed).

Author: Sean Owen <srowen@gmail.com>

Closes #1660 from srowen/SPARK-2749 and squashes the following commits:

858ff7c [Sean Owen] Add explicit junit dep to other modules with Java tests for robustness
9636794 [Sean Owen] Add junit dep so that Spark SQL Java tests compile
---
 external/flume/pom.xml   | 5 +++++
 external/kafka/pom.xml   | 5 +++++
 external/mqtt/pom.xml    | 5 +++++
 external/twitter/pom.xml | 5 +++++
 external/zeromq/pom.xml  | 5 +++++
 5 files changed, 25 insertions(+)

(limited to 'external')

diff --git a/external/flume/pom.xml b/external/flume/pom.xml
index 9f680b27c3..c532705f39 100644
--- a/external/flume/pom.xml
+++ b/external/flume/pom.xml
@@ -72,6 +72,11 @@
       <artifactId>scalacheck_${scala.binary.version}</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.novocode</groupId>
       <artifactId>junit-interface</artifactId>
diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml
index 25a5c0a4d7..daf03360bc 100644
--- a/external/kafka/pom.xml
+++ b/external/kafka/pom.xml
@@ -80,6 +80,11 @@
       <artifactId>scalacheck_${scala.binary.version}</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.novocode</groupId>
       <artifactId>junit-interface</artifactId>
diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml
index f31ed655f6..dc48a08c93 100644
--- a/external/mqtt/pom.xml
+++ b/external/mqtt/pom.xml
@@ -67,6 +67,11 @@
       <artifactId>scalacheck_${scala.binary.version}</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.novocode</groupId>
       <artifactId>junit-interface</artifactId>
diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml
index 56bb24c2a0..b93ad016f8 100644
--- a/external/twitter/pom.xml
+++ b/external/twitter/pom.xml
@@ -62,6 +62,11 @@
       <artifactId>scalacheck_${scala.binary.version}</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.novocode</groupId>
       <artifactId>junit-interface</artifactId>
diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml
index 54b0242c54..22c1fff23d 100644
--- a/external/zeromq/pom.xml
+++ b/external/zeromq/pom.xml
@@ -62,6 +62,11 @@
       <artifactId>scalacheck_${scala.binary.version}</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.novocode</groupId>
       <artifactId>junit-interface</artifactId>
-- 
cgit v1.2.3