summaryrefslogtreecommitdiffstats
path: root/common-logging
diff options
context:
space:
mode:
authorHOCKLA <ah999m@att.com>2020-01-09 11:48:49 -0600
committerHOCKLA <ah999m@att.com>2020-01-09 11:49:03 -0600
commit613946040a9e49bed487b5946f925bb6f22c5ee8 (patch)
tree4e3af535237f7a51dc78a7942b7571648fe639f1 /common-logging
parent65689446fe2b8241b9304be476ac673f36c78ae4 (diff)
policy/common jdk11 upgrades
Issue-ID: POLICY-1583 Change-Id: I6bcd320a6cdedd84dad9b54fdb4fec0cb8443b44 Signed-off-by: HOCKLA <ah999m@att.com>
Diffstat (limited to 'common-logging')
-rw-r--r--common-logging/pom.xml10
-rw-r--r--common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java8
2 files changed, 12 insertions, 6 deletions
diff --git a/common-logging/pom.xml b/common-logging/pom.xml
index 9de62086..5e096c74 100644
--- a/common-logging/pom.xml
+++ b/common-logging/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
ONAP Policy Engine - Common Modules
================================================================================
- Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -62,9 +62,15 @@
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>1.7.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java b/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java
index 478f5570..bbf77179 100644
--- a/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java
+++ b/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-Logging
* ================================================================================
- * Copyright (C) 2018 Ericsson, AT&T. All rights reserved.
+ * Copyright (C) 2018-2020 Ericsson, AT&T. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ package org.onap.policy.common.logging.flexlogger;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -77,7 +77,7 @@ public class PropertyUtilTest {
Whitebox.setInternalState(PropertyUtil.LazyHolder.class, TIMER_FIELD, timer);
doAnswer(args -> {
- task = args.getArgumentAt(0, TimerTask.class);
+ task = args.getArgument(0, TimerTask.class);
return null;
}).when(timer).schedule(any(TimerTask.class), anyLong(), anyLong());