Merge "policy/engine jdk11 upgrades"

diff --combined pom.xml
index 895e6af,8541ee2..442471a
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
      <parent>
          <groupId>org.onap.policy.parent</groupId>
          <artifactId>integration</artifactId>
-         <version>3.1.0</version>
+         <version>3.1.1-SNAPSHOT</version>
          <relativePath />
      </parent>
      <groupId>org.onap.policy.engine</groupId>
@@@ -35,8 -35,6 +35,6 @@@
      <description>The ONAP Policy Engine main pom</description>
      <properties>
          <!-- Project common build settings -->
-         <project.source.version>1.8</project.source.version>
-         <project.target.version>1.8</project.target.version>
          <project.encoding>UTF-8</project.encoding>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <!-- Project path properties -->
@@@ -46,8 -44,12 +44,8 @@@
          <snapshots.path>content/repositories/snapshots/</snapshots.path>
          <staging.path>content/repositories/staging/</staging.path>
  
 -        <!-- sonar/jacoco overrides -->
 -        <!-- Overriding oparent default sonar/jacoco settings Combine all our reports 
 -            into one file shared across sub-modules -->
 -        <sonar.jacoco.reportPath>${project.basedir}/../target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
 -        <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
 -        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 +        <!-- Default Sonar configuration -->
 +        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
  
          <!-- Project common dependency versions -->
          <springframework.version>4.3.24.RELEASE</springframework.version>
@@@ -56,8 -58,8 +54,8 @@@
          <commons.fileupload.version>1.3.3</commons.fileupload.version>
          <commons.compress.version>1.18</commons.compress.version>
          <elasticsearch.version>6.8.2</elasticsearch.version>
-         <version.policy.common>1.6.1</version.policy.common>
-         <version.policy.models>2.2.0</version.policy.models>
+         <version.policy.common>1.6.2-SNAPSHOT</version.policy.common>
+         <version.policy.models>2.2.1-SNAPSHOT</version.policy.models>
      </properties>
      <modules>
          <module>PolicyEngineUtils</module>
@@@ -109,7 -111,7 +107,7 @@@
              <!-- org.w3c.dom dependencies -->
              <groupId>xml-apis</groupId>
              <artifactId>xml-apis</artifactId>
-             <version>1.3.03</version>
+             <version>1.4.01</version>
          </dependency>
          <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
          <dependency>
@@@ -142,7 -144,7 +140,7 @@@
          <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
          <dependency>
              <groupId>org.powermock</groupId>
-             <artifactId>powermock-api-mockito</artifactId>
+             <artifactId>powermock-api-mockito2</artifactId>
              <scope>test</scope>
          </dependency>
          <dependency>
@@@ -159,7 -161,7 +157,7 @@@
          <dependency>
              <groupId>org.easymock</groupId>
              <artifactId>easymock</artifactId>
-             <version>3.1</version>
+             <version>4.1</version>
              <scope>test</scope>
          </dependency>
          <dependency>
@@@ -170,6 -172,32 +168,6 @@@
      </dependencies>
      <build>
          <plugins>
 -            <plugin>
 -                <groupId>org.jacoco</groupId>
 -                <artifactId>jacoco-maven-plugin</artifactId>
 -                <executions>
 -                    <execution>
 -                        <id>pre-unit-test</id>
 -                        <goals>
 -                            <goal>prepare-agent</goal>
 -                        </goals>
 -                        <configuration>
 -                            <destFile>${sonar.jacoco.reportPath}</destFile>
 -                            <append>true</append>
 -                        </configuration>
 -                    </execution>
 -                    <execution>
 -                        <id>post-unit-test</id>
 -                        <phase>test</phase>
 -                        <goals>
 -                            <goal>report</goal>
 -                        </goals>
 -                        <configuration>
 -                            <dataFile>${sonar.jacoco.reportPath}</dataFile>
 -                        </configuration>
 -                    </execution>
 -                </executions>
 -            </plugin>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-deploy-plugin</artifactId>
@@@ -191,8 -219,7 +189,7 @@@
                  <artifactId>maven-compiler-plugin</artifactId>
                  <configuration>
                      <encoding>${project.encoding}</encoding>
-                     <source>${project.source.version}</source>
-                     <target>${project.target.version}</target>
+                     <release>${java.version}</release>
                  </configuration>
              </plugin>
              <plugin>
@@@ -238,6 -265,46 +235,6 @@@
          </plugins>
          <pluginManagement>
              <plugins>
 -                <plugin>
 -                    <groupId>org.jacoco</groupId>
 -                    <artifactId>jacoco-maven-plugin</artifactId>
 -                    <version>${jacoco.version}</version>
 -                    <configuration>
 -                         <!-- Note: This exclusion list should match <sonar.exclusions> property 
 -                             above -->
 -                        <excludes>
 -                            <exclude>**/gen/**</exclude>
 -                            <exclude>**/generated-sources/**</exclude>
 -                            <exclude>**/yang-gen/**</exclude>
 -                            <exclude>**/pax/**</exclude>
 -                        </excludes>
 -                    </configuration>
 -                    <executions>
 -                        <!-- Prepares the property pointing to the JaCoCo runtime agent which 
 -                             is passed as VM argument when Maven the Surefire plugin is executed. -->
 -                        <execution>
 -                            <id>pre-unit-test</id>
 -                            <goals>
 -                                <goal>prepare-agent</goal>
 -                            </goals>
 -                            <configuration>
 -                                <destFile>${sonar.jacoco.reportPath}</destFile>
 -                            </configuration>
 -                        </execution>
 -                        <!-- Ensures that the code coverage report for unit tests is created 
 -                            after unit tests have been run. -->
 -                        <execution>
 -                            <id>post-unit-test</id>
 -                            <phase>test</phase>
 -                            <goals>
 -                                <goal>report</goal>
 -                            </goals>
 -                            <configuration>
 -                                <dataFile>${sonar.jacoco.reportPath}</dataFile>
 -                            </configuration>
 -                        </execution>
 -                    </executions>
 -                </plugin>
                  <plugin>
                      <groupId>org.eclipse.m2e</groupId>
                      <artifactId>lifecycle-mapping</artifactId>