summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-06-29 21:50:11 +0000
committerGerrit Code Review <gerrit@onap.org>2020-06-29 21:50:11 +0000
commitff55b6ca2768b04b69b248ad02f3a2132e12c4d4 (patch)
tree5b9ddd46a588d8099b71de21f3e862157ea952f6
parent1793d0ca9245e2ff0253274dc2cdf35d7fdf89c2 (diff)
parent4db153845cb0671b86d77eca59d1472c454a4269 (diff)
Merge "feature-eelf: eelf-core from: 1.0.0 -> 2.0.0-oss"
-rw-r--r--feature-active-standby-management/pom.xml5
-rw-r--r--feature-eelf/pom.xml2
-rw-r--r--feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java4
3 files changed, 8 insertions, 3 deletions
diff --git a/feature-active-standby-management/pom.xml b/feature-active-standby-management/pom.xml
index 96bb3c0c..46d987cc 100644
--- 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 d736fb83..1e1fc6ce 100644
--- 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 dfa85948..10e2632a 100644
--- 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);