Update diktat-analysis configs and migrate to log4j2 (#1156)

### What's done: * Update diktat-analysis configs and migrate to log4j2
saveourtool · Dec 23, 2021 · e8007b5 · e8007b5
1 parent da3f5ae
commit e8007b5
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 33 deletions.
diff --git a/diktat-common/pom.xml b/diktat-common/pom.xml
@@ -36,8 +36,14 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.17.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/diktat-common/src/main/resources/log4j.properties b/diktat-common/src/main/resources/log4j.properties
diff --git a/diktat-common/src/main/resources/log4j2.properties b/diktat-common/src/main/resources/log4j2.properties
@@ -0,0 +1,8 @@
+rootLogger.level = info
+rootLogger.appenderRef.stdout.ref = STDOUT
+
+appender.stdout.type = Console
+appender.stdout.name = STDOUT
+appender.stdout.target = SYSTEM_OUT
+appender.stdout.layout.type = PatternLayout
+appender.stdout.layout.pattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss} %m%n
diff --git a/diktat-rules/pom.xml b/diktat-rules/pom.xml
@@ -55,8 +55,14 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.17.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/diktat-rules/src/main/resources/diktat-analysis-huawei.yml b/diktat-rules/src/main/resources/diktat-analysis-huawei.yml
@@ -138,7 +138,7 @@
   enabled: true
   configuration:
     isCopyrightMandatory: true
-    copyrightText: ' Copyright (c) Huawei Technologies Co., Ltd. 2012-2021. All rights reserved.'
+    copyrightText: ' Copyright (c) Huawei Technologies Co., Ltd. 2012-;@currYear;. All rights reserved.'
 # Checks that header kdoc is located before package directive
 - name: HEADER_NOT_BEFORE_PACKAGE
   enabled: true

diff --git a/diktat-rules/src/main/resources/diktat-analysis.yml b/diktat-rules/src/main/resources/diktat-analysis.yml
@@ -138,7 +138,7 @@
   enabled: true
   configuration:
     isCopyrightMandatory: false
-    copyrightText: 'Copyright (c) Your Company Name Here. 2010-2021'
+    copyrightText: 'Copyright (c) Your Company Name Here. 2010-;@currYear;'
 # Checks that header kdoc is located before package directive
 - name: HEADER_NOT_BEFORE_PACKAGE
   enabled: true

diff --git a/diktat-rules/src/main/resources/log4j.properties b/diktat-rules/src/main/resources/log4j.properties
diff --git a/diktat-rules/src/main/resources/log4j2.properties b/diktat-rules/src/main/resources/log4j2.properties
@@ -0,0 +1,8 @@
+rootLogger.level = info
+rootLogger.appenderRef.stdout.ref = STDOUT
+
+appender.stdout.type = Console
+appender.stdout.name = STDOUT
+appender.stdout.target = SYSTEM_OUT
+appender.stdout.layout.type = PatternLayout
+appender.stdout.layout.pattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss} %m%n
diff --git a/diktat-test-framework/pom.xml b/diktat-test-framework/pom.xml
@@ -35,8 +35,14 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.17.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>io.github.petertrr</groupId>

diff --git a/diktat-test-framework/src/main/resources/log4j.properties b/diktat-test-framework/src/main/resources/log4j.properties
diff --git a/diktat-test-framework/src/main/resources/log4j2.properties b/diktat-test-framework/src/main/resources/log4j2.properties
@@ -0,0 +1,8 @@
+rootLogger.level = info
+rootLogger.appenderRef.stdout.ref = STDOUT
+
+appender.stdout.type = Console
+appender.stdout.name = STDOUT
+appender.stdout.target = SYSTEM_OUT
+appender.stdout.layout.type = PatternLayout
+appender.stdout.layout.pattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss} %m%n
diff --git a/examples/gradle-groovy-dsl/diktat-analysis.yml b/examples/gradle-groovy-dsl/diktat-analysis.yml
@@ -138,7 +138,7 @@
   enabled: true
   configuration:
     isCopyrightMandatory: false
-    copyrightText: 'Copyright (c) Your Company Name Here. 2010-2021'
+    copyrightText: 'Copyright (c) Your Company Name Here. 2010-;@currYear;'
 # Checks that header kdoc is located before package directive
 - name: HEADER_NOT_BEFORE_PACKAGE
   enabled: true

diff --git a/examples/gradle-kotlin-dsl-multiproject/diktat-analysis.yml b/examples/gradle-kotlin-dsl-multiproject/diktat-analysis.yml
@@ -83,7 +83,7 @@
   enabled: true
   configuration:
     isCopyrightMandatory: true
-    copyrightText: 'Copyright (c) Your Company Name Here. 2010-2021'
+    copyrightText: 'Copyright (c) Your Company Name Here. 2010-;@currYear;'
 - name: HEADER_NOT_BEFORE_PACKAGE
   enabled: true
 - name: FILE_IS_TOO_LONG

diff --git a/examples/gradle-kotlin-dsl/diktat-analysis.yml b/examples/gradle-kotlin-dsl/diktat-analysis.yml
@@ -138,7 +138,7 @@
   enabled: true
   configuration:
     isCopyrightMandatory: false
-    copyrightText: 'Copyright (c) Your Company Name Here. 2010-2021'
+    copyrightText: 'Copyright (c) Your Company Name Here. 2010-;@currYear;'
 # Checks that header kdoc is located before package directive
 - name: HEADER_NOT_BEFORE_PACKAGE
   enabled: true

diff --git a/examples/maven/diktat-analysis.yml b/examples/maven/diktat-analysis.yml
@@ -138,7 +138,7 @@
   enabled: true
   configuration:
     isCopyrightMandatory: false
-    copyrightText: 'Copyright (c) Your Company Name Here. 2010-2021'
+    copyrightText: 'Copyright (c) Your Company Name Here. 2010-;@currYear;'
 # Checks that header kdoc is located before package directive
 - name: HEADER_NOT_BEFORE_PACKAGE
   enabled: true

diff --git a/pom.xml b/pom.xml
@@ -134,9 +134,14 @@
                 <version>${slf4j.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>${slf4j.version}</version>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>2.17.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j-impl</artifactId>
+                <version>2.17.0</version>
             </dependency>
             <dependency>
                 <groupId>io.github.petertrr</groupId>