policy/drools-pdp jdk11 upgrades

Issue-ID: POLICY-1589
Change-Id: I0ed05c6e471a7da6658e02a4ba3115d3a117cedd
Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>

2 files changed, 123 insertions, 129 deletions

diff --git a/feature-mdc-filters/pom.xml b/feature-mdc-filters/pom.xml
index 89c09e3b..a6580d24 100755
--- a/feature-mdc-filters/pom.xml
+++ b/feature-mdc-filters/pom.xml
@@ -1,125 +1,119 @@
-<!--

-  ============LICENSE_START=======================================================

-  feature-mdc-filters

-  ================================================================================

-  Copyright (C) 2019 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.

-  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

-  ============LICENSE_END=========================================================

-  -->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <artifactId>drools-pdp</artifactId>

-        <groupId>org.onap.policy.drools-pdp</groupId>

-        <version>1.6.0-SNAPSHOT</version>

-    </parent>

-

-    <artifactId>feature-mdc-filters</artifactId>

-

-    <name>feature-mdc-filters</name>

-    <description>Loadable module that marks key fields in messages through logback mdc.</description>

-

-    <properties>

-        <maven.compiler.source>1.8</maven.compiler.source>

-        <maven.compiler.target>1.8</maven.compiler.target>

-    </properties>

-

-    <build>

-        <plugins>

-            <plugin>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>zipfile</id>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <phase>package</phase>

-                        <configuration>

-                            <attach>true</attach>

-                            <finalName>${project.artifactId}-${project.version}</finalName>

-                            <descriptors>

-                                <descriptor>src/assembly/assemble_zip.xml</descriptor>

-                            </descriptors>

-                            <appendAssemblyId>false</appendAssemblyId>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-dependency-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>copy-dependencies</id>

-                        <goals>

-                            <goal>copy-dependencies</goal>

-                        </goals>

-                        <phase>prepare-package</phase>

-                        <configuration>

-                            <outputDirectory>${project.build.directory}/assembly/lib</outputDirectory>

-                            <overWriteReleases>false</overWriteReleases>

-                            <overWriteSnapshots>true</overWriteSnapshots>

-                            <overWriteIfNewer>true</overWriteIfNewer>

-                            <useRepositoryLayout>false</useRepositoryLayout>

-                            <addParentPoms>false</addParentPoms>

-                            <copyPom>false</copyPom>

-                            <includeScope>runtime</includeScope>

-                            <excludeTransitive>true</excludeTransitive>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.onap.policy.common</groupId>

-            <artifactId>policy-endpoints</artifactId>

-            <version>${policy.common.version}</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.onap.policy.drools-pdp</groupId>

-            <artifactId>policy-management</artifactId>

-            <version>${project.version}</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.mockito</groupId>

-            <artifactId>mockito-core</artifactId>

-            <version>2.13.0</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.assertj</groupId>

-            <artifactId>assertj-core</artifactId>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

+<!--
+  ============LICENSE_START=======================================================
+  feature-mdc-filters
+  ================================================================================
+  Copyright (C) 2019-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.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>drools-pdp</artifactId>
+        <groupId>org.onap.policy.drools-pdp</groupId>
+        <version>1.6.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>feature-mdc-filters</artifactId>
+
+    <name>feature-mdc-filters</name>
+    <description>Loadable module that marks key fields in messages through logback mdc.</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>zipfile</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/assembly/lib</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>false</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                            <includeScope>runtime</includeScope>
+                            <excludeTransitive>true</excludeTransitive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>policy-endpoints</artifactId>
+            <version>${policy.common.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.policy.drools-pdp</groupId>
+            <artifactId>policy-management</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcTopicFilterTest.java b/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcTopicFilterTest.java
index 7fd65a29..e1a9b9b8 100755
--- a/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcTopicFilterTest.java
+++ b/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcTopicFilterTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * feature-mdc-filters
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-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.
@@ -310,7 +310,7 @@ public class MdcTopicFilterTest {
     }
 
     @Test
-    public void modifyFilterRuleMultiPathExceptionTest() {
+    public void testModifyFilterRuleMultiPathException() {
         MdcTopicFilter filter = new MdcTopicFilter("abc=$a.value");
         assertThatIllegalArgumentException()
                         .isThrownBy(() -> filter.modifyFilterRule("def", "abc", Arrays.asList("$.b", "$.c")))
@@ -562,7 +562,7 @@ public class MdcTopicFilterTest {
     }
 
     @Test
-    public void findAllNotFoundTest() {
+    public void testFindAllNotFound() {
         String message = "{\"requestID\":\"38adde30-cc22-11e8-a8d5-f2801f1b9fd1\",\"entity\":\"controller\","
                         + "\"controllers\":[{\"name\":\"test-controller\","
                         + "\"drools\":{\"groupId\":\"org.onap.policy.drools.test\","
@@ -593,7 +593,7 @@ public class MdcTopicFilterTest {
     }
 
     @Test
-    public void findNotFoundTest() {
+    public void testFindNotFound() {
         String message = "{\"requestID\":\"38adde30-cc22-11e8-a8d5-f2801f1b9fd1\",\"entity\":\"controller\","
                 + "\"controllers\":[{\"name\":\"test-controller\","
                 + "\"drools\":{\"groupId\":\"org.onap.policy.drools.test\","