Fix logging dependency conflict

- use spring logging framework
- get rid of EELF
- do not get sl4fj transitivly

Change-Id: I1d47749b53dca2f3a815a2d9898b7a0388725655
Issue-ID: SDNC-710
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Signed-off-by: prathamesh morde <prathamesh.morde@bell.ca>

3 files changed, 9 insertions, 9 deletions

diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
index db949d45f..b8185c46a 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
@@ -20,11 +20,11 @@ package org.onap.ccsdk.cds.controllerblueprints.resource.dict;
 import org.junit.Assert;
 import org.junit.Test;
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ResourceDefinitionTest {
-    private EELFLogger log = EELFManager.getInstance().getLogger(ResourceDefinitionTest.class);
+    private Logger log = LoggerFactory.getLogger(ResourceDefinitionTest.class);
     private String basePath = "load/resource_dictionary";
 
     @Test
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
index f21ff4093..b891f9ec6 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
@@ -16,15 +16,14 @@
 
 package org.onap.ccsdk.cds.controllerblueprints.resource.dict.service
 
-import com.att.eelf.configuration.EELFLogger
 import org.junit.Assert
 import org.junit.Test
 import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment
-import com.att.eelf.configuration.EELFManager
 import org.junit.Before
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.utils.ResourceDictionaryTestUtils
+import org.slf4j.LoggerFactory
 
 /**
  * ResourceAssignmentValidationServiceTest.
@@ -32,7 +31,7 @@ import org.onap.ccsdk.cds.controllerblueprints.resource.dict.utils.ResourceDicti
  * @author Brinda Santh
  */
 class ResourceAssignmentValidationServiceTest {
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationServiceTest::class.java)
+    private val log = LoggerFactory.getLogger(ResourceAssignmentValidationServiceTest::class.java)
     @Before
     fun setUp() {
         // Setup dummy Source Instance Mapping
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
index fccc4f5fa..93c42445f 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
@@ -27,18 +27,19 @@ import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils;
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment;
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDefinition;
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDictionaryConstants;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
 
 import java.util.HashMap;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * ResourceDictionaryUtilsTest.
  *
  * @author Brinda Santh
  */
 public class ResourceDictionaryUtilsTest {
-    private static final EELFLogger log = EELFManager.getInstance().getLogger(ResourceDictionaryUtilsTest.class);
+    private static final Logger log = LoggerFactory.getLogger(ResourceDictionaryUtilsTest.class);
 
     @Test
     public void testPopulateSourceMapping() {