diff --git a/bench/src/main/resources/logback.xml b/bench/src/main/resources/logback.xml
deleted file mode 100644
index 2cc83148f6..0000000000
--- a/bench/src/main/resources/logback.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- log/bench.log
-
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{5}.%M\(%line\) - %msg%n
-
-
-
-
-
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{5}.%M\(%line\) - %msg%n
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/build.sbt b/build.sbt
index fe3085cbc3..87ad7bbdc6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -75,8 +75,13 @@ lazy val commonSettings = List(
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-oD"),
assemblyOption in assembly := (assemblyOption in assembly).value
.copy(includeScala = false),
+ /**
+ * We want to exclude loback config from our published library, so that users don't
+ * get our config forced on them
+ */
+ Compile / unmanagedResources := (Compile / unmanagedResources).value
+ .filterNot { _.getName.endsWith(".xml") },
licenses += ("MIT", url("http://opensource.org/licenses/MIT")),
-
/**
* Adding Ammonite REPL to test scope, can access both test and compile
* sources. Docs: http://ammonite.io/#Ammonite-REPL
@@ -96,7 +101,7 @@ lazy val commonSettings = List(
)
lazy val commonTestSettings = Seq(
- publish / skip := true,
+ publish / skip := true
) ++ commonSettings
lazy val commonTestWithDbSettings = Seq(
diff --git a/core/src/main/resources/common-logback.xml b/core/src/main/resources/common-logback.xml
index cd505a8958..2ae8f82657 100644
--- a/core/src/main/resources/common-logback.xml
+++ b/core/src/main/resources/common-logback.xml
@@ -1,4 +1,8 @@
+
+
+
+
logs/application.log
@@ -8,13 +12,13 @@
- %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{5}.%M\(%line\) - %msg%n
+ %d{HH:mm:ss.SSS} %level %logger{0} - %msg%n
-
+
diff --git a/core/src/main/resources/logback.xml b/core/src/main/resources/logback.xml
new file mode 100644
index 0000000000..132e39347e
--- /dev/null
+++ b/core/src/main/resources/logback.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/doc/src/main/resources/logback.xml b/doc/src/main/resources/logback.xml
deleted file mode 100644
index f6d9b39c34..0000000000
--- a/doc/src/main/resources/logback.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{5}.%M\(%line\) - %msg%n
-
-
-
-
- logs/doc.log
-
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{5}.%M\(%line\) - %msg%n
-
-
-
-
-
-
-
-
-
-
diff --git a/node/src/main/resources/logback.xml b/node/src/main/resources/logback.xml
deleted file mode 100644
index a84a24c11d..0000000000
--- a/node/src/main/resources/logback.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/scripts/src/main/resources/logback.xml b/scripts/src/main/resources/logback.xml
deleted file mode 100644
index f6d9b39c34..0000000000
--- a/scripts/src/main/resources/logback.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{5}.%M\(%line\) - %msg%n
-
-
-
-
- logs/doc.log
-
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{5}.%M\(%line\) - %msg%n
-
-
-
-
-
-
-
-
-
-
diff --git a/testkit/src/main/resources/logback-test.xml b/testkit/src/main/resources/logback-test.xml
deleted file mode 100644
index a84a24c11d..0000000000
--- a/testkit/src/main/resources/logback-test.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file