feature-eelf: eelf-core from: 1.0.0 -> 2.0.0-oss

Issue-ID: POLICY-2387
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I29d4f07d990797a470bce0898ca67741974f1c00
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

diff --git a/feature-active-standby-management/pom.xml b/feature-active-standby-management/pom.xml
index 96bb3c0..46d987c 100644 (file)
--- a/feature-active-standby-management/pom.xml
+++ b/feature-active-standby-management/pom.xml
@@ -173,6 +173,11 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

diff --git a/feature-eelf/pom.xml b/feature-eelf/pom.xml
index d736fb8..1e1fc6c 100644 (file)
--- a/feature-eelf/pom.xml
+++ b/feature-eelf/pom.xml
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>com.att.eelf</groupId>
             <artifactId>eelf-core</artifactId>
-            <version>1.0.0</version>
+            <version>2.0.0-oss</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.common</groupId>

diff --git a/feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java b/feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java
index dfa8594..10e2632 100644 (file)
--- a/feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java
+++ b/feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java
@@ -114,7 +114,7 @@ public class EElfTest {
         assertTrue(loggers.contains(Configuration.ERROR_LOGGER_NAME));
         assertTrue(loggers.contains(Configuration.METRICS_LOGGER_NAME));
 
-        final EELFLogger eelfAuditLogger = EELFManager.getInstance().getAuditLogger();
+        final EELFLogger eelfAuditLogger = EELFManager.getAuditLogger();
         final Logger slf4jAuditLogger = org.slf4j.LoggerFactory.getLogger(Configuration.AUDIT_LOGGER_NAME);
         org.onap.policy.common.logging.flexlogger.Logger flexLogger =
                 FlexLogger.getLogger(EElfTest.class, true);
@@ -123,7 +123,7 @@ public class EElfTest {
 
         Exception testException = new IllegalStateException("exception test");
         flexLogger.error("flex-logger exception", testException);
-        EELFManager.getInstance().getErrorLogger().error("eelf-logger exception", testException);
+        EELFManager.getErrorLogger().error("eelf-logger exception", testException);
         org.slf4j.LoggerFactory.getLogger(Configuration.ERROR_LOGGER_NAME).error("slf4j-logger", testException);