diff options
| author |   HOCKLA <ah999m@att.com> | 2020-01-17 16:20:01 -0600 |
|---|---|---|
| committer | HOCKLA <ah999m@att.com> | 2020-01-20 10:34:32 -0600 |
| commit | e37f5a70bcf3fd8073418c13416cc79c0ef47d59 (patch) | |
| tree | 4c9c9e0c4c341b2311e4c24311aa9cbffd5dedf1 /LogParser | |
| parent | c8856ab39a6d8376e6ad700b6acabdc7736c714f (diff) | |
policy/engine jdk11 upgrades
Issue-ID: POLICY-1590
Change-Id: I4da8324a065ac9babe16368e69b76a4cbe9504ef
Signed-off-by: HOCKLA <ah999m@att.com>
Diffstat (limited to 'LogParser')
| -rw-r--r-- | LogParser/pom.xml | 4 | ||||
| -rw-r--r-- | LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/LogParser/pom.xml b/LogParser/pom.xml index b0281ba88..24ebb6d38 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018, 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. @@ -135,7 +135,7 @@ <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/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java b/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java index 313750eeb..6609778a0 100644 --- a/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java +++ b/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * LogParser * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2018, 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. @@ -47,11 +47,13 @@ import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; import org.onap.xacml.parser.LogEntryObject.LogType; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -@PrepareForTest({ ParseLogTest.class, IntegrityMonitor.class }) @RunWith(PowerMockRunner.class) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "jdk.internal.reflect.*", "javax.xml.*", "org.xml.*"}) +@PrepareForTest({ ParseLogTest.class, IntegrityMonitor.class }) public class ParseLogTest { private static Logger logger = FlexLogger.getLogger(ParseLogTest.class); |