From 192129f369d3b82a8e09a647cc664fccd8c30a24 Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Sun, 3 Jul 2016 01:44:53 +0900
Subject: [PATCH] Removed spark-dependencies from spark Added
 spark-{reple,hive} in spark/pom.xml Changed exception to throwable because of
 Error

---
 spark/pom.xml                                     | 15 +++++++++++----
 .../zeppelin/interpreter/InterpreterFactory.java  |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/spark/pom.xml b/spark/pom.xml
index 987308c2e62..00a4463ed80 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -38,7 +38,7 @@
     <jsoup.version>1.8.2</jsoup.version>
     <mockito.version>1.10.19</mockito.version>
     <powermock.version>1.6.4</powermock.version>
-    <spark.version>1.4.1</spark.version>
+    <spark.version>1.6.2</spark.version>
     <scala.version>2.10.4</scala.version>
     <scala.binary.version>2.10</scala.binary.version>
   </properties>
@@ -67,9 +67,16 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>zeppelin-spark-dependencies</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.apache.spark</groupId>
+      <artifactId>spark-repl_${scala.binary.version}</artifactId>
+      <version>${spark.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.spark</groupId>
+      <artifactId>spark-hive_${scala.binary.version}</artifactId>
+      <version>${spark.version}</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
index 47a4325a72e..4213886633e 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
@@ -170,7 +170,7 @@ public boolean accept(Path entry) throws IOException {
                 cleanCl.put(interpreterDirString, ccl);
               }
             }
-          } catch (ClassNotFoundException e) {
+          } catch (Throwable t) {
             // nothing to do
           }
         }