Merge branch '2.15' into 2.16

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java

@@ -202,8 +202,8 @@ public void testCopyWith() throws Exception {
         assertEquals("Black", readResult.get("color").asText());
         assertEquals(true, readResult.get("free").asBoolean());
         assertEquals(204, readResult.get("pages").asInt());
-        String readResultAsString = "{\n  \"color\" : \"Black\",\n  \"free\" : \"true\",\n  \"pages\" : \"204.04\"\n}";
-        assertEquals(readResultAsString, mapper.writeValueAsString(readResult));
+        String readResultAsString = _unifyLFs("{\n  \"color\" : \"Black\",\n  \"free\" : \"true\",\n  \"pages\" : \"204.04\"\n}");
+        assertEquals(readResultAsString, _unifyLFs(mapper.writeValueAsString(readResult)));
 
         // validate properties
         Boolean mapperConfig1 = mapper._deserializationConfig.isEnabled(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES);
@@ -224,6 +224,10 @@ public void testCopyWith() throws Exception {
         );
     }
 
+    private String _unifyLFs(String doc) {
+        return doc.replaceAll("[\r\n]+", "\n");
+    }
+
     public void testFailedCopy() throws Exception
     {
         NoCopyMapper src = new NoCopyMapper();