Merge branch '2.11' into 2.12

cowtowncoder · cowtowncoder · commit 3e31b92ee47b · 2020-05-16T10:43:14.000-07:00
diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/ArrayReadTest.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/ArrayReadTest.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 import com.fasterxml.jackson.dataformat.csv.*;
 
 // for [dataformat-csv#57]
@@ -119,6 +120,4 @@ public void testSeparatorOverrideMulti() throws Exception
         assertEquals(2, v[1]);
         assertEquals(3, v[2]);
     }
-
-
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import com.fasterxml.jackson.annotation.JsonCreator;`
`4`	`4`	`import com.fasterxml.jackson.annotation.JsonProperty;`
`5`	`5`	`import com.fasterxml.jackson.annotation.JsonPropertyOrder;`
	`6`	`+`
`6`	`7`	`import com.fasterxml.jackson.dataformat.csv.*;`
`7`	`8`
`8`	`9`	`// for [dataformat-csv#57]`
`@@ -119,6 +120,4 @@ public void testSeparatorOverrideMulti() throws Exception`
`119`	`120`	`assertEquals(2, v[1]);`
`120`	`121`	`assertEquals(3, v[2]);`
`121`	`122`	`}`
`122`		`-`
`123`		`-`
`124`	`123`	`}`