Merge branch '2.4'
Conflicts:
pom.xml
release-notes/VERSION
diff --git a/pom.xml b/pom.xml
index dce8a18..e0ce08c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,13 @@
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-parent</artifactId>
- <version>2.4</version>
+ <version>2.5-SNAPSHOT</version>
</parent>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<name>Jackson-annotations</name>
- <version>2.4.4-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>Core annotations used for value types, used by Jackson data binding package.
</description>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 8672cf3..905c556 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -1,15 +1,23 @@
Project: jackson-annotations
-Version: 2.4.3 (02-Oct-2014)
NOTE: Annotations module will never contain changes in patch versions,
only .0 releases can have changes. We may still release patch versions, but
they will be identical to .0 versions, and only released for convenience
- (developers can line up all Jackson components with same patch version number)
+ (developers can line up all Jackson components with same patch version number).
+ Main components will typically depend on .0 versions: please do NOT file
+ issues against this being a bug; it is intentional.
------------------------------------------------------------------------
-=== History: ===
+=== Releases ===
------------------------------------------------------------------------
+2.5.0 (not yet released)
+
+- Added `@JsonInclude.content` to allow specifying inclusion criteria
+ for `java.util.Map` entries separate from inclusion of `Map` values
+ themselves
+
+2.4.3 (02-Oct-2014)
2.4.2 (13-Aug-2014)
2.4.1
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
diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java b/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java
index d931a46..9da5bea 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java
@@ -175,17 +175,18 @@
* Inclusion mechanism similar to <code>PROPERTY</code> with respect
* to deserialization; but one that is produced by a "regular" accessible
* property during serialization. This means that <code>TypeSerializer</code>
- * will do nothing, and expect a property with defined name to be output
+ * will do nothing, and expects a property with defined name to be output
* using some other mechanism (like default POJO property serialization, or
* custom serializer).
*<p>
- * Note that this behavior is quite similar to that of using {@link JsonTypeId};
+ * Note that this behavior is quite similar to that of using {@link JsonTypeId}
+ * annotation;
* except that here <code>TypeSerializer</code> is basically suppressed;
* whereas with {@link JsonTypeId}, output of regular property is suppressed.
* This mostly matters with respect to output order; this choice is the only
* way to ensure specific placement of type id during serialization.
*
- * @since 2.3.0
+ * @since 2.3.0 but databind <b>only since 2.5.0</b>.
*/
EXISTING_PROPERTY
;