Add `@JsonInclude.content` to allow defining inclusion criteria for Map entries, not just main Map value
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 0964c05..b8f4142 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -1,7 +1,4 @@
Project: jackson-annotations
-Version: 2.5.0 (xx-xxx-2014)
-
-No changes since 2.4
NOTE: Annotations module will never contain changes in patch versions,
only .0 releases can have changes. We may still release patch versions, but
@@ -9,9 +6,15 @@
(developers can line up all Jackson components with same patch version number)
------------------------------------------------------------------------
-=== History: ===
+=== Releases ===
------------------------------------------------------------------------
+2.5.0 (xx-xxx-2014)
+
+- Added `@JsonInclude.content` to allow specifying inclusion criteria
+ for `java.util.Map` entries separate from inclusion of `Map` values
+ themselves
+
2.4.0 (29-May-2014)
#31: Allow use of `@JsonPropertyOrder` for properties (not just classes)
diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonInclude.java b/src/main/java/com/fasterxml/jackson/annotation/JsonInclude.java
index 3d2db1e..1a1a4dd 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/JsonInclude.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/JsonInclude.java
@@ -22,10 +22,19 @@
public @interface JsonInclude
{
/**
- * Inclusion rule to use.
+ * Inclusion rule to use for instances (values) of types (Classes) or
+ * properties annotated.
*/
public Include value() default Include.ALWAYS;
-
+
+ /**
+ * Inclusion rule to use for entries ("content") of annotated
+ * {@link java.util.Map}s; defaults to {@link Include#ALWAYS}.
+ *
+ * @since 2.5
+ */
+ public Include content() default Include.ALWAYS;
+
/*
/**********************************************************
/* Value enumerations needed