Merge branch '2.4' into 2.5

Conflicts:
	pom.xml

Author: cowtowncoder

pom.xml

@@ -38,11 +38,11 @@ Guava (http://code.google.com/p/guava-libraries/) types (currently mostly just c
 ${project.groupId}.guava.*;version=${project.version}
       </osgi.export>
       <osgi.import>
-com.google.common.collect,
-com.google.common.base,
-com.google.common.cache,
-com.google.common.hash,
-com.google.common.net,
+com.google.common.collect;version="[15.0.0,20)",
+com.google.common.base;version="[15.0.0,20)",
+com.google.common.cache;version="[15.0.0,20)",
+com.google.common.hash;version="[15.0.0,20)",
+com.google.common.net;version="[15.0.0,20)",
 com.fasterxml.jackson.core,
 com.fasterxml.jackson.core.util,
 com.fasterxml.jackson.databind,

release-notes/VERSION

@@ -6,6 +6,11 @@ Project: jackson-datatype-guava
 
 2.6.0 (not yet released)
 
+2.5.5 (not yet released)
+
+#80: Relax OSGi version constraints for Guava dependency.
+ (requested by Benson M)
+
 2.5.4 (09-Jun-2015)
 
 - Add override for `MultimapSerializer.isEmpty(SerializerProvider, Multimap<?,?>)`
@@ -30,10 +35,6 @@ No changes since 2.5.0
 #56: Add support `HashCode`
  (contributed by Stephan S, Stephan202@github)
 
-2.4.7 (not released)
-
-#48: Avoid problems deserializing `null` for `Optional`
-
 2.4.6 (23-Apr-2015)
 
 #61: NPE serializing `Multimap`s with null values