From 754f9a02943058dc03337c9550e8f37fece14d25 Mon Sep 17 00:00:00 2001
From: HOCKLA <ah999m@att.com>
Date: Sat, 21 Dec 2019 12:11:33 -0600
Subject: policy/models jdk 11 upgrades

Issue-ID: POLICY-1592
Change-Id: Iaa6b61c5f1c76f3e7c2043691f4d29dbc43d144e
Signed-off-by: HOCKLA <ah999m@att.com>
---
 models-interactions/model-impl/aai/pom.xml                          | 1 -
 models-interactions/model-impl/cds/pom.xml                          | 1 -
 models-interactions/model-impl/rest/pom.xml                         | 2 +-
 models-interactions/model-impl/sdc/pom.xml                          | 2 +-
 models-interactions/model-impl/sdnc/pom.xml                         | 1 -
 models-interactions/model-impl/so/pom.xml                           | 2 +-
 models-interactions/model-impl/vfc/pom.xml                          | 3 +--
 .../src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java  | 6 ++++--
 models-interactions/model-yaml/pom.xml                              | 2 +-
 9 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'models-interactions')

diff --git a/models-interactions/model-impl/aai/pom.xml b/models-interactions/model-impl/aai/pom.xml
index 5f9d24a11..0548fd9d7 100644
--- a/models-interactions/model-impl/aai/pom.xml
+++ b/models-interactions/model-impl/aai/pom.xml
@@ -51,7 +51,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.13.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/models-interactions/model-impl/cds/pom.xml b/models-interactions/model-impl/cds/pom.xml
index 196cf4c61..cddc1fdbe 100644
--- a/models-interactions/model-impl/cds/pom.xml
+++ b/models-interactions/model-impl/cds/pom.xml
@@ -110,7 +110,6 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.13.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/models-interactions/model-impl/rest/pom.xml b/models-interactions/model-impl/rest/pom.xml
index 1570c2471..43d32957e 100644
--- a/models-interactions/model-impl/rest/pom.xml
+++ b/models-interactions/model-impl/rest/pom.xml
@@ -72,7 +72,7 @@
                             with minor changes -->
                             <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/models-interactions/model-impl/sdc/pom.xml b/models-interactions/model-impl/sdc/pom.xml
index d987da898..8f06aaae7 100644
--- a/models-interactions/model-impl/sdc/pom.xml
+++ b/models-interactions/model-impl/sdc/pom.xml
@@ -56,7 +56,7 @@
                             with minor changes -->
                             <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/models-interactions/model-impl/sdnc/pom.xml b/models-interactions/model-impl/sdnc/pom.xml
index 79d43099d..0d6c95ff3 100644
--- a/models-interactions/model-impl/sdnc/pom.xml
+++ b/models-interactions/model-impl/sdnc/pom.xml
@@ -38,7 +38,6 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.13.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/models-interactions/model-impl/so/pom.xml b/models-interactions/model-impl/so/pom.xml
index 47dcdfcd0..edb07c951 100644
--- a/models-interactions/model-impl/so/pom.xml
+++ b/models-interactions/model-impl/so/pom.xml
@@ -76,7 +76,7 @@
                             with minor changes -->
                             <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/models-interactions/model-impl/vfc/pom.xml b/models-interactions/model-impl/vfc/pom.xml
index 66812af3c..f04aabb71 100644
--- a/models-interactions/model-impl/vfc/pom.xml
+++ b/models-interactions/model-impl/vfc/pom.xml
@@ -38,7 +38,6 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.13.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -75,7 +74,7 @@
                             with minor changes -->
                             <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/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
index fec124782..1af0b767c 100644
--- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
+++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * simulators
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,8 @@
 
 package org.onap.policy.simulators;
 
-import com.att.aft.dme2.internal.gson.Gson;
+import com.google.gson.Gson;
+
 import java.util.UUID;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -34,6 +35,7 @@ import org.onap.policy.so.SoRequestReferences;
 import org.onap.policy.so.SoRequestStatus;
 import org.onap.policy.so.SoResponse;
 
+
 @Path("/serviceInstantiation")
 public class SoSimulatorJaxRs {
 
diff --git a/models-interactions/model-yaml/pom.xml b/models-interactions/model-yaml/pom.xml
index 2069038a0..7bd1fa497 100644
--- a/models-interactions/model-yaml/pom.xml
+++ b/models-interactions/model-yaml/pom.xml
@@ -104,7 +104,7 @@
                             with minor changes -->
                             <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>
-- 
cgit 1.2.3-korg