Merge branch 'master' into zhczh_c

升级log4j
1 changed files with 2 additions and 2 deletions
--- a/pom.xml
+++ b/pom.xml
@ -382,12 +382,12 @@
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>
            <artifactId>log4j-core</artifactId>
-            <version>2.24.3</version>
+            <version>2.25.3</version>
        </dependency>
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>
            <artifactId>log4j-api</artifactId>
-            <version>2.24.3</version>
+            <version>2.25.3</version>
        </dependency>
        <!-- https://mvnrepository.com/artifact/net.minidev/json-smart -->
Author	SHA1	Message	Date
zhczyx@163.com	3f65d9af20	Merge branch 'master' into zhczh_c	3 weeks ago
review512jwy@163.com	ddefece37f	升级log4j	3 weeks ago