From 7c2593303b78cf8df66134d60af7a0efc54e4f13 Mon Sep 17 00:00:00 2001 From: vasraz Date: Wed, 20 Jan 2021 21:20:28 +0000 Subject: Remove vulnerable log4j dependency Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3310 Change-Id: I1c31ab30efa7a3d03a08f512024a3967ce024237 --- catalog-be/pom.xml | 4 ++ catalog-fe/pom.xml | 6 +++ .../ci/tests/execute/setup/SetupCDTest.java | 2 +- .../ci/testSuites/backend/onapApiSanity.xml | 16 +++---- .../ci/testSuites/frontend/onapUiSanity.xml | 51 +++++++++++----------- pom.xml | 2 +- utils/webseal-simulator/pom.xml | 9 ++-- .../openecomp/sdc/webseal/simulator/SdcProxy.java | 7 ++- 8 files changed, 51 insertions(+), 46 deletions(-) diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index fd25bc2956..964e777f2b 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -497,6 +497,10 @@ xerces xercesImpl + + log4j + log4j + diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 17942d2659..65b692dbdb 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -244,6 +244,12 @@ org.owasp.esapi esapi 2.2.0.0 + + + log4j + log4j + + org.onap.portal.sdk diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java index 18b5a71061..61c6c56222 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java @@ -179,7 +179,7 @@ public abstract class SetupCDTest extends DriverFactory { addTrafficFileToReport(result); } - if (result.getInstanceName().equals(OnboardingFlowsUi.class.getName()) && result.getStatus() == ITestResult.FAILURE) { + if (OnboardingFlowsUi.class.getName().equals(result.getInstanceName()) && result.getStatus() == ITestResult.FAILURE) { final String msg = "Onboarding test failed, closing browser"; LOGGER.info(msg); getExtendTest().log(Status.INFO, msg); diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml index 8d5d2b2f08..fbd796edb1 100644 --- a/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml +++ b/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml @@ -1,11 +1,11 @@ - + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml index 47dc9f6960..48e28fc316 100644 --- a/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml +++ b/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml @@ -1,30 +1,29 @@ - - + + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 6d1398590f..213fc27980 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ Modifications copyright (c) 2018-2019 Nokia 1.6.0 5.6.0 3.16.0 - 7.2.0 + 7.3.0 5.6.0 0.11 2.1 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 @@ 1.0.2 compile - - org.apache.logging.log4j - log4j-core - ${log4j.version} - compile + org.openecomp.sdc + openecomp-sdc-logging-api + ${project.version} - WSSimulator-${project.version} 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 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