From 69135296d0c23ad73efb813e56da65cf309c5986 Mon Sep 17 00:00:00 2001 From: Rob Daugherty 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 --- .../com/woorea/openstack/heat/model/CreateStackParam.java | 3 ++- .../java/com/woorea/openstack/heat/model/Explanation.java | 6 +++--- .../src/main/java/com/woorea/openstack/heat/model/Link.java | 2 +- .../main/java/com/woorea/openstack/heat/model/Resource.java | 4 ++-- .../main/java/com/woorea/openstack/heat/model/Resources.java | 6 +++--- .../src/main/java/com/woorea/openstack/heat/model/Stack.java | 12 ++++++------ .../main/java/com/woorea/openstack/heat/model/Stacks.java | 4 ++-- .../com/woorea/openstack/heat/model/UpdateStackParam.java | 6 +++--- 8 files changed, 22 insertions(+), 21 deletions(-) (limited to 'heat-model/src/main/java/com/woorea/openstack/heat') diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java index 19808e3..09bb14c 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java @@ -21,7 +21,8 @@ package com.woorea.openstack.heat.model; */ import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonProperty; public class CreateStackParam { diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java index ed2395b..2b1628b 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java @@ -16,13 +16,13 @@ package com.woorea.openstack.heat.model; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; + /* * Modifications copyright (c) 2017 AT&T Intellectual Property */ -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; - // There is no Root element for the Explanation return //@JsonRootName("error") public class Explanation { diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java index a40ff7d..f70229e 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java @@ -16,7 +16,7 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Link { @JsonProperty("href") diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java index 977ba2f..df8ef01 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java @@ -16,11 +16,11 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.Date; import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Resource { @JsonProperty("resource_name") private String name; diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java index 93922f4..dd2b935 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java @@ -16,12 +16,12 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonProperty; - import java.io.Serializable; import java.util.Iterator; import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Resources implements Iterable, Serializable { @JsonProperty("resources") private List list; @@ -41,4 +41,4 @@ public class Resources implements Iterable, Serializable { "list=" + list + '}'; } -} \ No newline at end of file +} diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java index a07764b..340f3d1 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java @@ -20,12 +20,6 @@ package com.woorea.openstack.heat.model; * Modifications copyright (c) 2017 AT&T Intellectual Property */ -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.annotate.JsonRootName; - import java.io.IOException; import java.util.Date; import java.util.HashMap; @@ -33,6 +27,12 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; +import com.fasterxml.jackson.databind.ObjectMapper; + @JsonIgnoreProperties(ignoreUnknown = true) @JsonRootName("stack") public class Stack { diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java index 6c32a77..d4b11d6 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java @@ -16,12 +16,12 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonProperty; - import java.io.Serializable; import java.util.Iterator; import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Stacks implements Iterable, Serializable { @JsonProperty("stacks") private List list; diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/UpdateStackParam.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/UpdateStackParam.java index 5274d16..64e7e64 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/UpdateStackParam.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/UpdateStackParam.java @@ -17,7 +17,7 @@ /* * ============LICENSE_START========================================== * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,10 +39,10 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.Map; +import com.fasterxml.jackson.annotation.JsonProperty; + public class UpdateStackParam { @JsonProperty("template_url") private String templateUrl; -- cgit 1.2.3-korg