summaryrefslogtreecommitdiffstats
path: root/catalog-fe
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2020-10-08 13:28:36 +0200
committerVasyl Razinkov <vasyl.razinkov@est.tech>2020-10-30 14:08:07 +0000
commita9fffd2555cc45630ec9be9ce44b3f7ab2ed0241 (patch)
tree8f0135bc1bb8e02516049f490b9357b453f1f245 /catalog-fe
parent4b88c4265bd9170ab37384d291288ddf3dc132b3 (diff)
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 <sebastien.determe@intl.att.com> Change-Id: I63cee67d113f51dbe82a64c69629c62b47918103 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'catalog-fe')
-rw-r--r--catalog-fe/pom.xml15
-rw-r--r--catalog-fe/src/main/resources/ESAPI.properties2
-rw-r--r--catalog-fe/src/test/resources/config/ESAPI.properties2
3 files changed, 17 insertions, 2 deletions
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
@@ -241,6 +241,11 @@
<!-- Inserted for ECOMP Portal Integration -->
<dependency>
+ <groupId>org.owasp.esapi</groupId>
+ <artifactId>esapi</artifactId>
+ <version>2.2.0.0</version>
+ </dependency>
+ <dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-fw</artifactId>
<version>${ecomp.version}</version>
@@ -254,6 +259,10 @@
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
</exclusions>
</dependency>
<!-- System metrics -->
@@ -262,6 +271,12 @@
<artifactId>sigar</artifactId>
<version>${sigar.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- TEST -->
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