jackson version increased to 2.11.1

anatoliy · anatoliy · commit 558ac8b4a0ab · 2020-10-21T22:33:40.000+05:00
diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/config/jsonwriter/JacksonResourceSchemaProvider.java b/endpoints-framework/src/main/java/com/google/api/server/spi/config/jsonwriter/JacksonResourceSchemaProvider.java
@@ -126,7 +126,7 @@ private TypeToken<?> getPropertyType(TypeToken<?> beanType, Method readMethod, M
       }
     } else if (field != null) {
       return ApiAnnotationIntrospector.getSchemaType(
-          beanType.resolveType(field.getGenericType()), config);
+          beanType.resolveType(field.getAnnotated().getGenericType()), config);
     }
     return null;
   }
diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,12 @@
-version=2.0.7-CA.3
+version=2.0.7-CA.4
 sourceCompatibility=1.7
 targetCompatibility=1.7
 group=com.google.endpoints
 
 servletVersion=2.5
 javaxinjectVersion=1
 guavaVersion=19.0
-jacksonVersion=2.6.4
+jacksonVersion=2.11.1
 appengineVersion=1.9.49
 apiclientVersion=1.21.0
 findbugsVersion=3.0.1

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private TypeToken<?> getPropertyType(TypeToken<?> beanType, Method readMethod, M`
`126`	`126`	`}`
`127`	`127`	`} else if (field != null) {`
`128`	`128`	`return ApiAnnotationIntrospector.getSchemaType(`
`129`		`- beanType.resolveType(field.getGenericType()), config);`
	`129`	`+ beanType.resolveType(field.getAnnotated().getGenericType()), config);`
`130`	`130`	`}`
`131`	`131`	`return null;`
`132`	`132`	`}`