Merge remote-tracking branch 'origin/master' into 5.2.x

modules/openapi-generator-cli/Dockerfile

@@ -1,6 +1,4 @@
-FROM java:8-jre-alpine
-
-RUN apk add --no-cache bash
+FROM openjdk:11.0-jre-buster
 
 ADD target/openapi-generator-cli.jar /opt/openapi-generator/modules/openapi-generator-cli/target/openapi-generator-cli.jar
 

modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java

@@ -134,7 +134,8 @@ public class Generate extends OpenApiGeneratorCommand {
             title = "type mappings",
             description = "sets mappings between OpenAPI spec types and generated code types "
                     + "in the format of OpenAPIType=generatedType,OpenAPIType=generatedType. For example: array=List,map=Map,string=String."
-                    + " You can also have multiple occurrences of this option.")
+                    + " You can also have multiple occurrences of this option."
+                    + " To map a specified format, use type+format, e.g. string+password=EncryptedString will map `type: string, format: password` to `EncryptedString`.")
     private List<String> typeMappings = new ArrayList<>();
 
     @Option(