Merge remote-tracking branch 'origin/development' into development

# Conflicts: # gradle.properties
2021-08-22 15:58:47 +02:00 · 2021-08-22 15:58:47 +02:00 · 82b403d2f9
parent 1aeef1bd19 6218f78352
commit 82b403d2f9
2 changed files with 7 additions and 1 deletions
--- a/build.gradle
+++ b/build.gradle
@ -41,7 +41,7 @@ publishing {
 }

 jacoco {
-	toolVersion = "0.8.4"
+	toolVersion = "0.8.6"
 }

 jacocoTestReport {
--- a/src/test/resources/simplelogger.properties
+++ b/src/test/resources/simplelogger.properties
@ -0,0 +1,6 @@
+org.slf4j.simpleLogger.logFile=System.out
+org.slf4j.simpleLogger.showDateTime=true
+org.slf4j.simpleLogger.showShortLogName=true
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss.SSS
+org.slf4j.simpleLogger.levelInBrackets=true
+#org.slf4j.simpleLogger.defaultLogLevel=debug