Merge branch '2.9' into 2.10

Author: cowtowncoder

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/TypeResolver.java

@@ -27,6 +27,10 @@ public class TypeResolver
      */
     private Map<String,MessageElement> _declaredMessageTypes;
 
+    /**
+     * Enum types visible at this level and deeper (nested enums with
+     * scoped names), not including enums declared at outer levels.
+     */
     private Map<String,ProtobufEnum> _enumTypes;
 
     /**
@@ -69,25 +73,25 @@ protected ProtobufMessage resolve(TypeResolver parent, MessageElement rawType)
     protected static TypeResolver construct(TypeResolver parent, String localName,
             Collection<TypeElement> nativeTypes)
     {
-        Map<String,MessageElement> nativeMessages = null;
-        Map<String,ProtobufEnum> enumTypes = new LinkedHashMap<>();
+        Map<String,MessageElement> declaredMsgs = null;
+        Map<String,ProtobufEnum> declaredEnums = new LinkedHashMap<>();
 
         for (TypeElement nt : nativeTypes) {
             if (nt instanceof MessageElement) {
-                if (nativeMessages == null) {
-                    nativeMessages = new LinkedHashMap<String,MessageElement>();
+                if (declaredMsgs == null) {
+                    declaredMsgs = new LinkedHashMap<String,MessageElement>();
                 }
-                nativeMessages.put(nt.name(), (MessageElement) nt);
+                declaredMsgs.put(nt.name(), (MessageElement) nt);
             } else if (nt instanceof EnumElement) {
                 final ProtobufEnum enumType = constructEnum((EnumElement) nt);
-                enumTypes.put(nt.name(), enumType);
+                declaredEnums.put(nt.name(), enumType);
                 // ... and don't forget parent scopes!
                 if (parent != null) {
                     parent.addEnumType(_scopedName(localName, nt.name()), enumType);
                 }
             } // no other known types?
         }
-        return new TypeResolver(parent, localName, nativeMessages, enumTypes);
+        return new TypeResolver(parent, localName, declaredMsgs, declaredEnums);
     }
 
     protected void addEnumType(String name, ProtobufEnum enumType) {

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

@@ -3,7 +3,6 @@
 import java.util.List;
 
 import com.fasterxml.jackson.dataformat.protobuf.ProtobufTestBase;
-import com.fasterxml.jackson.dataformat.protobuf.schema.*;
 
 public class ReadCyclicSchema140Test extends ProtobufTestBase
 {

release-notes/VERSION-2.x

@@ -13,7 +13,7 @@ Project: jackson-datatypes-binaryModules:
 #139: Incorrect decimal fraction representation
  (reported by wlukowicz@github)
 
-2.9.8 (not yet released)
+2.9.8 (15-Dec-2018)
 
 #140: (protobuf) Stack overflow when generating Protobuf schema  on class with
    cyclic type definition