From 613946040a9e49bed487b5946f925bb6f22c5ee8 Mon Sep 17 00:00:00 2001 From: HOCKLA Date: Thu, 9 Jan 2020 11:48:49 -0600 Subject: policy/common jdk11 upgrades Issue-ID: POLICY-1583 Change-Id: I6bcd320a6cdedd84dad9b54fdb4fec0cb8443b44 Signed-off-by: HOCKLA --- common-logging/pom.xml | 10 ++++++++-- .../policy/common/logging/flexlogger/PropertyUtilTest.java | 8 ++++---- gson/pom.xml | 4 ++-- integrity-monitor/pom.xml | 4 ++-- policy-endpoints/pom.xml | 4 ++-- utils-test/pom.xml | 6 +++--- utils/pom.xml | 4 ++-- 7 files changed, 23 insertions(+), 17 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 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 test + + org.powermock + powermock-api-mockito + 1.7.4 + test + 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()); diff --git a/gson/pom.xml b/gson/pom.xml index 32fb598b..1ef8c9a7 100644 --- a/gson/pom.xml +++ b/gson/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - Common Modules ================================================================================ - Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2019 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -58,7 +58,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 test diff --git a/integrity-monitor/pom.xml b/integrity-monitor/pom.xml index 41223a8f..5d718053 100644 --- a/integrity-monitor/pom.xml +++ b/integrity-monitor/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. @@ -38,7 +38,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 test diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml index 26046f56..d70399cd 100644 --- a/policy-endpoints/pom.xml +++ b/policy-endpoints/pom.xml @@ -1,7 +1,7 @@