Merge pull request #1507 from ennru/hdfs-cats-1.6

HDFS: Cats 1.6.0 and logging sorted out
akka · Feb 19, 2019 · 75aa324 · 75aa324
2 parents 3b8aede + 4f5dfc8
commit 75aa324
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/hdfs/src/test/resources/logback-test.xml b/hdfs/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/hdfs.log</file>
+        <append>false</append>
+        <encoder>
+            <pattern>%d{ISO8601} %-5level [%thread] [%logger{36}]  %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.eclipse.jetty" level="info"/>
+    <logger name="org.apache.hadoop" level="warn"/>
+
+    <root level="debug">
+        <appender-ref ref="FILE" />
+    </root>
+</configuration>
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -215,20 +215,16 @@ object Dependencies {
   }
 
   val HadoopVersion = "3.1.1"
-  val Hdfs = {
-    val hadoopVersion = HadoopVersion
-    val catsVersion = "1.1.0"
-    Seq(
-      libraryDependencies ++= Seq(
-        "org.apache.hadoop" % "hadoop-client" % hadoopVersion, // ApacheV2
-        "org.typelevel" %% "cats-core" % catsVersion, // MIT,
-        //Test
-        "org.apache.hadoop" % "hadoop-hdfs" % hadoopVersion % Test classifier "tests", // ApacheV2
-        "org.apache.hadoop" % "hadoop-common" % hadoopVersion % Test classifier "tests", // ApacheV2
-        "org.apache.hadoop" % "hadoop-minicluster" % hadoopVersion % Test // ApacheV2
-      )
+  val Hdfs = Seq(
+    libraryDependencies ++= Seq(
+      "org.apache.hadoop" % "hadoop-client" % HadoopVersion exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2
+      "org.typelevel" %% "cats-core" % "1.6.0", // MIT,
+      "org.apache.hadoop" % "hadoop-hdfs" % HadoopVersion % Test classifier "tests" exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2
+      "org.apache.hadoop" % "hadoop-common" % HadoopVersion % Test classifier "tests" exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2
+      "org.apache.hadoop" % "hadoop-minicluster" % HadoopVersion % Test exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2
+      "org.slf4j" % "log4j-over-slf4j" % "1.7.25" % Test // MIT like: http://www.slf4j.org/license.html
     )
-  }
+  )
 
   val IronMq = Seq(
     libraryDependencies ++= Seq(