From 4b7e270c5c749a97c5d33283b9c95f24acce1d29 Mon Sep 17 00:00:00 2001
From: HOCKLA <ah999m@att.com>
Date: Tue, 10 Dec 2019 09:54:48 -0600
Subject: Added some JDK 11 upgrades and point to oparent java 11 branch

Locally built with JDK 11

Issue-ID: POLICY-1594
Change-Id: I0fb2249c8f2057e1e69d3534083dba176310ae70
Signed-off-by: HOCKLA <ah999m@att.com>
---
 integration/pom.xml | 9 +++------
 pom.xml             | 8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/integration/pom.xml b/integration/pom.xml
index eeccf181..4ed21209 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -34,13 +34,11 @@
     <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.jersey>2.29.1</version.jersey>
@@ -580,8 +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>
diff --git a/pom.xml b/pom.xml
index 42eb180b..7ea3ef67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.1.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath />
     </parent>
     <groupId>org.onap.policy.parent</groupId>
@@ -31,7 +31,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <oparent.version>2.1.0</oparent.version>
+        <oparent.version>3.0.0-SNAPSHOT</oparent.version>
     </properties>
 
     <modules>
@@ -53,7 +53,7 @@
                 <plugin>
                     <groupId>net.revelc.code.formatter</groupId>
                     <artifactId>formatter-maven-plugin</artifactId>
-                    <version>2.8.1</version>
+                    <version>2.11.0</version>
                     <configuration>
                         <configFile>${project.parent.basedir}/onap-java-formatter.xml</configFile>
                     </configuration>
@@ -64,7 +64,7 @@
                 <plugin>
                     <groupId>com.diffplug.spotless</groupId>
                     <artifactId>spotless-maven-plugin</artifactId>
-                    <version>1.18.0</version>
+                    <version>1.26.1</version>
                     <configuration>
                         <java>
                             <importOrder>
-- 
cgit 1.2.3-korg