Fix conflict

Author: mnmami

pom.xml

@@ -25,19 +25,10 @@
 
 		<scala.version>2.11.11</scala.version>
 		<scala.binary.version>2.11</scala.binary.version>
-		<scala.classifier>${scala.binary.version}</scala.classifier>
 		<scala.version.suffix>_${scala.binary.version}</scala.version.suffix>
 
-		<flink.version>1.5.0</flink.version>
 		<spark.version>2.4.0</spark.version>
 		<jena.version>3.9.0</jena.version>
-		<jsa.subversion>3</jsa.subversion>
-		<hadoop.version>2.8.3</hadoop.version>
-
-		<jsa.version>${jena.version}-${jsa.subversion}</jsa.version>
-
-		<jetty.version>9.4.8.v20171121</jetty.version>
-		<mortbay.jetty.version>6.1.26</mortbay.jetty.version>
 
 		<scalastyle.config.path>${project.basedir}/scalastyle-config.xml</scalastyle.config.path>
 	</properties>

sansa-datalake-spark/src/main/scala/net/sansa_stack/datalake/spark/Run.scala

@@ -3,7 +3,7 @@ package net.sansa_stack.datalake.spark
 import java.io.FileNotFoundException
 
 import org.apache.commons.lang.time.StopWatch
-import org.apache.log4j.{Level, Logger}
+import org.apache.log4j.{ Level, Logger }
 import net.sansa_stack.datalake.spark.utils.Helpers._
 
 import scala.collection.JavaConversions._
@@ -16,6 +16,7 @@ import org.apache.spark.sql.DataFrame
 class Run[A](executor: QueryExecutor[A]) {
 
   private var finalDataSet: A = _
+  val logger = Logger.getLogger(this.getClass.getName.stripSuffix("$"))
 
   def application(queryFile: String, mappingsFile: String, configFile: String): DataFrame = {
 
@@ -36,7 +37,6 @@ class Run[A](executor: QueryExecutor[A]) {
       val queryString = scala.io.Source.fromFile(queryFile)
       var query = try queryString.mkString finally queryString.close()
 
-
       // Transformations
       var transformExist = false
       var trans = ""
@@ -282,6 +282,5 @@ class Run[A](executor: QueryExecutor[A]) {
         println("ERROR: invalid query.")
         null
     }
-
   }
 }