From 69135296d0c23ad73efb813e56da65cf309c5986 Mon Sep 17 00:00:00 2001
From: Rob Daugherty <rd472p@att.com>
Date: Tue, 11 Sep 2018 11:39:12 -0400
Subject: Use fasterxml jackson implementation in so/libs

NexusIQ issue: org.codehaus.jackson

This commit changes so/libs from the old codehaus jackson
implementation to the fasterxml implementation.

2.8.10 is the latest version compatible with the 1.5.13.RELEASE
springboot version used in SO.

Change-Id: I3b1167dd0efeb3463efb7e01fac26d0f312d7aad
Issue-ID: SO-864
Signed-off-by: Rob Daugherty <rd472p@att.com>
---
 .../src/main/java/com/woorea/openstack/keystone/model/Access.java   | 6 +++---
 .../java/com/woorea/openstack/keystone/model/Authentication.java    | 2 --
 .../src/main/java/com/woorea/openstack/keystone/model/Endpoint.java | 4 ++--
 .../main/java/com/woorea/openstack/keystone/model/Endpoints.java    | 2 +-
 .../src/main/java/com/woorea/openstack/keystone/model/Error.java    | 2 +-
 .../src/main/java/com/woorea/openstack/keystone/model/Role.java     | 2 +-
 .../src/main/java/com/woorea/openstack/keystone/model/Roles.java    | 2 +-
 .../src/main/java/com/woorea/openstack/keystone/model/Service.java  | 2 +-
 .../src/main/java/com/woorea/openstack/keystone/model/Services.java | 2 +-
 .../src/main/java/com/woorea/openstack/keystone/model/Tenant.java   | 4 ++--
 .../src/main/java/com/woorea/openstack/keystone/model/Tenants.java  | 2 +-
 .../src/main/java/com/woorea/openstack/keystone/model/User.java     | 3 +--
 .../src/main/java/com/woorea/openstack/keystone/model/Users.java    | 2 +-
 .../woorea/openstack/keystone/model/authentication/AccessKey.java   | 3 +--
 .../keystone/model/authentication/TokenAuthentication.java          | 3 +--
 .../openstack/keystone/model/authentication/UsernamePassword.java   | 3 +--
 16 files changed, 19 insertions(+), 25 deletions(-)

(limited to 'keystone-model/src/main/java/com/woorea/openstack/keystone/model')

diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java
index b55ef65..0ec9a1c 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java
@@ -20,9 +20,9 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("access")
 public class Access implements Serializable {
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java
index 1f1bf2f..6c6b536 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java
@@ -18,8 +18,6 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
-
 public abstract class Authentication implements Serializable {
 
     private String tenantId;
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java
index 019b3df..87c93ec 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("endpoint")
 public class Endpoint implements Serializable {
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java
index b4e4a16..68ed95c 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Endpoints implements Iterable<Endpoint>, Serializable {
 
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java
index ba49b11..2da9408 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("error")
 public class Error implements Serializable {
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java
index 7ae36de..8885d51 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("role")
 public class Role implements Serializable {
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java
index 79fe04c..bc9e6a5 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Roles implements Iterable<Role>, Serializable {
 
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java
index c5a1650..40cdfae 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("OS-KSADM:service")
 public class Service implements Serializable {
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java
index 99be776..a0ba675 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Services implements Iterable<Service>,  Serializable {
 
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java
index 840d507..a8a84fd 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("tenant")
 @JsonIgnoreProperties(ignoreUnknown=true)
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java
index c7958f3..7ebb1f5 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Tenants implements Iterable<Tenant>, Serializable {
 
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java
index 830d3fa..bd1652e 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java
@@ -22,8 +22,7 @@ package com.woorea.openstack.keystone.model;
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonRootName("user")
 public class User implements Serializable {
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java
index b3013bf..4f511c1 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Users implements Iterable<User>, Serializable {
 
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java
index bb308f0..99c776a 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java
@@ -16,8 +16,7 @@
 
 package com.woorea.openstack.keystone.model.authentication;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
-
+import com.fasterxml.jackson.annotation.JsonRootName;
 import com.woorea.openstack.keystone.model.Authentication;
 
 @JsonRootName("auth")
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java
index f47a94b..f730fc0 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java
@@ -16,8 +16,7 @@
 
 package com.woorea.openstack.keystone.model.authentication;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
-
+import com.fasterxml.jackson.annotation.JsonRootName;
 import com.woorea.openstack.keystone.model.Authentication;
 
 @JsonRootName("auth")
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java
index 5c94d31..1c07283 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java
@@ -16,8 +16,7 @@
 
 package com.woorea.openstack.keystone.model.authentication;
 
-import org.codehaus.jackson.map.annotate.JsonRootName;
-
+import com.fasterxml.jackson.annotation.JsonRootName;
 import com.woorea.openstack.keystone.model.Authentication;
 
 @JsonRootName("auth")
-- 
cgit 1.2.3-korg