summaryrefslogtreecommitdiffstats
path: root/glance-model/src/main/java/com
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-09-11 11:39:12 -0400
committerRob Daugherty <rd472p@att.com>2018-09-11 11:42:19 -0400
commit69135296d0c23ad73efb813e56da65cf309c5986 (patch)
treeb29823f2c0b978327d892e87c844dcd2d28acc72 /glance-model/src/main/java/com
parent7f05d1c3f153e89fa78c2bb97b950e42f6b30b38 (diff)
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>
Diffstat (limited to 'glance-model/src/main/java/com')
-rw-r--r--glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java7
-rw-r--r--glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java2
-rw-r--r--glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java4
-rw-r--r--glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java2
-rw-r--r--glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java4
5 files changed, 10 insertions, 9 deletions
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
index 59eb6eb..aa7be87 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
@@ -20,9 +20,10 @@ import java.io.Serializable;
import java.util.Calendar;
import java.util.HashMap;
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("image")
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java
index 5378139..8cecda9 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java
@@ -18,7 +18,7 @@ package com.woorea.openstack.glance.model;
import java.io.Serializable;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
public class ImageMember implements Serializable {
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java
index 21d6d57..fd977ed 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.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 ImageMembers implements Iterable<ImageMember>, Serializable {
@@ -39,4 +39,4 @@ public class ImageMembers implements Iterable<ImageMember>, Serializable {
return list.iterator();
}
-} \ No newline at end of file
+}
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java
index 191c889..b3b278c 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.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 Images implements Iterable<Image>, Serializable {
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java
index 412e724..6239a2b 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.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 SharedImages implements Iterable<SharedImage>, Serializable {
@@ -39,4 +39,4 @@ public class SharedImages implements Iterable<SharedImage>, Serializable {
return list.iterator();
}
-} \ No newline at end of file
+}