Merge remote-tracking branch 'origin/2.0' into 2.0-OpenAPITools

Conflicts:
	modules/swagger-parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterTest.java

Author: jmini

modules/swagger-parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterTest.java

@@ -76,8 +76,8 @@ public class V2ConverterTest {
     private static final String ISSUE_672_JSON = "issue-672.json";
     private static final String ISSUE_673_YAML = "issue-673.yaml";
     private static final String ISSUE_676_JSON = "issue-676.json";
-    private static final String ISSUE_740_YAML = "issue-740.yaml";
     private static final String ISSUE_708_YAML = "issue-708.yaml";
+    private static final String ISSUE_740_YAML = "issue-740.yaml";
     private static final String ISSUE_755_YAML = "issue-755.yaml";
     private static final String ISSUE_756_JSON = "issue-756.json";
     private static final String ISSUE_758_JSON = "issue-758.json";

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java

@@ -106,10 +106,12 @@ public SwaggerParseResult deserialize(JsonNode rootNode) {
     public SwaggerParseResult deserialize(JsonNode rootNode, String path) {
         SwaggerParseResult result = new SwaggerParseResult();
         try {
+            
             ParseResult rootParse = new ParseResult();
             OpenAPI api = parseRoot(rootNode, rootParse, path);
             result.setOpenAPI(api);
             result.setMessages(rootParse.getMessages());
+
         } catch (Exception e) {
             result.setMessages(Arrays.asList(e.getMessage()));