From a9fffd2555cc45630ec9be9ce44b3f7ab2ed0241 Mon Sep 17 00:00:00 2001 From: sebdet Date: Thu, 8 Oct 2020 13:28:36 +0200 Subject: Remove the Log4j 1.2.15 Remove the log4j 1.2.15 brought by Sigar library + update ESAPI to support slf4J instead of log4j Issue-ID: SDC-3310 Signed-off-by: sebdet Change-Id: I63cee67d113f51dbe82a64c69629c62b47918103 Signed-off-by: sebdet --- catalog-fe/pom.xml | 15 +++++++++++++++ catalog-fe/src/main/resources/ESAPI.properties | 2 +- catalog-fe/src/test/resources/config/ESAPI.properties | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) (limited to 'catalog-fe') diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 5ac590ed61..b9a75353cc 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -240,6 +240,11 @@ + + org.owasp.esapi + esapi + 2.2.0.0 + org.onap.portal.sdk epsdk-fw @@ -254,6 +259,10 @@ slf4j-log4j12 org.slf4j + + log4j + log4j + @@ -262,6 +271,12 @@ sigar ${sigar.version} compile + + + log4j + log4j + + diff --git a/catalog-fe/src/main/resources/ESAPI.properties b/catalog-fe/src/main/resources/ESAPI.properties index 1dedfe6739..a1fcdcdece 100644 --- a/catalog-fe/src/main/resources/ESAPI.properties +++ b/catalog-fe/src/main/resources/ESAPI.properties @@ -75,7 +75,7 @@ ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector # Log4JFactory Requires log4j.xml or log4j.properties in classpath - http://www.laliluna.de/log4j-tutorial.html -ESAPI.Logger=org.owasp.esapi.reference.Log4JLogFactory +ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory #ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory ESAPI.Randomizer=org.owasp.esapi.reference.DefaultRandomizer ESAPI.Validator=org.owasp.esapi.reference.DefaultValidator diff --git a/catalog-fe/src/test/resources/config/ESAPI.properties b/catalog-fe/src/test/resources/config/ESAPI.properties index 1dedfe6739..a1fcdcdece 100644 --- a/catalog-fe/src/test/resources/config/ESAPI.properties +++ b/catalog-fe/src/test/resources/config/ESAPI.properties @@ -75,7 +75,7 @@ ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector # Log4JFactory Requires log4j.xml or log4j.properties in classpath - http://www.laliluna.de/log4j-tutorial.html -ESAPI.Logger=org.owasp.esapi.reference.Log4JLogFactory +ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory #ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory ESAPI.Randomizer=org.owasp.esapi.reference.DefaultRandomizer ESAPI.Validator=org.owasp.esapi.reference.DefaultValidator -- cgit 1.2.3-korg