refs #3554 - update jackson to 2.11.0

swagger-api · Jun 3, 2020 · b8092ab · b8092ab
1 parent 07f34c5
commit b8092ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/swagger-core/src/main/java/io/swagger/jackson/ModelResolver.java b/modules/swagger-core/src/main/java/io/swagger/jackson/ModelResolver.java
@@ -220,7 +220,7 @@ protected void _addEnumProps(Class<?> propClass, StringProperty property) {
             }
             property._enum(n);
         }
-        
+
         if (!useIndex && !useToString) {
             property._enum(Arrays.asList(_intr.findEnumValues(propClass, enumClass.getEnumConstants(), property.getEnum().toArray(new String[0]))));
         }
@@ -422,7 +422,7 @@ public Model resolve(JavaType type, ModelConverterContext context, Iterator<Mode
                     allowEmptyValue = null;
                 }
 
-                JavaType propType = member.getType(beanDesc.bindingsForBeanType());
+                JavaType propType = member.getType();
 
                 // allow override of name from annotation
                 if (mp != null && !mp.name().isEmpty()) {
@@ -755,7 +755,7 @@ protected Property processAsId(String propertyName, JavaType type,
                     final String name = def.getName();
                     if (name != null && name.equals(propertyName)) {
                         final AnnotatedMember propMember = def.getPrimaryMember();
-                        final JavaType propType = propMember.getType(beanDesc.bindingsForBeanType());
+                        final JavaType propType = propMember.getType();
                         if (PrimitiveType.fromType(propType) != null) {
                             return PrimitiveType.createProperty(propType);
                         } else {

diff --git a/pom.xml b/pom.xml
@@ -600,7 +600,7 @@
         <servlet-api-version>2.5</servlet-api-version>
         <jersey-version>1.13</jersey-version>
         <jersey2-version>2.25.1</jersey2-version>
-        <jackson-version>2.10.1</jackson-version>
+        <jackson-version>2.11.0</jackson-version>
         <logback-version>1.2.3</logback-version>
         <reflections-version>0.9.11</reflections-version>
         <guava-version>27.0.1-android</guava-version>