From a9fffd2555cc45630ec9be9ce44b3f7ab2ed0241 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
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 <sebastien.determe@intl.att.com>
Change-Id: I63cee67d113f51dbe82a64c69629c62b47918103
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 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 @@
         </dependency>
 
         <!-- 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>
@@ -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
-- 
cgit 1.2.3-korg