Merge branch '2.4'
Conflicts:
pom.xml
release-notes/VERSION
diff --git a/pom.xml b/pom.xml
index 2820d4b..e0ce08c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<description>Core annotations used for value types, used by Jackson data binding package.
</description>
- <url>http://wiki.fasterxml.com/JacksonHome</url>
+ <url>http://github.com/FasterXML/jackson</url>
<scm>
<connection>scm:git:git@github.com:FasterXML/jackson-annotations.git</connection>
<developerConnection>scm:git:git@github.com:FasterXML/jackson-annotations.git</developerConnection>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index b8f4142..905c556 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -3,18 +3,26 @@
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.
------------------------------------------------------------------------
=== Releases ===
------------------------------------------------------------------------
-2.5.0 (xx-xxx-2014)
+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
+
+No changes since 2.4.0.
+
2.4.0 (29-May-2014)
#31: Allow use of `@JsonPropertyOrder` for properties (not just classes)