Merge branch '2.18' into 2.19

cowtowncoder · cowtowncoder · commit 64c6b41e896a · 2024-10-18T17:59:18.000-07:00
diff --git a/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/parse/ParseInvalidUTF8String236Test.java b/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/parse/ParseInvalidUTF8String236Test.java
@@ -5,9 +5,6 @@
 import com.fasterxml.jackson.dataformat.cbor.CBORParser;
 import com.fasterxml.jackson.dataformat.cbor.CBORTestBase;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-
 public class ParseInvalidUTF8String236Test extends CBORTestBase
 {
     // [dataformats-binary#236]: Original version; broken UTF-8 all around.

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,6 @@`
`5`	`5`	`import com.fasterxml.jackson.dataformat.cbor.CBORParser;`
`6`	`6`	`import com.fasterxml.jackson.dataformat.cbor.CBORTestBase;`
`7`	`7`
`8`		`-import java.nio.charset.StandardCharsets;`
`9`		`-import java.util.Arrays;`
`10`		`-`
`11`	`8`	`public class ParseInvalidUTF8String236Test extends CBORTestBase`
`12`	`9`	`{`
`13`	`10`	`// [dataformats-binary#236]: Original version; broken UTF-8 all around.`