From 3c21b6e753fd61928b45a91a77588b33d4d40923 Mon Sep 17 00:00:00 2001
From: Lukasz Rajewski <lukasz.rajewski@orange.com>
Date: Tue, 15 Sep 2020 10:48:09 +0200
Subject: [PATCH] Upgrade of slf4j library

Issue-ID: MULTICLOUD-1067
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: Idabf0abbddb1b1bb4ead6065ce07c8053590a465
---
 .../ArtifactForwarderConfigurationParametersJsonAdapter.java  |  8 ++++----
 artifactbroker/pom.xml                                        | 11 +++--------
 .../ReceptionHandlerConfigurationParametersJsonAdapter.java   |  8 ++++----
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/artifactbroker/main/src/main/java/org/onap/policy/distribution/main/parameters/ArtifactForwarderConfigurationParametersJsonAdapter.java b/artifactbroker/main/src/main/java/org/onap/policy/distribution/main/parameters/ArtifactForwarderConfigurationParametersJsonAdapter.java
index c63056d..a87ef30 100644
--- a/artifactbroker/main/src/main/java/org/onap/policy/distribution/main/parameters/ArtifactForwarderConfigurationParametersJsonAdapter.java
+++ b/artifactbroker/main/src/main/java/org/onap/policy/distribution/main/parameters/ArtifactForwarderConfigurationParametersJsonAdapter.java
@@ -27,16 +27,16 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import java.lang.reflect.Type;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
+
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /**
  * This class deserialises policy forwarder parameters from JSON.
  */
 public class ArtifactForwarderConfigurationParametersJsonAdapter
         implements JsonDeserializer<ArtifactForwarderConfigurationParameterGroup> {
-    private static final XLogger LOGGER =
-            XLoggerFactory.getXLogger(ArtifactForwarderConfigurationParametersJsonAdapter.class);
+    private static final Logger LOGGER = FlexLogger.getLogger(ArtifactForwarderConfigurationParametersJsonAdapter.class);
 
     private static final String PARAMETER_CLASS_NAME = "parameterClassName";
     private static final String Artifact_FORWARDER_PARAMETERS = "parameters";
diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
index 4516ca2..3360a4d 100644
--- a/artifactbroker/pom.xml
+++ b/artifactbroker/pom.xml
@@ -55,14 +55,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-ext</artifactId>
-            <version>1.8.0-beta2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.13.3</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
diff --git a/artifactbroker/reception/src/main/java/org/onap/policy/distribution/reception/parameters/ReceptionHandlerConfigurationParametersJsonAdapter.java b/artifactbroker/reception/src/main/java/org/onap/policy/distribution/reception/parameters/ReceptionHandlerConfigurationParametersJsonAdapter.java
index 0890a2a..08c513c 100644
--- a/artifactbroker/reception/src/main/java/org/onap/policy/distribution/reception/parameters/ReceptionHandlerConfigurationParametersJsonAdapter.java
+++ b/artifactbroker/reception/src/main/java/org/onap/policy/distribution/reception/parameters/ReceptionHandlerConfigurationParametersJsonAdapter.java
@@ -26,16 +26,16 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import java.lang.reflect.Type;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
+
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /**
  * This class deserialises reception handler parameters from JSON.
  */
 public class ReceptionHandlerConfigurationParametersJsonAdapter
         implements JsonDeserializer<ReceptionHandlerConfigurationParameterGroup> {
-    private static final XLogger LOGGER =
-            XLoggerFactory.getXLogger(ReceptionHandlerConfigurationParametersJsonAdapter.class);
+    private static final Logger LOGGER = FlexLogger.getLogger(ReceptionHandlerConfigurationParametersJsonAdapter.class);
 
     private static final String PARAMETER_CLASS_NAME = "parameterClassName";
     private static final String RECEPTION_HANDLER_PARAMETERS = "parameters";
-- 
2.16.6