Merge branch '2.5'
Conflicts:
release-notes/VERSION
diff --git a/release-notes/VERSION b/release-notes/VERSION
index e61e0ac..f14833b 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -55,6 +55,9 @@
#795: Converter annotation not honored for abstract types
(reported by myrosia@github)
#797: `JsonNodeFactory` method `numberNode(long)` produces `IntNode` for small numbers
+#810: Force value coercion for `java.util.Properties`, so that values are `String`s
+#811: Add new option, `JsonInclude.Include.NON_ABSENT` (to support exclusion of
+ JDK8/Guava Optionals)
#812: Java 8 breaks Class-value annotation properties, wrt generics: need to work around
- Remove old cglib compatibility tests; cause problems in Eclipse
@@ -74,9 +77,7 @@
(reported by gracefulgopher@github)
#801: Using `@JsonCreator` cause generating invalid path reference in `JsonMappingException`
(contributed by Kamil B)
-#810: Force value coercion for `java.util.Properties`, so that values are `String`s
-#811: Add new option, `JsonInclude.Include.NON_ABSENT` (to support exclusion of
- JDK8/Guava Optionals)
+#815: Presence of PropertyNamingStrategy Makes Deserialization fail
- Fix handling of Enums wrt JSON Schema, when 'toString()' used for serialization
2.5.3 (24-Apr-2015)