solve conflict with TJ

Author: PangZhi

pom.xml

@@ -61,7 +61,6 @@
 	  	<module>core</module>
 	  	<module>spark</module>
 	  	<module>examples</module>
-		<module>jdbc</module>
 	</modules>
 
 	<dependencies>

project/RootBuild.scala

@@ -63,10 +63,12 @@ object RootBuild extends Build {
 
   val jdbcProjectName = projectName + "_jdbc"
 
-  lazy val root = Project("root", file("."), settings = rootSettings) aggregate(core, spark, examples, jdbc)
+  // lazy val root = Project("root", file("."), settings = rootSettings) aggregate(core, spark, examples, jdbc)
+  lazy val root = Project("root", file("."), settings = rootSettings) aggregate(core, spark, examples)
   lazy val core = Project("core", file("core"), settings = coreSettings)
   lazy val jdbc = Project("jdbc", file("jdbc"), settings = jdbcSettings) dependsOn (core)
-  lazy val spark = Project("spark", file("spark"), settings = sparkSettings) dependsOn (core) dependsOn(jdbc)
+  // lazy val spark = Project("spark", file("spark"), settings = sparkSettings) dependsOn (core) dependsOn(jdbc)
+  lazy val spark = Project("spark", file("spark"), settings = sparkSettings) dependsOn (core) 
   lazy val examples = Project("examples", file("examples"), settings = examplesSettings) dependsOn (spark) dependsOn (core)
 
   // A configuration to set an alternative publishLocalConfiguration

spark/src/test/java/io/ddf/spark/TableNameReplacerTests.java

@@ -7,7 +7,6 @@
 import io.ddf.content.SqlResult;
 import io.ddf.datasource.*;
 import io.ddf.exception.DDFException;
-import io.ddf.jdbc.JDBCDDFManager;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserManager;
 import net.sf.jsqlparser.statement.Statement;