Merge branch 'develop' into v2.7

Author: pjfanning

README.md

@@ -17,7 +17,7 @@ This is a fork of https://github.com/swagger-api/swagger-scala-module.
 To enable the swagger-scala-module, include the appropriate version in your project:
 
 ```
-  "com.github.swagger-akka-http" %% "swagger-scala-module" % "2.7.6"
+  "com.github.swagger-akka-http" %% "swagger-scala-module" % "2.7.8"
 ```
 
 ## How does it work?

project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.7.3

src/main/scala/com/github/swagger/scala/converter/SwaggerScalaModelConverter.scala

@@ -223,7 +223,7 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
               val requiredFlag = !isOptional && (!SwaggerScalaModelConverter.isRequiredBasedOnDefaultValue || !hasDefaultValue)
               if (!requiredFlag && Option(schema.getRequired).isDefined && schema.getRequired.contains(propertyName)) {
                 schema.getRequired.remove(propertyName)
-              } else if (requiredFlag) {
+              } else if (requiredFlag && schema.getEnum == null) {
                 addRequiredItem(schema, propertyName)
               }
             }