Manual merge of #2299 (start with 2.9 branch)

Author: cowtowncoder

pom.xml

@@ -36,7 +36,9 @@
 
     <!-- Can not use default, since group id != Java package name here -->
     <osgi.export>com.fasterxml.jackson.databind.*;version=${project.version}</osgi.export>
-    <!-- but imports should work fine with defaults -->
+    <osgi.import> <!-- fix for databind#2299: using jackson-databind in an OSGi environment under Android --> 
+        org.w3c.dom.bootstrap;resolution:=optional,
+    </osgi.import>
 
     <!-- Generate PackageVersion.java into this directory. -->
     <packageVersion.dir>com/fasterxml/jackson/databind/cfg</packageVersion.dir>

release-notes/CREDITS-2.x

@@ -833,3 +833,7 @@ Joffrey Bion (joffrey-bion@github)
   * Reported #2265: Inconsistent handling of Collections$UnmodifiableList vs 
     Collections$UnmodifiableRandomAccessList
    (2.9.9)
+
+Christoph ([email protected])
+  * Contributed #2299: Fix for using jackson-databind in an OSGi environment under Android
+   (2.9.9)

release-notes/VERSION-2.x

@@ -14,6 +14,8 @@ Project: jackson-databind
 #2251: Getter that returns an abstract collection breaks a delegating `@JsonCreator`
 #2265: Inconsistent handling of Collections$UnmodifiableList vs Collections$UnmodifiableRandomAccessList
  (reported by Joffrey B)
+#2299: Fix for using jackson-databind in an OSGi environment under Android
+ (contributed by Christoph F)
 - Prevent String coercion of `null` in `WritableObjectId` when calling `JsonGenerator.writeObjectId()`,
   mostly relevant for formats like YAML that have native Object Ids