Merge branch 'master' into snakeyaml-engine

# Conflicts:
#	yaml/pom.xml
#	yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLGenerator.java

Author: asomov

release-notes/CREDITS-2.x

@@ -21,3 +21,19 @@ Fabrice Delhoste (spifd@github)
 * Reported #74 (properties): `JavaPropsMapper` issue deserializing multiple byte array properties
  (2.9.5)
 
+Thomas Hauk (thauk-copperleaf@github)
+
+* Contibuted #84 (yaml): Add option to allow use of platform-linefeed
+  (`YAMLGenerator.Feature.USE_PLATFORM_LINE_BREAKS`)
+ (2.9.6)
+
+Yegor Borovikov (yborovikov@gitub)
+
+* Reported #81 (yaml): Jackson 2.9.5, 2.9.6 incompatible with snakeyaml 1.20, 1.21
+ (2.9.7)
+
+Andrey Somov (asomov@github)
+
+* Contributed #101: Use latest SnakeYAML version 1.23 and get rid of deprecated methods
+ (2.10.0)
+

release-notes/VERSION-2.x

@@ -8,6 +8,22 @@ Modules:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.10.0 (not yet released)
+
+#101: Use latest SnakeYAML version 1.23 and get rid of deprecated methods
+ (contributed by Andrey S)
+
+2.9.7 (not yet released)
+
+#81: Jackson 2.9.5, 2.9.6 incompatible with snakeyaml 1.20, 1.21
+ (reported by Yegor B)
+
+2.9.6 (12-Jun-2018)
+
+#84 (yaml): Add option to allow use of platform-linefeed
+  (`YAMLGenerator.Feature.USE_PLATFORM_LINE_BREAKS`)
+ (contributed by Thomas H)
+
 2.9.5 (26-Mar-2018)
 
 #74 (properties): `JavaPropsMapper` issue deserializing multiple byte array properties

yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLGenerator.java

@@ -105,13 +105,22 @@ public enum Feature implements FormatFeature
          */
         LITERAL_BLOCK_STYLE(false),
 
+        /**
+         * Option passed to SnakeYAML that determines if the line breaks used for
+         * serialization should be same as what the default is for current platform.
+         * If disabled, Unix linefeed ({@code \n}) will be used.
+         * <p>
+         * Default value is `false` for backwards compatibility.
+         */
+        USE_PLATFORM_LINE_BREAKS(false),
+
         /**
          * Feature enabling of which adds indentation for array entry generation
          * (default indentation being 2 spaces).
          *<p>
          * Default value is `false` for backwards compatibility
          */
-        INDENT_ARRAYS(false)
+        INDENT_ARRAYS(false),
         ;
 
         protected final boolean _defaultState;
@@ -146,9 +155,9 @@ private Feature(boolean defaultState) {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Internal constants
-    /**********************************************************
+    /**********************************************************************
      */
 
     protected final static long MIN_INT_AS_LONG = (long) Integer.MIN_VALUE;
@@ -157,9 +166,9 @@ private Feature(boolean defaultState) {
     protected final static String TAG_BINARY = Tag.BINARY.toString();
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Configuration
-    /**********************************************************
+    /**********************************************************************
      */
 
     final protected IOContext _ioContext;
@@ -192,9 +201,9 @@ private Feature(boolean defaultState) {
     private final static ScalarStyle STYLE_PLAIN = ScalarStyle.PLAIN;
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Output state
-    /**********************************************************
+    /**********************************************************************
      */
 
     protected Emitter _emitter;
@@ -212,9 +221,9 @@ private Feature(boolean defaultState) {
     protected String _typeId;
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Life-cycle
-    /**********************************************************
+    /**********************************************************************
      */
 
     public YAMLGenerator(ObjectWriteContext writeContext, IOContext ioCtxt,
@@ -265,13 +274,17 @@ protected DumpSettings buildDumperOptions(int jsonFeatures, int yamlFeatures,
             opt.setIndicatorIndent(1);
             opt.setIndent(2);
         }
+        // 14-May-2018: [dataformats-text#84] allow use of platform linefeed
+        if (Feature.USE_PLATFORM_LINE_BREAKS.enabledIn(_formatFeatures)) {
+            opt.setLineBreak(DumperOptions.LineBreak.getPlatformLineBreak());
+        }
         return opt;
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Versioned
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -280,9 +293,9 @@ public Version version() {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Overridden methods, configuration
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -333,9 +346,9 @@ public boolean canUseSchema(FormatSchema schema) {
     //@Override public void setSchema(FormatSchema schema)
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Extended API, configuration
-    /**********************************************************
+    /**********************************************************************
      */
 
     public YAMLGenerator enable(Feature f) {
@@ -409,9 +422,9 @@ private final void _writeFieldName(String name)
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Public API: low-level I/O
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -432,9 +445,9 @@ public void close() throws IOException
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Public API: structural output
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -493,9 +506,9 @@ public final void writeEndObject() throws IOException
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Output method implementations, textual
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -555,9 +568,9 @@ public final void writeUTF8String(byte[] text, int offset, int len)
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Output method implementations, unprocessed ("raw")
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -596,9 +609,9 @@ public void writeRawValue(char[] text, int offset, int len) throws IOException {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Output method implementations, base64-encoded binary
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -616,9 +629,9 @@ public void writeBinary(Base64Variant b64variant, byte[] data, int offset, int l
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Output method implementations, scalars
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -704,9 +717,9 @@ public void writeNull() throws IOException
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Public API, write methods, Native Ids
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -749,9 +762,9 @@ public void writeObjectId(Object id)
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Implementations for methods from base class
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -770,9 +783,9 @@ protected void _releaseBuffers() {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Internal methods
-    /**********************************************************
+    /**********************************************************************
      */
 
     // Implicit means that (type) tags won't be shown, right?