Merge branch '2.12'

Author: cowtowncoder

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/AvroIgnoreTest.java

@@ -11,7 +11,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class AvroIgnoreTest extends InteropTestBase
 {

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/GeneratorInvalidCallsTest.java

@@ -3,7 +3,6 @@
 import java.io.ByteArrayOutputStream;
 
 import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.dataformat.cbor.CBORGenerator;
 
 public class GeneratorInvalidCallsTest extends CBORTestBase
 {

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/DataBindReadTest.java

@@ -19,7 +19,6 @@
 import org.junit.Test;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.dataformat.ion.IonObjectMapper;
 
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonStruct;
@@ -38,9 +37,7 @@ static class MyBean {
         public byte[] blob;
     }
 
-    static class BeanToo {
-        
-    }
+    static class BeanToo { }
 
     @Test
     public void testSimple() throws IOException

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/DataBindRoundtripTest.java

@@ -31,10 +31,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.ion.EnumAsIonSymbolSerializer;
-import com.fasterxml.jackson.dataformat.ion.IonSymbolSerializer;
-import com.fasterxml.jackson.dataformat.ion.IonObjectMapper;
 
 import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonSystem;

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonGeneratorTest.java

@@ -22,8 +22,6 @@
 import org.junit.Before;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.dataformat.ion.IonGenerator;
-import com.fasterxml.jackson.dataformat.ion.IonObjectMapper;
 
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonValue;
@@ -32,7 +30,7 @@
 import com.amazon.ion.system.IonSystemBuilder;
 
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class IonGeneratorTest {
     private static final Map<String, String> testObject;

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonTimestampRoundTripTest.java

@@ -21,10 +21,10 @@
 import org.junit.Test;
 
 import com.fasterxml.jackson.core.JsonGenerationException;
+
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.dataformat.ion.IonObjectMapper;
 
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonLoader;

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/SimpleWriteTest.java

@@ -22,8 +22,6 @@
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.ObjectWriteContext;
-import com.fasterxml.jackson.dataformat.ion.IonFactory;
-import com.fasterxml.jackson.dataformat.ion.IonGenerator;
 
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonLoader;

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/NestedWrite67Test.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.dataformat.protobuf.ProtobufMapper;
+
 import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
 
 public class NestedWrite67Test extends ProtobufTestBase

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/RoundtripNestedMessageTest.java

@@ -7,7 +7,6 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 
-import com.fasterxml.jackson.dataformat.protobuf.ProtobufMapper;
 import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
 import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchemaLoader;
 

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/schema/SchemGenForSelfRef140Test.java

@@ -1,7 +1,6 @@
 package com.fasterxml.jackson.dataformat.protobuf.schema;
 
 import com.fasterxml.jackson.dataformat.protobuf.*;
-import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
 
 // for [dataformats-binary#140]
 public class SchemGenForSelfRef140Test extends ProtobufTestBase