remove dependency

beeva-victorgarcia · beeva-victorgarcia · commit 37a4c1a0c832 · 2016-01-08T23:03:44.000+01:00
diff --git a/bin/zeppelin-daemon.sh b/bin/zeppelin-daemon.sh
@@ -68,10 +68,7 @@ if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/classes" ]]; then
 fi
 
 # Add jdbc connector jar
-ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/jdbc/jars/mysql-connector-java-5.1.35-bin.jar"
-ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/jdbc/jars/postgresql-9.4-1205-jdbc41.jar"
-ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/jdbc/jars/mariadb-java-client-1.2.3.jar"
-ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/jdbc/jars/RedshiftJDBC41-1.1.10.1010.jar"
+# ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/jdbc/jars/jdbc-connector-jar"
 
 addJarInDir "${ZEPPELIN_HOME}"
 addJarInDir "${ZEPPELIN_HOME}/lib"
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
@@ -32,12 +32,11 @@
   <version>0.6.0-incubating-SNAPSHOT</version>
   <name>Zeppelin: JDBC interpreter</name>
   <url>http://www.apache.org</url>
-
+  
   <properties>
-    <hive.hive.version>0.14.0</hive.hive.version>
-    <hive.hadoop.version>2.6.0</hive.hadoop.version>
+    <postgresql.version>9.4-1201-jdbc41</postgresql.version>
   </properties>
-    
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.zeppelin</groupId>
@@ -46,6 +45,12 @@
       <scope>provided</scope>
     </dependency>
 	
+	<dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgresql.version}</version>
+    </dependency>
+    
 	<dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -56,23 +61,11 @@
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
 	
-    <dependency>
+	<dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-	
-	<dependency>
-      <groupId>org.apache.hive</groupId>
-      <artifactId>hive-jdbc</artifactId>
-      <version>${hive.hive.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>${hive.hadoop.version}</version>
-    </dependency>
-    
+
     <dependency>
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -261,7 +261,7 @@ private InterpreterResult executeSql(String propertyKey, String sql,
 
       Statement statement = getStatement(propertyKey, paragraphId);
       statement.setMaxRows(getMaxResult());
-      
+        
       StringBuilder msg = null;
       boolean isTableType = false;
 
diff --git a/pom.xml b/pom.xml
@@ -93,7 +93,6 @@
     <module>shell</module>
     <module>hive</module>
     <module>phoenix</module>
-    <module>geode</module>
     <module>jdbc</module>
     <module>tajo</module>
     <module>flink</module>
