From 9636794a85e433f3398c5b0dfca589c3b25b82f2 Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Wed, 30 Jul 2014 13:16:18 +0100
Subject: [PATCH 1/2] Add junit dep so that Spark SQL Java tests compile

---
 sql/core/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index 3a038a2db6173..c8016e41256d5 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -68,6 +68,11 @@
       <artifactId>jackson-databind</artifactId>
       <version>2.3.0</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_${scala.binary.version}</artifactId>

From 858ff7c7e076418e504660cdaabd17d62f2e1042 Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Wed, 30 Jul 2014 13:16:46 +0100
Subject: [PATCH 2/2] Add explicit junit dep to other modules with Java tests
 for robustness

---
 core/pom.xml               | 5 +++++
 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 +++++
 extras/java8-tests/pom.xml | 5 +++++
 mllib/pom.xml              | 5 +++++
 streaming/pom.xml          | 5 +++++
 9 files changed, 45 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index 4f061099a477d..04d4b9cc1068e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -262,6 +262,11 @@
       <artifactId>asm</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/flume/pom.xml b/external/flume/pom.xml
index 9f680b27c3308..c532705f3950c 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 25a5c0a4d7d77..daf03360bc5f5 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 f31ed655f6779..dc48a08c93de2 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 56bb24c2a072e..b93ad016f84f0 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 54b0242c54e78..22c1fff23d9a2 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>
diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml
index 3eade411b38b7..5308bb4e440ea 100644
--- a/extras/java8-tests/pom.xml
+++ b/extras/java8-tests/pom.xml
@@ -50,6 +50,11 @@
       <version>${project.version}</version>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.novocode</groupId>
       <artifactId>junit-interface</artifactId>
diff --git a/mllib/pom.xml b/mllib/pom.xml
index f27cf520dc9fa..cb0fa7b97cb15 100644
--- a/mllib/pom.xml
+++ b/mllib/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/streaming/pom.xml b/streaming/pom.xml
index b99f306b8f2cc..1072f74aea0d9 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -58,6 +58,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>