Merge branch '2.x' into 3.x

Author: cowtowncoder

src/test/java/tools/jackson/databind/ser/enums/EnumAsFormatObject4564Test.java

@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.json.JsonMapper;
@@ -16,9 +17,9 @@
 // [databind#4564] Fix Enum-asJSON-Object serialization with self as field.
 public class EnumAsFormatObject4564Test
 {
-
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     @JsonInclude(JsonInclude.Include.NON_NULL)
+    @JsonPropertyOrder({"label", "sublevel"})
     public enum Level {
         LEVEL1("level1"),
         LEVEL2("level2"),