From 7c2593303b78cf8df66134d60af7a0efc54e4f13 Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Wed, 20 Jan 2021 21:20:28 +0000
Subject: Remove vulnerable log4j dependency

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3310
Change-Id: I1c31ab30efa7a3d03a08f512024a3967ce024237
---
 utils/webseal-simulator/pom.xml                                  | 9 +++------
 .../main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java  | 7 +++----
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'utils/webseal-simulator')

diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index 7616ebd78a..c3e1877882 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -76,15 +76,12 @@
       <version>1.0.2</version>
       <scope>compile</scope>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <version>${log4j.version}</version>
-      <scope>compile</scope>
+      <groupId>org.openecomp.sdc</groupId>
+      <artifactId>openecomp-sdc-logging-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
-
   </dependencies>
   <build>
     <finalName>WSSimulator-${project.version}</finalName>
diff --git a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java
index 014b6c4031..ea4203dcc1 100644
--- a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java
+++ b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java
@@ -35,8 +35,8 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.ssl.SSLContextBuilder;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.webseal.simulator.conf.Conf;
 
 import javax.net.ssl.SSLContext;
@@ -75,8 +75,7 @@ public class SdcProxy extends HttpServlet {
     private final String CONFIGURATIONS = "/configurations";
     private static final Set<String> RESERVED_HEADERS = Arrays.stream(ReservedHeaders.values()).map(h -> h.getValue()).collect(Collectors.toSet());
 
-
-    private final static Logger logger = LogManager.getLogger(SdcProxy.class);
+    private static final Logger logger = LoggerFactory.getLogger(SdcProxy.class);
 
     public void init(ServletConfig config) throws ServletException {
         super.init(config);
-- 
cgit 1.2.3-korg