Merge branch 'master' into enum-underscore

Author: bkelley17

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>io.swagger.codegen.v3</groupId>
     <artifactId>swagger-codegen-generators</artifactId>
-    <version>1.0.26-SNAPSHOT</version>
+    <version>1.0.27-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
@@ -252,9 +252,9 @@
         </dependency>
     </dependencies>
     <properties>
-        <swagger-codegen-version>3.0.26-SNAPSHOT</swagger-codegen-version>
-        <swagger-parser-version>2.0.23</swagger-parser-version>
-        <swagger-core-version>2.1.4</swagger-core-version>
+        <swagger-codegen-version>3.0.27-SNAPSHOT</swagger-codegen-version>
+        <swagger-parser-version>2.0.26</swagger-parser-version>
+        <swagger-core-version>2.1.9</swagger-core-version>
         <jackson-version>2.11.4</jackson-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>

src/test/java/io/swagger/codegen/v3/generators/scala/AkkaHttpServerCodegenTest.java

@@ -259,7 +259,7 @@ public void testFileGeneration() throws IOException {
         Assert.assertTrue(new File(output, "src/main/scala/io/swagger/server/api/UserApi.scala").exists());
 
         Assert.assertTrue(new File(output, "src/main/scala/io/swagger/server/model/ApiResponse.scala").exists());
-        Assert.assertTrue(new File(output, "src/main/scala/io/swagger/server/model/Body.scala").exists());
+        Assert.assertTrue(new File(output, "src/main/scala/io/swagger/server/model/Pet_petId_body.scala").exists());
         Assert.assertTrue(new File(output, "src/main/scala/io/swagger/server/model/Category.scala").exists());
         Assert.assertTrue(new File(output, "src/main/scala/io/swagger/server/model/Order.scala").exists());
         Assert.assertTrue(new File(output, "src/main/scala/io/swagger/server/model/Pet.scala").exists());
@@ -269,4 +269,4 @@ public void testFileGeneration() throws IOException {
         Assert.assertTrue(new File(output, "src/main/scala/io/swagger/server/model/User.scala").exists());
         folder.delete();
     }
-}
+}