Merge pull request #8746 from swagger-api/lib-updates

update parser to 1.0.39-SNAPSHOT

Author: frantuma

modules/swagger-codegen/pom.xml

@@ -208,6 +208,11 @@
             <artifactId>swagger-models</artifactId>
             <version>${swagger-core-version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-parser</artifactId>
+            <version>${swagger-parser-version-v1}</version>
+        </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-core</artifactId>

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/service/GeneratorUtil.java

@@ -13,6 +13,8 @@
 import io.swagger.v3.core.util.Json;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Map;
@@ -21,6 +23,8 @@
 
 public class GeneratorUtil {
 
+    protected static final Logger LOGGER = LoggerFactory.getLogger(GeneratorUtil.class);
+
     public static io.swagger.codegen.ClientOptInput getClientOptInputV2(GenerationRequest generationRequest) {
         final Options options = generationRequest.getOptions();
         String inputSpec = null;
@@ -67,6 +71,7 @@ public static io.swagger.codegen.ClientOptInput getClientOptInputV2(GenerationRe
                     swagger = new SwaggerParser().read(node, true);
                 }
             } catch (Exception e) {
+                LOGGER.error("Exception parsing input spec", e);
                 throw new BadRequestException("The swagger specification supplied was not valid");
             }
         }

modules/swagger-generator/pom.xml

@@ -329,7 +329,6 @@
     <properties>
         <dockerfile.tag.skip>true</dockerfile.tag.skip>
         <docker-latest-tag>unstable</docker-latest-tag>
-        <swagger-parser-version-v1>1.0.38</swagger-parser-version-v1>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <jetty-version>9.4.11.v20180605</jetty-version>
         <inflector-version>2.0.0-rc2</inflector-version>

pom.xml

@@ -1017,6 +1017,7 @@
     </repositories>
     <properties>
         <swagger-parser-version>2.0.4</swagger-parser-version>
+        <swagger-parser-version-v1>1.0.39-SNAPSHOT</swagger-parser-version-v1>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
         <swagger-core-version>2.0.4</swagger-core-version>