Merge pull request #431 from nsacyber/log4j_cleanup

log4j upgraded to 2.17.1
nsacyber · Jan 13, 2022 · 5fa040b · 5fa040b
2 parents 5165d40 + c026e54
commit 5fa040b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -120,11 +120,11 @@ subprojects {
       joda_time:     'joda-time:joda-time:2.9.4',
       jstl:        [ 'org.apache.taglibs:taglibs-standard-impl:1.2.5',
                      'org.apache.taglibs:taglibs-standard-spec:1.2.5'],
-      log4j2:      [ 'org.apache.logging.log4j:log4j-api:2.16.0',
-                     'org.apache.logging.log4j:log4j-core:2.16.0',
-                     'org.apache.logging.log4j:log4j-slf4j-impl:2.16.0'],
-      log4j2_web:  'org.apache.logging.log4j:log4j-web:2.16.0',
-      log_bridge:    'org.apache.logging.log4j:log4j-jcl:2.16.0',
+      log4j2:      [ 'org.apache.logging.log4j:log4j-api:2.17.1',
+                     'org.apache.logging.log4j:log4j-core:2.17.1',
+                     'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'],
+      log4j2_web:  'org.apache.logging.log4j:log4j-web:2.17.1',
+      log_bridge:    'org.apache.logging.log4j:log4j-jcl:2.17.1',
       mockito:       'org.mockito:mockito-all:1.10.19',
       mariadb:       'org.mariadb.jdbc:mariadb-java-client:2.2.1',
       minimal_json:  'com.eclipsesource.minimal-json:minimal-json:0.9.5',

diff --git a/tools/tcg_eventlog_tool/build.gradle b/tools/tcg_eventlog_tool/build.gradle
@@ -13,7 +13,6 @@ dependencies {
     compile project(':HIRS_Utils')
     compile libs.jcommander
     compile libs.commons_io
-    compile libs.log4j2
     compileOnly libs.checkstyle
     compileOnly libs.findbugs
     testCompile libs.testng