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

# Conflicts:
#	gradle.properties
This commit is contained in:
Mark Nellemann 2021-08-22 15:58:47 +02:00
commit 82b403d2f9
2 changed files with 7 additions and 1 deletions

View file

@ -41,7 +41,7 @@ publishing {
}
jacoco {
toolVersion = "0.8.4"
toolVersion = "0.8.6"
}
jacocoTestReport {

View file

@ -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