diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2020-01-16 16:29:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-01-16 16:29:24 +0000 |
| commit | 1d488ba498750235f26a957a7cd31ce12a1d3518 (patch) | |
| tree | b80955e5aa338f881efb967e71744b78c2c4922b /controlloop/common/eventmanager | |
| parent | 676c3bb86a2424f70543e7fbaae388e7f9f370dd (diff) | |
| parent | 25d3e43f27fb4d055af69c6934f3531fef115a02 (diff) | |
Merge "policy/drools-apps jdk11 upgrades"
Diffstat (limited to 'controlloop/common/eventmanager')
| -rw-r--r-- | controlloop/common/eventmanager/pom.xml | 6 | ||||
| -rw-r--r-- | controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/utils/ControlLoopUtilsTest.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml index a020e5e5d..a04264958 100644 --- a/controlloop/common/eventmanager/pom.xml +++ b/controlloop/common/eventmanager/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= eventmanager ================================================================================ - Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2019 Nordix Foundation. Modifications Copyright (C) 2019 Bell Canada. ================================================================================ @@ -155,7 +155,7 @@ </dependency> <dependency> <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> + <artifactId>powermock-api-mockito2</artifactId> <scope>test</scope> </dependency> <dependency> @@ -238,7 +238,7 @@ with minor changes --> <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories> <includeResources>true</includeResources> <includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestResources>true</includeTestResources> diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/utils/ControlLoopUtilsTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/utils/ControlLoopUtilsTest.java index ad83b7730..2c26517cd 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/utils/ControlLoopUtilsTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/utils/ControlLoopUtilsTest.java @@ -33,7 +33,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; public class ControlLoopUtilsTest { @Test - public void toControlLoopParams() throws Exception { + public void testToControlLoopParams() throws Exception { String policy = new String(Files.readAllBytes(Paths.get("src/test/resources/tosca-policy-operational-restart.json"))); |