Merge branch 'master' into dependabot/github_actions/actions/checkout…

…-2.3.4
saveourtool · May 17, 2021 · 155ebc6 · 155ebc6
2 parents debf31f + 9b182b3
commit 155ebc6
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 49 deletions.
diff --git a/diktat-common/src/main/resources/log4j.properties b/diktat-common/src/main/resources/log4j.properties
@@ -4,19 +4,3 @@ log4j.appender.stdout = org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target = System.out
 log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss} %m%n
-
-log4j.appender.D = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.D.File = ${user.home}/.diktat/diktatLogs/${repoID}/CodeNetInfo.log
-log4j.appender.D.Append = true
-log4j.appender.D.Threshold = INFO
-log4j.appender.D.layout = org.apache.log4j.PatternLayout
-log4j.appender.D.layout.ConversionPattern = [%d{yyyy-MM-dd HH:mm:ss,SSS}] [%-5p] [%t] [%C{1}:%M %L] %m%n
-
-log4j.appender.E = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.E.File = ${user.home}/.diktat/diktatLogs/${repoID}/CodeNetError.log
-log4j.appender.E.Append = true
-log4j.appender.E.Threshold = ERROR
-log4j.appender.E.layout = org.apache.log4j.PatternLayout
-log4j.appender.E.layout.ConversionPattern = [%d{yyyy-MM-dd HH:mm:ss,SSS}] [%-5p] [%t] [%C{1}:%M %L] %m%n
-
-log4j.logger.com.mongodb.diagnostics.logging=OFF
diff --git a/diktat-rules/src/main/resources/log4j.properties b/diktat-rules/src/main/resources/log4j.properties
@@ -4,19 +4,3 @@ log4j.appender.stdout = org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target = System.out
 log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss} %m%n
-
-log4j.appender.D = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.D.File = ${user.home}/.diktat/diktatLogs/${repoID}/CodeNetInfo.log
-log4j.appender.D.Append = true
-log4j.appender.D.Threshold = INFO
-log4j.appender.D.layout = org.apache.log4j.PatternLayout
-log4j.appender.D.layout.ConversionPattern = [%d{yyyy-MM-dd HH:mm:ss,SSS}] [%-5p] [%t] [%C{1}:%M %L] %m%n
-
-log4j.appender.E = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.E.File = ${user.home}/.diktat/diktatLogs/${repoID}/CodeNetError.log
-log4j.appender.E.Append = true
-log4j.appender.E.Threshold = ERROR
-log4j.appender.E.layout = org.apache.log4j.PatternLayout
-log4j.appender.E.layout.ConversionPattern = [%d{yyyy-MM-dd HH:mm:ss,SSS}] [%-5p] [%t] [%C{1}:%M %L] %m%n
-
-log4j.logger.com.mongodb.diagnostics.logging=OFF
diff --git a/diktat-test-framework/src/main/resources/log4j.properties b/diktat-test-framework/src/main/resources/log4j.properties
@@ -4,19 +4,3 @@ log4j.appender.stdout = org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target = System.out
 log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss} %m%n
-
-log4j.appender.D = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.D.File = ${user.home}/.diktat/diktatLogs/${repoID}/CodeNetInfo.log
-log4j.appender.D.Append = true
-log4j.appender.D.Threshold = INFO
-log4j.appender.D.layout = org.apache.log4j.PatternLayout
-log4j.appender.D.layout.ConversionPattern = [%d{yyyy-MM-dd HH:mm:ss,SSS}] [%-5p] [%t] [%C{1}:%M %L] %m%n
-
-log4j.appender.E = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.E.File = ${user.home}/.diktat/diktatLogs/${repoID}/CodeNetError.log
-log4j.appender.E.Append = true
-log4j.appender.E.Threshold = ERROR
-log4j.appender.E.layout = org.apache.log4j.PatternLayout
-log4j.appender.E.layout.ConversionPattern = [%d{yyyy-MM-dd HH:mm:ss,SSS}] [%-5p] [%t] [%C{1}:%M %L] %m%n
-
-log4j.logger.com.mongodb.diagnostics.logging=OFF
diff --git a/pom.xml b/pom.xml
@@ -46,7 +46,7 @@
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <kotlinx.serialization.version>1.2.0</kotlinx.serialization.version>
         <ktlint.version>0.39.0</ktlint.version>
-        <junit.version>5.7.1</junit.version>
+        <junit.version>5.7.2</junit.version>
         <guava.version>30.1.1-jre</guava.version>
         <slf4j.version>1.7.30</slf4j.version>
         <commons-cli.version>1.4</commons-cli.version>