Fix some issues wrt databind changes

Author: cowtowncoder

avro/src/main/java/tools/jackson/dataformat/avro/schema/RecordVisitor.java

@@ -170,9 +170,7 @@ protected Schema.Field schemaFieldForWriter(BeanProperty prop, boolean optional)
                 if (prop instanceof BeanPropertyWriter) {
                     BeanPropertyWriter bpw = (BeanPropertyWriter) prop;
                     ser = bpw.getSerializer();
-                    /*
-                     * 2-Mar-2017, bryan: AvroEncode annotation expects to have the schema used directly
-                     */
+                    // 2-Mar-2017, bryan: AvroEncode annotation expects to have the schema used directly
                     optional = optional && !(ser instanceof CustomEncodingSerializer); // Don't modify schema
                 }
                 final SerializerProvider prov = getProvider();

cbor/src/test/java/tools/jackson/dataformat/cbor/gen/dos/CyclicCBORDataSerTest.java

@@ -4,7 +4,7 @@
 import java.util.List;
 
 import tools.jackson.core.StreamWriteConstraints;
-
+import tools.jackson.core.exc.StreamConstraintsException;
 import tools.jackson.databind.*;
 
 import tools.jackson.dataformat.cbor.CBORTestBase;
@@ -23,11 +23,11 @@ public void testListWithSelfReference() throws Exception {
         try {
             MAPPER.writeValueAsBytes(list);
             fail("expected DatabindException");
-        } catch (DatabindException jmex) {
+        } catch (StreamConstraintsException e) {
             String exceptionPrefix = String.format("Document nesting depth (%d) exceeds the maximum allowed",
                     StreamWriteConstraints.DEFAULT_MAX_DEPTH + 1);
             assertTrue("DatabindException message is as expected?",
-                    jmex.getMessage().startsWith(exceptionPrefix));
+                    e.getMessage().startsWith(exceptionPrefix));
         }
     }
 }

smile/src/test/java/tools/jackson/dataformat/smile/gen/dos/CyclicSmileDataSerTest.java

@@ -4,7 +4,7 @@
 import java.util.List;
 
 import tools.jackson.core.StreamWriteConstraints;
-
+import tools.jackson.core.exc.StreamConstraintsException;
 import tools.jackson.databind.*;
 
 import tools.jackson.dataformat.smile.BaseTestForSmile;
@@ -23,7 +23,7 @@ public void testListWithSelfReference() throws Exception {
         try {
             MAPPER.writeValueAsBytes(list);
             fail("expected JsonMappingException");
-        } catch (DatabindException e) {
+        } catch (StreamConstraintsException e) {
             String exceptionPrefix = String.format("Document nesting depth (%d) exceeds the maximum allowed",
                     StreamWriteConstraints.DEFAULT_MAX_DEPTH + 1);
             assertTrue("DatabindException message is as expected?",