From: Liam Fallon <liam.fallon@est.tech>
Date: Fri, 13 Dec 2019 11:55:41 +0000 (+0000)
Subject: Merge "Added some JDK 11 upgrades and point to oparent java 11 branch"
X-Git-Tag: 3.1.1~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7e686f3944a9618426fadc5fb952a4283375161c;hp=-c;p=policy%2Fparent.git

Merge "Added some JDK 11 upgrades and point to oparent java 11 branch"
---

7e686f3944a9618426fadc5fb952a4283375161c
diff --combined integration/pom.xml
index a43bcfe0,4ed21209..6d6a1318
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@@ -34,15 -34,13 +34,13 @@@
      <description>Policy Integration POM</description>
  
      <properties>
-         <java.version>1.8</java.version>
-         <maven.compiler.source>1.8</maven.compiler.source>
-         <maven.compiler.target>1.8</maven.compiler.target>
+         <java.version>11</java.version>
          <version.logback>1.2.3</version.logback>
          <version.dmaap>1.1.9</version.dmaap>
          <version.powermock>1.7.4</version.powermock>
-         <version.eclipselink>2.7.0</version.eclipselink>
+         <version.eclipselink>2.7.5</version.eclipselink>
          <version.jackson>2.10.0.pr3</version.jackson>
 -        <version.drools>7.28.0.Final</version.drools>
 +        <version.drools>7.30.0.Final</version.drools>
          <version.jersey>2.29.1</version.jersey>
          <version.ccsdk>0.4.4</version.ccsdk>
      </properties>
@@@ -580,8 -578,7 +578,7 @@@
                      <version>3.8.1</version>
                      <configuration>
                          <encoding>${project.build.sourceEncoding}</encoding>
-                         <source>${java.version}</source>
-                         <target>${java.version}</target>
+                         <release>${java.version}</release>
                      </configuration>
                  </plugin>
                  <plugin>