Merge branch '2.10'

cowtowncoder · cowtowncoder · commit 1bf2140b0d38 · 2018-06-26T14:15:44.000-07:00
diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonObjectMapper.java b/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonObjectMapper.java
@@ -40,11 +40,11 @@
  */
 public class IonObjectMapper extends ObjectMapper
 {    
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 3L;
 
     /**
      * Base implementation for "Vanilla" {@link ObjectMapper}, used with
-     * Avro backend.
+     * ION backend.
      *
      * @since 3.0
      */
diff --git a/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufMapper.java b/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufMapper.java
@@ -20,11 +20,11 @@
 
 public class ProtobufMapper extends ObjectMapper
 {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 3L;
 
     /**
      * Base implementation for "Vanilla" {@link ObjectMapper}, used with
-     * Avro backend.
+     * Protobuf backend.
      *
      * @since 3.0
      */

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@`
`40`	`40`	`*/`
`41`	`41`	`public class IonObjectMapper extends ObjectMapper`
`42`	`42`	`{`
`43`		`- private static final long serialVersionUID = 1L;`
	`43`	`+ private static final long serialVersionUID = 3L;`
`44`	`44`
`45`	`45`	`/**`
`46`	`46`	`* Base implementation for "Vanilla" {@link ObjectMapper}, used with`
`47`		`- * Avro backend.`
	`47`	`+ * ION backend.`
`48`	`48`	`*`
`49`	`49`	`* @since 3.0`
`50`	`50`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@`
`20`	`20`
`21`	`21`	`public class ProtobufMapper extends ObjectMapper`
`22`	`22`	`{`
`23`		`- private static final long serialVersionUID = 1L;`
	`23`	`+ private static final long serialVersionUID = 3L;`
`24`	`24`
`25`	`25`	`/**`
`26`	`26`	`* Base implementation for "Vanilla" {@link ObjectMapper}, used with`
`27`		`- * Avro backend.`
	`27`	`+ * Protobuf backend.`
`28`	`28`	`*`
`29`	`29`	`* @since 3.0`
`30`	`30`	`*/`