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, 7 insertions, 7 deletions

diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/controllerblueprints/service/common/SchemaGeneratorServiceTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
index 56a92fe0a..f17d637e6 100644
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
@@ -16,8 +16,6 @@
 
 package org.onap.ccsdk.cds.controllerblueprints.service.common;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
 import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
@@ -27,12 +25,14 @@ import org.onap.ccsdk.cds.controllerblueprints.service.SchemaGeneratorService;
 
 import java.io.File;
 import java.nio.charset.Charset;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class SchemaGeneratorServiceTest {
 
-    private static EELFLogger log = EELFManager.getInstance().getLogger(SchemaGeneratorServiceTest.class);
+    private static Logger log = LoggerFactory.getLogger(SchemaGeneratorServiceTest.class);
 
     @Test
     public void test01GenerateSwaggerData() throws Exception {
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/ModelTypeServiceTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/ModelTypeServiceTest.kt
index 741431840..e55f2a511 100644
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/ModelTypeServiceTest.kt
+++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/ModelTypeServiceTest.kt
@@ -16,7 +16,6 @@
 
 package org.onap.ccsdk.cds.controllerblueprints.service
 
-import com.att.eelf.configuration.EELFManager
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.FixMethodOrder
@@ -28,6 +27,7 @@ import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
 import org.onap.ccsdk.cds.controllerblueprints.service.domain.ModelType
 import org.onap.ccsdk.cds.controllerblueprints.service.handler.ModelTypeHandler
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
 import org.springframework.test.annotation.Commit
@@ -48,7 +48,7 @@ class ModelTypeServiceTest {
 
     internal var modelName = "test-datatype"
 
-    private val log = EELFManager.getInstance().getLogger(ModelTypeServiceTest::class.java)
+    private val log = LoggerFactory.getLogger(ModelTypeServiceTest::class.java)
 
     @Test
     @Commit
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ModelTypeControllerTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ModelTypeControllerTest.kt
index 610c9d033..4af8851a5 100644
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ModelTypeControllerTest.kt
+++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ModelTypeControllerTest.kt
@@ -16,7 +16,6 @@
 
 package org.onap.ccsdk.cds.controllerblueprints.service.controller
 
-import com.att.eelf.configuration.EELFManager
 import org.junit.Assert
 import org.junit.FixMethodOrder
 import org.junit.Test
@@ -26,6 +25,7 @@ import org.onap.ccsdk.cds.controllerblueprints.TestApplication
 import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
 import org.onap.ccsdk.cds.controllerblueprints.service.domain.ModelType
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
 import org.springframework.test.annotation.Commit
@@ -38,7 +38,7 @@ import org.springframework.test.context.junit4.SpringRunner
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 class ModelTypeControllerTest {
 
-    private val log = EELFManager.getInstance().getLogger(ModelTypeControllerTest::class.java)!!
+    private val log = LoggerFactory.getLogger(ModelTypeControllerTest::class.java)!!
 
     @Autowired
     internal var modelTypeController: ModelTypeController? = null