fix response

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,10 +11,10 @@ assignees: ''
 
 - [ ] Have you provided a full/minimal spec to reproduce the issue?
 - [ ] Have you validated the input using an OpenAPI validator ([example](https://apidevtools.org/swagger-parser/online/))?
-- [ ] Have you [tested with the latest master](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) to confirm the issue still exists?
-- [ ] Have you searched for related issues/PRs?
+- [ ] What's the version of OpenAPI Generator used?
+- [ ] Have you search for related issues/PRs?
 - [ ] What's the actual output vs expected output?
-- [ ] [Optional] Sponsorship to speed up the bug fix or feature request ([example](https://github.com/OpenAPITools/openapi-generator/issues/6178))
+- [ ] [Optional] Bounty to sponsor the fix ([example](https://www.bountysource.com/issues/66123212-javascript-client-produces-a-wrong-object-for-a-string-enum-type-that-is-used-with-ref))
 
 <!--
 Please follow the issue template below for bug reports.
@@ -45,13 +45,9 @@ please create a Gist (https://gist.github.com) or upload it somewhere else and
 link it here.
   -->
 
-##### Generation Details
+##### Command line used for generation
 
-<!-- 
-    Prefer CLI steps, including the language, libraries and various options. 
-    Providing config-based settings allows for simpler testing across CLI and plugins. 
-    For examples, see https://github.com/OpenAPITools/openapi-generator/tree/master/bin/configs
--->
+<!-- including the language, libraries and various options -->
 
 ##### Steps to reproduce
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,10 +2,9 @@
 
 <!-- Please check the completed items below -->
 ### PR checklist
- 
+
 - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md).
-- [ ] Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
 - [ ] If contributing template-only or documentation-only changes which will change sample output, [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) beforehand.
-- [ ] Run the shell script `./bin/generate-samples.sh`to update all Petstore samples related to your fix. This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. For Windows users, please run the script in [Git BASH](https://gitforwindows.org/).
+- [ ] Run the shell script `./bin/generate-samples.sh`to update all Petstore samples related to your fix. This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/config/java*`. For Windows users, please run the script in [Git BASH](https://gitforwindows.org/).
 - [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`
 - [ ] Copy the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language.

.github/workflows/check-supported-versions.yaml

@@ -1,94 +0,0 @@
-name: Check Supported Java Versions
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    name: 'Build: JDK ${{ matrix.java }} (${{ matrix.os }})'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        java: [8, 11]
-        os: [ubuntu-latest]
-        include:
-          - java: 8
-            os: windows-latest
-          - java: 13
-            os: ubuntu-latest
-            # Need to update to Gradle version with v13 support in modules/openapi-generator-gradle-plugin/pom.xml
-            flags: -am -pl modules/openapi-generator-cli
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
-        with:
-          java-version: ${{ matrix.java }}
-
-      - uses: actions/cache@v1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('modules/openapi-generator-gradle-plugin/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - name: Build with Maven
-        shell: bash
-        run: mvn -nsu -B --quiet -Djacoco.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress clean install --file pom.xml ${{ matrix.flags }}
-
-      - name: Upload Maven build artifact
-        uses: actions/upload-artifact@v1
-        if: matrix.java == '8' && matrix.os == 'ubuntu-latest'
-        with:
-          name: artifact
-          path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
-
-      - name: Test Gradle plugin usage
-        shell: bash
-        run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace
-
-      - name: Test Maven plugin integration
-        if: matrix.java == '8'
-        shell: bash
-        run: |
-          cd modules/openapi-generator-maven-plugin
-          mvn verify -Pintegration
-
-  verify:
-    name: Verify outputs on ${{ matrix.os }}
-    needs: build
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-#         include:
-#           - os: windows-latest
-#             flags: --skip-docs
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Download build artifact
-        uses: actions/download-artifact@v1
-        with:
-          name: artifact
-      - name: Run Ensures Script
-        shell: bash
-        run: |
-          git config --global core.fileMode false
-          git config --global core.safecrlf false
-          git config --global core.autocrlf true
-          mkdir -p modules/openapi-generator-cli/target/
-          mv artifact/openapi-generator-cli.jar modules/openapi-generator-cli/target/
-          ./bin/utils/ensure-up-to-date ${{ matrix.flags }}

.github/workflows/docker-tag-latest-release.yml

@@ -1,75 +0,0 @@
-name: Docker Tag latest-release
-
-# Run every couple of days
-on:
-  schedule:
-  - cron: "30 12 */2 * *"
-
-jobs:
-  # This pulls all containers for the last known release tag, and tags as latest-release or x-latest-release for shared repo
-  tagLatestRelease:
-    runs-on: ubuntu-latest
-
-    steps:
-
-    # Pull the code so we have git metadata
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    # This action will "unshallow" so we have all tag info
-    - name: Get latest tag
-      id: tagger
-      uses: jimschubert/query-tag-action@v1
-      with:
-        include: 'v*'
-        exclude: '*-rc*'
-        commit-ish: 'HEAD~'
-
-    - name: DockerHub Login
-      run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-    
-    # Tags openapitools/openapi-generator-cli
-    - name: "Tag openapi-generator-cli:x"
-      id: tag-openapi-generator-cli
-      if: always()
-      run: |
-        echo 'Tagging as latest-release: ${{steps.tagger.outputs.tag}}'
-        docker pull openapitools/openapi-generator-cli:${{steps.tagger.outputs.tag}}
-        docker tag openapitools/openapi-generator-cli:${{steps.tagger.outputs.tag}} openapitools/openapi-generator-cli:latest-release
-        docker push openapitools/openapi-generator-cli:latest-release
-    
-    # Tags openapitools/openapi-generator-online
-    - name: "Tag openapi-generator-online:x"
-      id: tag-openapi-generator-online
-      if: always()
-      run: |
-        echo 'Tagging as latest-release: ${{steps.tagger.outputs.tag}}'
-        docker pull openapitools/openapi-generator-online:${{steps.tagger.outputs.tag}}
-        docker tag openapitools/openapi-generator-online:${{steps.tagger.outputs.tag}} openapitools/openapi-generator-online:latest-release
-        docker push openapitools/openapi-generator-online:latest-release
-
-    # Tags openapitools/openapi-generator's CLI image (this repo holds CLI + Online via tag prefix)
-    - name: "Tag openapi-generator:cli-x"
-      id: tag-cli
-      if: always()
-      run: |
-        echo 'Tagging as latest-release: ${{steps.tagger.outputs.tag}}'
-        docker pull openapitools/openapi-generator:cli-${{steps.tagger.outputs.tag}}
-        docker tag openapitools/openapi-generator:cli-${{steps.tagger.outputs.tag}} openapitools/openapi-generator:cli-latest-release
-        docker push openapitools/openapi-generator:cli-latest-release
-
-    # Tags openapitools/openapi-generator's ONLINE image (this repo holds CLI + Online via tag prefix)
-    - name: "Tag openapi-generator:online-x"
-      id: tag-online
-      if: always()
-      run: |
-        echo 'Tagging as latest-release: ${{steps.tagger.outputs.tag}}'
-        docker pull openapitools/openapi-generator:online-${{steps.tagger.outputs.tag}}
-        docker tag openapitools/openapi-generator:online-${{steps.tagger.outputs.tag}} openapitools/openapi-generator:online-latest-release
-        docker push openapitools/openapi-generator:online-latest-release
-
-    # Clean up docker credentials/configs/etc.
-    - name: Cleanup
-      if: always()
-      run: |
-        rm -f ${HOME}/.docker/config.json

.github/workflows/sonar.yml

@@ -4,7 +4,6 @@ on:
     branches:
     - master
     - '[4-9]+.[0-9]+.x'
-    - sonar
 
 jobs:
   build:
@@ -13,13 +12,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up JDK 11
+    - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 1.8
     - name: Compile with Maven
-      run: mvn -B -q clean install jacoco:report
+      run: mvn clean package jacoco:report
     - name: Jacoco Aggregate
       run: mvn jacoco:report-aggregate
     - name: Publish to Sonar
-      run: mvn -B -q -nsu sonar:sonar -Dsonar.projectKey=OpenAPITools_openapi-generator -Dsonar.organization=openapitools -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Dsonar.branch.name=${GITHUB_REF##*/}
+      run: mvn -B -q sonar:sonar -Dsonar.projectKey=OpenAPITools_openapi-generator -Dsonar.organization=openapitools -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Dsonar.branch.name=${GITHUB_REF##*/}

.gitignore

@@ -173,21 +173,10 @@ samples/client/petstore/python-asyncio/.venv/
 samples/client/petstore/python-asyncio/.pytest_cache/
 samples/client/petstore/python-tornado/.venv/
 
-# PHP
-samples/client/petstore/php/OpenAPIClient-php/composer.lock
-samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/composer.lock
-samples/openapi3/server/petstore/php-ze-ph/composer.lock
-samples/server/petstore/php-laravel/lib/composer.lock
-samples/server/petstore/php-lumen/lib/composer.lock
-samples/server/petstore/php-slim4/composer.lock
-samples/server/petstore/php-symfony/SymfonyBundle-php/composer.lock
-samples/server/petstore/php-ze-ph/composer.lock
-
 # ts
 samples/client/petstore/typescript-angular2/npm/npm-debug.log
 samples/client/petstore/typescript-node/npm/npm-debug.log
 samples/client/petstore/typescript-angular/tsd-debug.log
-samples/client/petstore/typescript-axios/tests/**/dist/
 samples/client/petstore/typescript-fetch/tests/**/dist/
 
 # aspnetcore
@@ -241,8 +230,7 @@ samples/client/petstore/dart/petstore/test/packages
 **/.dart_tool
 
 # JS
-samples/client/petstore/javascript-es6/package-lock.json
-samples/client/petstore/javascript-promise-es6/package-lock.json
+samples/client/petstore/javascript/package-lock.json
 
 # elm
 samples/client/petstore/elm/index.html

.hub.cli.dockerfile

@@ -3,7 +3,10 @@
 ##
 ## You can build _just_ this part with:
 ##     docker --target builder -t container-name:builder -f .hub.cli.dockerfile .
-FROM maven:3.6.3-jdk-11-openj9 as builder
+FROM jimschubert/8-jdk-alpine-mvn:1.0 as builder
+
+RUN set -x && \
+    apk add --no-cache bash
 
 ENV GEN_DIR /opt/openapi-generator
 WORKDIR ${GEN_DIR}
@@ -15,10 +18,11 @@ RUN mvn -am -pl "modules/openapi-generator-cli" package
 ## The final (release) image
 ## The resulting container here only needs the target jar
 ## and ca-certificates (to be able to query HTTPS hosted specs)
-FROM openjdk:11.0.8-jre-slim-buster
+FROM openjdk:8-jre-alpine
 
 ENV GEN_DIR /opt/openapi-generator
 
+RUN apk --no-cache add ca-certificates bash
 RUN mkdir -p ${GEN_DIR}/modules/openapi-generator-cli/target
 
 WORKDIR ${GEN_DIR}/modules/openapi-generator-cli/target

.hub.online.dockerfile

@@ -3,7 +3,10 @@
 ##
 ## You can build _just_ this part with:
 ##     docker --target builder -t container-name:builder -f .hub.online.dockerfile .
-FROM maven:3.6.3-jdk-11-openj9 as builder
+FROM jimschubert/8-jdk-alpine-mvn:1.0 as builder
+
+RUN set -x && \
+    apk add --no-cache bash
 
 ENV GEN_DIR /opt/openapi-generator
 WORKDIR ${GEN_DIR}
@@ -14,7 +17,7 @@ RUN mvn -am -pl "modules/openapi-generator-online" package
 
 ## The final (release) image
 ## The resulting container here only needs the target jar
-FROM openjdk:11.0.8-jre-slim-buster
+FROM openjdk:8-jre-alpine
 
 ENV GEN_DIR /opt/openapi-generator
 ENV TARGET_DIR /generator

.travis.yml

@@ -21,10 +21,6 @@ cache:
   - $HOME/samples/client/petstore/php/OpenAPIToolsClient-php/vendor
   - $HOME/samples/client/petstore/ruby/vendor/bundle
   - $HOME/samples/client/petstore/python/.venv/
-  - $HOME/samples/openapi3/client/petstore/typescript/tests/default/node_modules
-  - $HOME/samples/openapi3/client/petstore/typescript/tests/jquery/node_modules
-  - $HOME/samples/openapi3/client/petstore/typescript/tests/object_params/node_modules
-  - $HOME/samples/openapi3/client/petstore/typescript/tests/inversify/node_modules
   - $HOME/samples/client/petstore/typescript-node/npm/node_modules
   - $HOME/samples/client/petstore/typescript-node/npm/typings/
   - $HOME/samples/client/petstore/typescript-fetch/tests/default/node_modules
@@ -45,7 +41,6 @@ cache:
   - $HOME/.npm  
   - $HOME/.rvm/gems/ruby-2.4.1
   - $HOME/website/node_modules/
-  - $HOME/.cache/deno
 
 services:
   - docker
@@ -77,13 +72,11 @@ before_install:
   - docker pull swaggerapi/petstore
   - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
   - docker ps -a
-  # -- skip bash test to shorten build time
   # Add bats test framework and cURL for Bash script integration tests
-  #- sudo add-apt-repository ppa:duggan/bats --yes
-  #- sudo apt-get update -qq
-  #- sudo apt-get install -qq bats
-  #- sudo apt-get install -qq curl
-  # -- skip bash test end
+  - sudo add-apt-repository ppa:duggan/bats --yes
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq bats
+  - sudo apt-get install -qq curl
   # install dart
   #- sudo apt-get update
   #- sudo apt-get install apt-transport-https
@@ -92,9 +85,11 @@ before_install:
   #- sudo apt-get update
   #- sudo apt-get install dart
   # switch to php7
-  - phpenv versions
-  - phpenv global 7.2.15
+  - phpenv global 7.1
   - php -v
+  # install perl module
+  #- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
+  #- cpanm Test::Exception Test::More Log::Any LWP::UserAgent JSON URI:Query Module::Runtime DateTime Module::Find Moose::Role
   # comment out below as installation failed in travis
   # Add rebar3 build tool and recent Erlang/OTP for Erlang petstore server tests.
   # - Travis CI does not support rebar3 [yet](https://github.com/travis-ci/travis-ci/issues/6506#issuecomment-275189490).
@@ -106,11 +101,9 @@ before_install:
   # install Qt5
   - sudo apt install -y --no-install-recommends qt5-default 
   - cmake --version
-  # -- skip perl test to shorten build time
   # perl dep
-  #- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
-  #- cpanm --quiet --no-interactive Test::Exception Test::More Log::Any LWP::UserAgent URI::Query Module::Runtime DateTime Module::Find Moose::Role JSON || echo "Igorned failure from cpanm"
-  # -- skip perl test end
+  - cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
+  - cpanm --quiet --no-interactive Test::Exception Test::More Log::Any LWP::UserAgent URI::Query Module::Runtime DateTime Module::Find Moose::Role JSON || echo "Igorned failure from cpanm"
   # show host table to confirm petstore.swagger.io is mapped to localhost
   - cat /etc/hosts
   # show java version
@@ -121,9 +114,6 @@ before_install:
       gpg --check-trustdb ;
     fi;
   - pushd .; cd website; yarn install; popd
-  # install Deno
-  - curl -fsSL https://deno.land/x/install/install.sh | sh -s v1.1.2
-  - export PATH="$HOME/.deno/bin:$PATH"
 
 install:
   # Add Godeps dependencies to GOPATH and PATH
@@ -148,8 +138,16 @@ script:
   - /bin/bash ./bin/utils/detect_tab_in_java_class.sh
   # run integration tests defined in maven pom.xml
   # WARN: Travis will timeout after 10 minutes of no stdout/stderr activity, which is problematic with mvn --quiet.
-  - mvn -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-  - mvn -e --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - mvn --no-snapshot-updates --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - mvn --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  # test maven plugin
+  - mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  # test gradle plugin
+  - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk)
+  - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
 after_success:
   # push to maven repo
   - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

CI/.drone.yml

@@ -2,15 +2,6 @@ kind: pipeline
 name: default
 
 steps:
-# test protobuf schema generator
-- name: protobuf-schema-test
-  image: nanoservice/protobuf-go
-  commands:
-  - protoc --version
-  - mkdir /var/tmp/go/
-  - cd samples/config/petstore/protobuf-schema
-  - protoc --go_out=/var/tmp/go/ services/*
-  - protoc --go_out=/var/tmp/go/ models/*
 # test aspnetcore 3.x
 - name: aspnetcore-test
   image: mcr.microsoft.com/dotnet/core/sdk:3.1
@@ -37,7 +28,7 @@ steps:
 - name: java11-test
   image: openjdk:11.0
   commands:
-  - ./mvnw --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - ./mvnw -quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
   - ./mvnw --quiet verify -Psamples.droneio -Dorg.slf4j.simpleLogger.defaultLogLevel=error
   # test java native client
   - ./mvnw clean test -f samples/client/petstore/java/native/pom.xml

CI/bitrise.yml

@@ -14,14 +14,14 @@ workflows:
     - brew-install@0.10.2:
         inputs:
         - packages: maven
-    - script@1.1.6:
+    - script@1.1.5:
         title: Install Cocoapods
         inputs:
         - content: |
             #!/usr/bin/env bash
 
             sudo gem install cocoapods
-    - script@1.1.6:
+    - script@1.1.5:
         inputs:
         - content: |
             #!/usr/bin/env bash
@@ -30,7 +30,7 @@ workflows:
 
             mvn --no-snapshot-updates package -Dorg.slf4j.simpleLogger.defaultLogLevel=error
         title: Build openapi-generator
-    - script@1.1.6:
+    - script@1.1.5:
         title: Update Swift samples
         inputs:
         - content: |
@@ -38,8 +38,8 @@ workflows:
 
             set -e
 
-            bin/generate-samples.sh ./bin/configs/other/swift5-*
-    - script@1.1.6:
+            sh bin/generate-samples.sh bin/configs/swift5-*.yaml
+    - script@1.1.5:
         title: Run Swift5 tests
         inputs:
         - content: |
@@ -48,4 +48,14 @@ workflows:
             set -e
 
             ./samples/client/test/swift5/swift5_test_all.sh
+# comment out the following as it's causing timeout
+#    - script@1.1.5:
+#        title: Run all bin scripts
+#        inputs:
+#        - content: |-
+#            #!/usr/bin/env bash
+#
+#            set -e
+#
+#            ./bin/run-all-petstore
 

CI/circle_parallel.sh

@@ -17,11 +17,15 @@ trap cleanup EXIT
 if [ "$NODE_INDEX" = "1" ]; then
   echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..."
   java -version
+  # Install golang version 1.14
+  go version
+  sudo mkdir /usr/local/go1.14
+  wget -c https://dl.google.com/go/go1.14.linux-amd64.tar.gz -O - | sudo tar -xz -C /usr/local/go1.14
+  export PATH="/usr/local/go1.14/go/bin:$PATH"
+  go version
 
   mvn --no-snapshot-updates --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-
-  echo "show ivy2 cache"
-  ls -l /home/circleci/.ivy2/cache
+  mvn --no-snapshot-updates --quiet javadoc:javadoc -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 
 elif [ "$NODE_INDEX" = "2" ]; then
   # run ensure-up-to-date sample script on SNAPSHOT version only
@@ -36,6 +40,7 @@ elif [ "$NODE_INDEX" = "2" ]; then
     # look for outdated samples
     ./bin/utils/ensure-up-to-date
   fi
+#elif [ "$NODE_INDEX" = "3" ]; then
   echo "Running node $NODE_INDEX to test haskell"
   # install haskell
   curl -sSL https://get.haskellstack.org/ | sh
@@ -55,17 +60,10 @@ elif [ "$NODE_INDEX" = "2" ]; then
   # run integration tests
   mvn --no-snapshot-updates --quiet verify -Psamples.misc -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 else
-  echo "Running node $NODE_INDEX to test 'samples.circleci.others' defined in pom.xml ..."
-  #sudo update-java-alternatives -s java-1.7.0-openjdk-amd64
+  echo "Running node $NODE_INDEX to test 'samples.circleci.jdk7' defined in pom.xml ..."
+  sudo update-java-alternatives -s java-1.7.0-openjdk-amd64
   java -version
 
-  # Install golang version 1.14
-  go version
-  sudo mkdir /usr/local/go1.14
-  wget -c https://dl.google.com/go/go1.14.linux-amd64.tar.gz -O - | sudo tar -xz -C /usr/local/go1.14
-  export PATH="/usr/local/go1.14/go/bin:$PATH"
-  go version
-
   # install dart2
   sudo apt-get update
   sudo apt-get install apt-transport-https
@@ -75,8 +73,7 @@ else
   sudo apt-get install dart
   export PATH="$PATH:/usr/lib/dart/bin"
 
-  mvn --no-snapshot-updates --quiet verify -Psamples.circleci.others -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-  mvn --no-snapshot-updates --quiet javadoc:javadoc -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  mvn --no-snapshot-updates --quiet verify -Psamples.circleci.jdk7 -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 fi
 
 

CONTRIBUTING.md

@@ -4,7 +4,7 @@
 
  - If you're not using the latest master to generate API clients or server stubs, please give it another try by pulling the latest master as the issue may have already been addressed. Ref: [Getting Started](https://github.com/openapitools/openapi-generator#getting-started)
  - Search the [open issue](https://github.com/openapitools/openapi-generator/issues) and [closed issue](https://github.com/openapitools/openapi-generator/issues?q=is%3Aissue+is%3Aclosed) to ensure no one else has reported something similar before.
- - File an [issue ticket](https://github.com/openapitools/openapi-generator/issues/new) by providing all the required information. Failure to provide enough detail may result in slow response from the community.
+ - File an [issue ticket](https://github.com/openapitools/openapi-generator/issues/new) by providing all the required information.
  - Test with the latest master by building the JAR locally to see if the issue has already been addressed.
  - You can also make a suggestion or ask a question by opening an "issue".
 
@@ -85,14 +85,11 @@ For [Vendor Extensions](https://github.com/OAI/OpenAPI-Specification/blob/master
 To add test cases (optional) covering the change in the code generator, please refer to [modules/openapi-generator/src/test/java/org/openapitools/codegen](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/test/java/org/openapitools/codegen)
 
 To test the templates, please perform the following:
-
-- Update the Petstore sample by running the shell scripts under the `bin` folder. For example, run `./bin/generate-samples.sh .
-/bin/configs/python*` to update the Python-related samples under [`samples`](https://github.com/openapitools/openapi-generator/tree/master/samples). For Windows, please install [GIT bash](https://gitforwindows.org/). (If you find that there are new files generated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI spec from time to time. If you've questions or concerns, please open a ticket to start a discussion)
-- During development it can be helpful to quickly regenerate the samples without recompiling all of openapi-generator, e.g. when you have only updated the mustache templates. This can be done by passing the `-t` parameter: `-t modules/openapi-generator/src/main/resources/python`.
-- Run the tests in the sample folder using maven `mvn integration-test -f /path/to/pom.xml`, e.g. `mvn integration-test -f samples/client/petstore/python/pom.xml`. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests)
+- Update the Petstore sample by running the shell scripts under `bin` folder. For example, run `./bin/generate-samples.sh ./bin/configs/python*` to update the Python PetStore samples under [`samples/`](https://github.com/openapitools/openapi-generator/tree/master/samples/). For Windows users, please install [Git BASH](https://gitforwindows.org/) in order to run the scripts.
+- Run the tests in the sample folder using maven `mvn integration-test -rf :<artifactId>`, e.g. open a shell in `samples/client/petstore/python`, run `mvn integration-test -rf :PythonPetstoreClientTests`. The artifactId of the project can be found in the pom.xml file. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests)
 - Finally, git commit the updated samples files: `git commit -a`
   (`git add -A` if added files with new test cases)
-- For new test cases, please add to the [Fake Petstore spec](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml)
+- For new test cases, please add to the [Fake Petstore spec](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml)
 
 To start the CI tests, you can:
 - Run `mvn verify -Psamples`, assuming you have all the required tools installed to run tests for different languages.
@@ -107,8 +104,7 @@ See [OpenAPI Tools wiki](https://github.com/OpenAPITools/openapi-generator/wiki/
 - Add test case(s) to cover the change
 - Document the fix in the code to make the code more readable
 - Make sure test cases passed after the change (one way is to leverage https://travis-ci.org/ to run the CI tests)
-- File a PR with meaningful title, description and commit messages
-- Make sure the option "Allow edits from maintainers" in the PR is selected so that the maintainers can update your PRs with minor fixes, if needed.
+- File a PR with meaningful title, description and commit messages.
 - Recommended git settings
    - `git config core.autocrlf input` to tell Git convert CRLF to LF on commit but not the other way around 
 - To close an issue (e.g. issue 1542) automatically after a PR is merged, use keywords "fix", "close", "resolve" in the PR description, e.g. `fix #1542`. (Ref: [closing issues using keywords](https://help.github.com/articles/closing-issues-using-keywords/))

Dockerfile

@@ -1,4 +1,7 @@
-FROM maven:3.6.3-jdk-11-openj9
+FROM jimschubert/8-jdk-alpine-mvn:1.0
+
+RUN set -x && \
+    apk add --no-cache bash
 
 ENV GEN_DIR /opt/openapi-generator
 WORKDIR ${GEN_DIR}
@@ -26,6 +29,6 @@ RUN mvn -am -pl "modules/openapi-generator-cli" package
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s /usr/local/bin/docker-entrypoint.sh /usr/local/bin/openapi-generator
 
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+ENTRYPOINT ["docker-entrypoint.sh"]
 
 CMD ["help"]

README.md

@@ -1,22 +1,21 @@
 <h1 align="center">OpenAPI Generator</h1>
 
-
 <div align="center">
 
-[![Stable releaases in Maven Central](https://img.shields.io/maven-metadata/v/https/repo1.maven.org/maven2/org/openapitools/openapi-generator/maven-metadata.xml.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.openapitools%22%20AND%20a%3A%22openapi-generator%22) [![Apache 2.0 License](https://img.shields.io/badge/License-Apache%202.0-orange)](./LICENSE) ![Open Collective backers](https://img.shields.io/opencollective/backers/openapi_generator?color=orange&label=OpenCollective%20Backers) [![Join the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/enQtNzAyNDMyOTU0OTE1LTY5ZDBiNDI5NzI5ZjQ1Y2E5OWVjMjZkYzY1ZGM2MWQ4YWFjMzcyNDY5MGI4NjQxNDBiMTlmZTc5NjY2ZTQ5MGM) [![Follow OpenAPI Generator Twitter account to get the latest update](https://img.shields.io/twitter/follow/oas_generator.svg?style=social&label=Follow)](https://twitter.com/oas_generator)
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`5.0.0`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
+[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
+[![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
+[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
+[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/master)](https://cloud.drone.io/OpenAPITools/openapi-generator)
+[![iOS Build Status](https://app.bitrise.io/app/4a2b10a819d12b67/status.svg?token=859FMDR8QHwabCzwvZK6vQ&branch=master)](https://app.bitrise.io/app/4a2b10a819d12b67)
 
 </div>
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`5.0.0`):
-[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
-[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
-[![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
-[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
-[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/master)](https://cloud.drone.io/OpenAPITools/openapi-generator)
-[![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/master?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67)
-[![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/openapitools/openapi-generator/Check%20Supported%20Java%20Versions/master?label=Check%20Supported%20Java%20Versions&logo=github&logoColor=green)](https://github.com/OpenAPITools/openapi-generator/actions?query=workflow%3A%22Check+Supported+Java+Versions%22)
+[![Jion the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/enQtNzAyNDMyOTU0OTE1LTY5ZDBiNDI5NzI5ZjQ1Y2E5OWVjMjZkYzY1ZGM2MWQ4YWFjMzcyNDY5MGI4NjQxNDBiMTlmZTc5NjY2ZTQ5MGM)
+[![Stable releaases in the Maven store](https://img.shields.io/maven-metadata/v/https/repo1.maven.org/maven2/org/openapitools/openapi-generator/maven-metadata.xml.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.openapitools%22%20AND%20a%3A%22openapi-generator%22)
+[![Follow OpenAPI Generator Twitter account to get the latest update](https://img.shields.io/twitter/follow/oas_generator.svg?style=social&label=Follow)](https://twitter.com/oas_generator)
 
 </div>
 
@@ -46,7 +45,6 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [![LightBow](https://openapi-generator.tech/img/companies/lightbow.png)](https://www.lightbow.net/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/docspring.png" width="128" height="128">](https://docspring.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/datadog.png" width="128" height="128">](https://datadoghq.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/thales.jpg" width="128" height="128">](https://cpl.thalesgroup.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 
 #### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS and Checkly for sponsoring the API monitoring
 
@@ -60,7 +58,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
 
 |                                  | Languages/Frameworks                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 | -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.0, .NET Core 2.0), **C++** (cpp-restsdk, Qt5, Tizen), **Clojure**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client), **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (rust, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 8.x), Aurelia, Axios, Fetch, Inversify, jQuery, Node, Rxjs) |
+| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.0, .NET Core 2.0), **C++** (cpp-restsdk, Qt5, Tizen), **Clojure**, **Dart (1.x, 2.x)**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client), **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (rust, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 8.x), Aurelia, Axios, Fetch, Inversify, jQuery, Node, Rxjs) |
 | **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, Slim, Silex, [Symfony](https://symfony.com/), [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                         |
 | **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
@@ -78,7 +76,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
     - [1.4 - Build Projects](#14---build-projects)
     - [1.5 - Homebrew](#15---homebrew)
     - [1.6 - Docker](#16---docker)
-    - [1.7 - NPM](#17---npm)
+    - [1.7 - NPM](#17---npm)    
   - [2 - Getting Started](#2---getting-started)
   - [3 - Usage](#3---usage)
     - [3.1 - Customization](#31---customization)
@@ -102,10 +100,7 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 5.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/) | TBD   | Major release with breaking changes (no fallback) |
-| 5.0.0-beta3 (upcoming beta release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/) | 01.11.2020 | Major beta release with breaking changes (no fallback) |
-| [5.0.0-beta2](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0-beta2) (latest beta release) | 04.09.2020   | Major beta release with breaking changes (no fallback) |
-| [5.0.0-beta](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0-beta) (latest beta release) | 30.06.2020   | Major beta release with breaking changes (no fallback) |
+| 5.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/) | 17.06.2020   | Major release with breaking changes (no fallback) |
 | [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1) (latest stable release)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |
 
 OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0
@@ -162,16 +157,16 @@ See the different versions of the [openapi-generator-cli](https://mvnrepository.
 <!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
 
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta2/openapi-generator-cli-5.0.0-beta2.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta2/openapi-generator-cli-5.0.0-beta2.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar -O openapi-generator-cli.jar
 ```
 
 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 ```
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta2/openapi-generator-cli-5.0.0-beta2.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -255,14 +250,13 @@ To install, run `brew install openapi-generator`
 
 Here is an example usage to generate a Ruby client:
 ```sh
-openapi-generator generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g ruby -o /tmp/test/
+openapi-generator generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g ruby -o /tmp/test/
 ```
 
 To reinstall with the latest master, run `brew uninstall openapi-generator && brew install --HEAD openapi-generator`
 
 To install OpenJDK (pre-requisites), please run
 ```sh
-brew tap AdoptOpenJDK/openjdk
 brew cask install adoptopenjdk12
 export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-12.0.2.jdk/Contents/Home/
 ```
@@ -290,7 +284,7 @@ Example:
 
 ```sh
 docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli generate \
-    -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+    -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
     -g go \
     -o /local/out/go
 ```
@@ -315,12 +309,12 @@ GEN_IP=$(docker inspect --format '{{.NetworkSettings.IPAddress}}'  $CID)
 
 # Execute an HTTP request to generate a Ruby client
 > curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' \
--d '{"openAPIUrl": "https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"}' \
+-d '{"openAPIUrl": "https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml"}' \
 'http://localhost:8888/api/gen/clients/ruby'
 
 {"code":"c2d483.3.4672-40e9-91df-b9ffd18d22b8","link":"http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8"}
 
-# Download the generated zip file
+# Download the generated zip file  
 > wget http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8
 
 # Unzip the file
@@ -351,8 +345,8 @@ Once built, `run-in-docker.sh` will act as an executable for openapi-generator-c
 ./run-in-docker.sh help # Executes 'help' command for openapi-generator-cli
 ./run-in-docker.sh list # Executes 'list' command for openapi-generator-cli
 ./run-in-docker.sh /gen/bin/go-petstore.sh  # Builds the Go client
-./run-in-docker.sh generate -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
-    -g go -o /gen/out/go-petstore --package-name=petstore # generates go client, outputs locally to ./out/go-petstore
+./run-in-docker.sh generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
+    -g go -o /gen/out/go-petstore -DpackageName=petstore # generates go client, outputs locally to ./out/go-petstore
 ```
 
 ##### Troubleshooting
@@ -389,14 +383,14 @@ Install it globally to get the CLI available on the command line:
 
 ```sh
 npm install @openapitools/openapi-generator-cli -g
-openapi-generator-cli version
+openapi-generator version
 ```
 
 <!-- RELEASE_VERSION -->
-To use a specific version of "openapi-generator-cli"
+Or install a particular OpenAPI Generator version (e.g. v4.3.1):
 
 ```sh
-openapi-generator-cli version-manager set 4.3.1
+npm install @openapitools/openapi-generator-cli@cli-4.3.1 -g
 ```
 
 Or install it as dev-dependency:
@@ -407,20 +401,20 @@ npm install @openapitools/openapi-generator-cli -D
 <!-- /RELEASE_VERSION -->
 ## [2 - Getting Started](#table-of-contents)
 
-To generate a PHP client for [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml), please run the following
+To generate a PHP client for [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml), please run the following
 ```sh
 git clone https://github.com/openapitools/openapi-generator
 cd openapi-generator
 mvn clean package
 java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
-   -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+   -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
    -g php \
    -o /var/tmp/php_api_client
 ```
-(if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`)
+(if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g php -o c:\temp\php_api_client`)
 
 <!-- RELEASE_VERSION -->
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta2/openapi-generator-cli-5.0.0-beta2.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar)
 <!-- /RELEASE_VERSION -->
 
 To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`
@@ -430,7 +424,7 @@ To get a list of PHP specified options (which can be passed to the generator wit
 ## [3 - Usage](#table-of-contents)
 
 ### To generate a sample client library
-You can build a client against the [Petstore API](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) as follows:
+You can build a client against the [Petstore API](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml) as follows:
 
 ```sh
 ./bin/java-petstore-okhttp-gson.sh
@@ -442,7 +436,7 @@ This script uses the default library, which is `okhttp-gson`. It will run the ge
 
 ```sh
 java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
-  -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+  -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
   -g java \
   -o samples/client/petstore/java/okhttp-gson
 ```
@@ -459,28 +453,29 @@ NAME
 SYNOPSIS
         openapi-generator-cli generate
                 [(-a <authorization> | --auth <authorization>)]
-                [--api-name-suffix <api name suffix>] [--api-package <api package>]
-                [--artifact-id <artifact id>] [--artifact-version <artifact version>]
-                [(-c <configuration file> | --config <configuration file>)] [--dry-run]
+                [--api-name-suffix <api name suffix>]
+                [--api-package <api package>] [--artifact-id <artifact id>]
+                [--artifact-version <artifact version>]
+                [(-c <configuration file> | --config <configuration file>)]
+                [-D <system properties>...]
                 [(-e <templating engine> | --engine <templating engine>)]
                 [--enable-post-process-file]
                 [(-g <generator name> | --generator-name <generator name>)]
-                [--generate-alias-as-model] [--git-host <git host>]
-                [--git-repo-id <git repo id>] [--git-user-id <git user id>]
-                [--global-property <global properties>...] [--group-id <group id>]
+                [--generate-alias-as-model] [--git-repo-id <git repo id>]
+                [--git-user-id <git user id>] [--group-id <group id>]
                 [--http-user-agent <http user agent>]
-                [(-i <spec file> | --input-spec <spec file>)]
+                (-i <spec file> | --input-spec <spec file>)
                 [--ignore-file-override <ignore file override location>]
                 [--import-mappings <import mappings>...]
                 [--instantiation-types <instantiation types>...]
                 [--invoker-package <invoker package>]
                 [--language-specific-primitives <language specific primitives>...]
-                [--legacy-discriminator-behavior] [--library <library>]
-                [--log-to-stderr] [--minimal-update]
+                [--library <library>] [--log-to-stderr] [--minimal-update]
                 [--model-name-prefix <model name prefix>]
                 [--model-name-suffix <model name suffix>]
                 [--model-package <model package>]
-                [(-o <output directory> | --output <output directory>)] [(-p <additional properties> | --additional-properties <additional properties>)...]
+                [(-o <output directory> | --output <output directory>)]
+                [(-p <additional properties> | --additional-properties <additional properties>)...]
                 [--package-name <package name>] [--release-note <release note>]
                 [--remove-operation-id-prefix]
                 [--reserved-words-mappings <reserved word mappings>...]
@@ -510,12 +505,13 @@ mvn package
 ```
 
 Other languages have petstore samples, too:
+```sh
+./bin/android-petstore-all.sh
+./bin/java-petstore-all.sh
+./bin/objc-petstore.sh
+```
 
-- [Swift5](https://github.com/OpenAPITools/openapi-generator/tree/master/samples/client/petstore/swift5)
-- [Ruby](https://github.com/OpenAPITools/openapi-generator/tree/master/samples/client/petstore/ruby)
-- [Kotlin](https://github.com/OpenAPITools/openapi-generator/tree/master/samples/client/petstore/kotlin)
-
-... and more.
+... and others. [Here is a list of all scripts.](https://github.com/OpenAPITools/openapi-generator/wiki/Samples-folder#scripts)
 
 ### [3.1 - Customization](#table-of-contents)
 
@@ -563,7 +559,6 @@ Here is a list of community-conitributed IDE plug-ins that integrate with OpenAP
 Here are some companies/projects (alphabetical order) using OpenAPI Generator in production. To add your company/project to the list, please visit [README.md](README.md) and click on the icon to edit the page.
 
 - [Adaptant Solutions AG](https://www.adaptant.io/)
-- [adesso SE](https://www.adesso.de/)
 - [Agoda](https://www.agoda.com/)
 - [Allianz](https://www.allianz.com)
 - [Angular.Schule](https://angular.schule/)
@@ -581,7 +576,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Camptocamp](https://www.camptocamp.com/en)
 - [Cisco](https://www.cisco.com/)
 - [codecentric AG](https://www.codecentric.de/)
-- [CoinAPI](https://www.coinapi.io/)
 - [Commencis](https://www.commencis.com/)
 - [Crossover Health](https://crossoverhealth.com/)
 - [Cupix](https://www.cupix.com/)
@@ -618,36 +612,28 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [MoonVision](https://www.moonvision.io/)
 - [Myworkout](https://myworkout.com)
 - [NamSor](https://www.namsor.com/)
-- [Nokia](https://www.nokia.com/)
-- [Options Clearing Corporation (OCC)](https://www.theocc.com/)
 - [Openet](https://www.openet.com/)
 - [openVALIDATION](https://openvalidation.io/)
 - [Oracle](https://www.oracle.com/)
 - [Paxos](https://www.paxos.com)
-- [PLAID, Inc.](https://plaid.co.jp/)
 - [Ponicode](https://ponicode.dev/)
 - [Pricefx](https://www.pricefx.com/)
 - [Prometheus/Alertmanager](https://github.com/prometheus/alertmanager)
 - [QEDIT](https://qed-it.com)
 - [Qulix Systems](https://www.qulix.com)
-- [Raksul](https://corp.raksul.com)
 - [Raiffeisen Schweiz Genossenschaft](https://www.raiffeisen.ch)
 - [RedHat](https://www.redhat.com)
 - [RepreZen API Studio](https://www.reprezen.com/swagger-openapi-code-generation-api-first-microservices-enterprise-development)
 - [REST United](https://restunited.com)
 - [Robotinfra](https://www.robotinfra.com)
-- [SmartHR](https://smarthr.co.jp/)
 - [Sony Interactive Entertainment](https://www.sie.com/en/index.html)
-- [Splitit](https://www.splitit.com/)
 - [Stingray](http://www.stingray.com)
 - [Suva](https://www.suva.ch/)
 - [Telstra](https://dev.telstra.com)
 - [TravelTime platform](https://www.traveltimeplatform.com/)
-- [TribalScale](https://www.tribalscale.com)
 - [TUI InfoTec GmbH](http://www.tui-infotec.com/)
 - [unblu inc.](https://www.unblu.com/)
 - [Veamly](https://www.veamly.com/)
-- [wbt-solutions](https://www.wbt-solutions.de/)
 - [Woleet](https://www.woleet.io/)
 - [WSO2](https://wso2.com/)
 - [Vouchery.io](https://vouchery.io)
@@ -679,7 +665,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2019/01/03 - [Calling a Swagger service from Apex using openapi-generator](https://lekkimworld.com/2019/01/03/calling-a-swagger-service-from-apex-using-openapi-generator/) by [Mikkel Flindt Heisterberg](https://lekkimworld.com)
 - 2019/01/13 - [OpenAPI GeneratorでRESTful APIの定義書から色々自動生成する](https://ky-yk-d.hatenablog.com/entry/2019/01/13/234108) by [@ky_yk_d](https://twitter.com/ky_yk_d)
 - 2019/01/20 - [Contract-First API Development with OpenAPI Generator and Connexion](https://medium.com/commencis/contract-first-api-development-with-openapi-generator-and-connexion-b21bbf2f9244) by [Anil Can Aydin](https://github.com/anlcnydn)
-- 2019/01/30 - [Rapid Application Development With API First Approach Using Open-API Generator](https://dzone.com/articles/rapid-api-development-using-open-api-generator) by [Milan Sonkar](https://dzone.com/users/828329/milan_sonkar.html)
+- 2019/01/30 - [Rapid Application Development With API First Approach Using Open-API Generator](https://dzone.com/articles/rapid-api-development-using-open-api-generator) by [Milan Sonkar](https://dzone.com/users/828329/milan_sonkar.html)  
 - 2019/02/02 - [平静を保ち、コードを生成せよ 〜 OpenAPI Generator誕生の背景と軌跡 〜](https://speakerdeck.com/akihito_nakano/gunmaweb34) by [中野暁人](https://github.com/ackintosh) at [Gunma.web #34 スキーマ駆動開発](https://gunmaweb.connpass.com/event/113974/)
 - 2019/02/20 - [An adventure in OpenAPI V3 code generation](https://mux.com/blog/an-adventure-in-openapi-v3-api-code-generation/) by [Phil Cluff](https://mux.com/blog/author/philc/)
 - 2019/02/26 - [Building API Services: A Beginner’s Guide](https://medium.com/google-cloud/building-api-services-a-beginners-guide-7274ae4c547f) by [Ratros Y.](https://medium.com/@ratrosy) in [Google Cloud Platofrm Blog](https://medium.com/google-cloud)
@@ -766,25 +752,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2020-05-18 - [Spring Boot REST with OpenAPI 3](https://dev.to/alfonzjanfrithz/spring-boot-rest-with-openapi-3-59jm) by [Alfonz Jan Frithz](https://dev.to/alfonzjanfrithz)
 - 2020-05-19 - [Dead Simple APIs with Open API](https://www.youtube.com/watch?v=sIaXmR6xRAw) by [Chris Tankersley](https://github.com/dragonmantank) at [Nexmo](https://developer.nexmo.com/)
 - 2020-05-22 - [TypeScript REST API Client](https://dev.to/unhurried/typescript-rest-api-client-4in3) by ["unhurried"](https://dev.to/unhurried)
-- 2020-05-28 - [【使用 lotify + Swagger 建置可共用的 LINE Notify bot】 - #NiJia @ Chatbot Developer Taiwan 第 #19 小聚](https://www.youtube.com/watch?v=agYVz6dzh1I) by [Chatbot Developer Taiwan](https://www.youtube.com/channel/UCxeYUyZNnHmpX23YNF-ewvw)
-- 2020-05-28 - [Building APIs with Laravel using OpenAPI](https://www.youtube.com/watch?v=xexLvQqAhiA) by [Chris Tankersley](https://github.com/dragonmantank) at [Laracon EU](https://laracon.eu/)
-- 2020-06-23 - [新規サーバーアプリケーションにTypeScriptを採用してみた](https://www.cam-inc.co.jp/news/20200623) at [CAM Tech Blog](https://www.cam-inc.co.jp/news/tech-blog/)
-- 2020-06-29 - [Artifact Abstract: Deployment of APIs on Android Mobile Devices and Microcontrollers](https://ieeexplore.ieee.org/document/9127353) by [Sergio Laso ; Marino Linaje ; Jose Garcia-Alonso ; Juan M. Murillo ; Javier Berrocal](https://ieeexplore.ieee.org/document/9127353/authors#authors) at [2020 IEEE International Conference on Pervasive Computing and Communications (PerCom)](https://ieeexplore.ieee.org/xpl/conhome/9125449/proceeding)
-- 2020-07-07 - [5 Best API Documentation Tools](https://blog.dreamfactory.com/5-best-api-documentation-tools/) by Susanna Bouse at [DreamFactory Blog](https://blog.dreamfactory.com/)
-- 2020-07-12 - [Open API 3.0の定義からgolangのサーバコードのスケルトンを作成する](https://qiita.com/professor/items/4cbd04ec084d13057bc2) by [@professor (Qiita Blog)](https://qiita.com/professor)
-- 2020-07-20 - [Datadog API client libraries now available for Java and Go](https://www.datadoghq.com/blog/java-go-libraries/) by Jordan Obey at [Datadog Blog](https://www.datadoghq.com/blog)
-- 2020-07-23 - [Generate Client SDK for .NET Core using Open Api](https://dev.to/no0law1/generate-client-sdk-for-net-core-using-open-api-2dgh) by [Nuno Reis](https://dev.to/no0law1)
-- 2020-07-26 - [Dartのhttp_interceptorライブラリを使うと配列のクエリパラメータが消えてしまう件の応急処置](https://qiita.com/gyamoto/items/eeeff81b6770487319ed) by [@gyamoto](https://qiita.com/gyamoto)
-- 2020-08-01 - [Generate Angular ReactiveForms from Swagger/OpenAPI](https://dev.to/martinmcwhorter/generate-angular-reactiveforms-from-swagger-openapi-35h9) by [Martin McWhorter](https://dev.to/martinmcwhorter)
-- 2020-08-03 - [Criando Bibliotecas para APIs RESTful com OpenAPI, Swagger Editor e OpenAPI Generator](https://medium.com/@everisBrasil/criando-bibliotecas-para-apis-restful-com-openapi-swagger-editor-e-openapi-generator-75349a6420fd) by [everis Brasil (an NTT DATA Company)](https://medium.com/@everisBrasil)
-- 2020-08-19 - [マイクロサービスを連携してみよう](https://thinkit.co.jp/article/17704) by [岡井 裕矢(おかい ゆうや)](https://thinkit.co.jp/author/17588), [泉 勝(いずみ まさる)](https://thinkit.co.jp/author/17705) at [Think IT（シンクイット）](https://thinkit.co.jp/)
-- 2020-08-25 - [OpenAPI Generator と TypeScript で型安全にフロントエンド開発をしている話](https://tech.smarthr.jp/entry/2020/08/25/135631) at [SmartHR Tech Blog](https://tech.smarthr.jp/)
-- 2020-09-10 - [Introduction to OpenAPI with Instana](https://www.instana.com/blog/introduction-to-openapi-with-instana/) by [Cedric Ziel](https://www.instana.com/blog/author/cedricziel/) at [Instana Blog](https://www.instana.com/blog/)
-- 2020-09-17 - [Generate PowerShellSDK using openapi-generator](https://medium.com/@ghufz.learn/generate-powershellsdk-using-openapi-generator-33b700891e33) by [Ghufran Zahidi](https://medium.com/@ghufz.learn)
-- 2020-09-24 - [How to automate API code generation (OpenAPI/Swagger) and boost productivity - Tutorial with React Native featuring TypeScript](https://medium.com/@sceleski/how-to-automate-api-code-generation-openapi-swagger-and-boost-productivity-1176a0056d8a) by [Sanjin Celeski](https://medium.com/@sceleski)
-- 2020-09-25 - [Generate OpenAPI Angular Client](https://medium.com/@pguso/generate-openapi-angular-client-8c9288e8bbd4) by [Patric](https://medium.com/@pguso)
-- 2020-10-24 - [Working with Microsoft Identity - React Native Client](https://www.josephguadagno.net/2020/10/24/working-with-microsoft-identity-react-native-client) by [Joseph Guadagno](https://www.josephguadagno.net/)
-- 2020-10-31 - [[B2] OpenAPI Specification으로 타입-세이프하게 API 개발하기: 희망편 VS 절망편](https://www.youtube.com/watch?v=J4JHLESAiFk) by 최태건 at [FEConf 2020](https://2020.feconf.kr/)
 
 ## [6 - About Us](#table-of-contents)
 
@@ -977,7 +944,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Bash              | @frol (2017/07) @bkryza (2017/08) @kenjones-cisco (2017/09)                                                                                                                                                                       |
 | C                 | @zhemant (2018/11) @ityuhui (2019/12) @michelealbano (2020/03)                                                                                                                                                                   |
 | C++               | @ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @martindelille (2018/03) @muttleyxd (2019/08)                                                                                                                     |
-| C#                | @mandrean (2017/08) @frankyjuang (2019/09) @shibayan (2020/02)                                                                                             |
+| C#                | @mandrean (2017/08), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert) @frankyjuang (2019/09) @shibayan (2020/02)                                                                                             |
 | Clojure           |                                                                                                                                                                                                                                   |
 | Dart              | @ircecho (2017/07) @swipesight (2018/09) @jaumard (2018/09) @athornz (2019/12) @amondnet (2019/12)                                                                                                        |
 | Eiffel            | @jvelilla (2017/09)                                                                                                                                                                                                               |
@@ -985,7 +952,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Elm               | @eriktim (2018/09)                                                                                                                                                                                                                |
 | Erlang            | @tsloughter (2017/11) @jfacorro (2018/10) @robertoaloi (2018/10)                                                                                                                                                                  |
 | F#                | @nmfisher (2019/05)                                                                                                                                                                                                               |
-| Go                | @antihax (2017/11) @grokify (2018/07) @kemokemo (2018/09) @bkabrda (2019/07)                                                                                                                                   |
+| Go                | @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09) @bkabrda (2019/07)                                                                                                                                   |
 | GraphQL           | @renepardon (2018/12)                                                                                                                                                                                                             |
 | Groovy            |                                                                                                                                                                                                                                   |
 | Haskell           |                                                                                                                                                                                                                                   |
@@ -1002,7 +969,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Python            | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) @Jyhess (2019/01) @arun-nalla (2019/11) @spacether (2019/11)                                                |
 | R                 | @Ramanth (2019/07) @saigiridhar21 (2019/07)                                                                                                                                                                                       |
 | Ruby              | @cliffano (2017/07) @zlx (2017/09) @autopp (2019/02)                                                                                                                                                                             |
-| Rust              | @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05)                                                                                                                               |
+| Rust              | @frol (2017/07) @farcaller (2017/08) @bjgill (2017/12) @richardwhiuk (2019/07) @paladinzh (2020/05)                                                                                                                               |
 | Scala             | @clasnake (2017/07), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @shijinkui  (2018/01), @ramzimaalej (2018/03), @chameleon82 (2020/03), @Bouillie (2020/04)                                                          |
 | Swift             | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @4brunu (2019/11)                                                                                                                                       |
 | TypeScript        | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) |
@@ -1070,7 +1037,7 @@ OpenAPI Generator is a fork of [Swagger Codegen](https://github.com/swagger-api/
 ## [7 - License](#table-of-contents)
 -------
 
-Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)  
 Copyright 2018 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");

appveyor.yml

@@ -1,5 +1,5 @@
 version: '{branch}-{build}'
-image: Visual Studio 2019
+image: Visual Studio 2017
 hosts:
   petstore.swagger.io: 127.0.0.1
 install:
@@ -15,14 +15,14 @@ install:
   # install gradle
   - ps: |
       Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\gradle\gradle-5.6.4" )) {
+      if (!(Test-Path -Path "C:\gradle" )) {
         (new-object System.Net.WebClient).DownloadFile(
-          'https://services.gradle.org/distributions/gradle-5.6.4-bin.zip',
+          'https://services.gradle.org/distributions/gradle-5.3.1-bin.zip',
           'C:\gradle-bin.zip'
         )
         [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\gradle-bin.zip", "C:\gradle")
       }
-  - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;C:\gradle\gradle-5.6.4\bin;%JAVA_HOME%\bin;%PATH%
+  - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;C:\gradle\gradle-5.3.1\bin;%JAVA_HOME%\bin;%PATH%
   - cmd: SET MAVEN_OPTS=-Xmx4g
   - cmd: SET JAVA_OPTS=-Xmx4g
   - cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
@@ -38,8 +38,6 @@ build_script:
   # build C# API client (netcore)
   - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient\Org.OpenAPITools.sln
   - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCore\Org.OpenAPITools.sln
-  # build C# API client (.net framework 4.7)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net47\Org.OpenAPITools.sln
   # build C# API client
   - nuget restore samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln
   - msbuild samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -47,18 +45,16 @@ build_script:
   - nuget restore samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\Org.OpenAPITools.sln
   - msbuild samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
   # build C# .net standard 1.3+ API client
-  #- nuget restore samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln
-  #- msbuild samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - nuget restore samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln
+  - msbuild samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
   # install openapi-generator locally
   - mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
   # run the locally installed openapi-generator-gradle-plugin
   - gradle -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --stacktrace
 test_script:
   # test c# API client (netcore)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  # test C# API client (.net framework 4.7)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # test c# API client
   - nunit3-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
   # test c# API client (with PropertyChanged)

bin/configs/csharp-OpenAPIClient.yaml

@@ -1,5 +1,5 @@
 generatorName: csharp
 outputDir: samples/client/petstore/csharp/OpenAPIClient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'

bin/configs/csharp-netcore-OpenAPIClient-net47.yaml

@@ -1,11 +0,0 @@
-# for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net47
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
-  targetFramework: net47

bin/configs/csharp-netcore-OpenAPIClient.yaml

@@ -1,10 +1,7 @@
-# for .net standard
 generatorName: csharp-netcore
 outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
+  useCompareNetObjects: "true"

bin/configs/csharp-netcore-OpenAPIClientCore.yaml

@@ -1,6 +1,6 @@
 generatorName: csharp-netcore
 outputDir: samples/client/petstore/csharp-netcore/OpenAPIClientCore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'

bin/configs/dart-openapi-browser-client.yaml

@@ -0,0 +1,8 @@
+generatorName: dart
+outputDir: samples/client/petstore/dart/openapi-browser-client
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/dart
+additionalProperties:
+  supportDart2: "false"
+  hideGenerationTimestamp: "true"
+  browserClient: "true"

bin/configs/dart-openapi-flutter.yaml

@@ -0,0 +1,8 @@
+generatorName: dart
+outputDir: samples/client/petstore/dart/flutter_petstore/openapi
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/dart
+additionalProperties:
+  supportDart2: "false"
+  hideGenerationTimestamp: "true"
+  browserClient: "false"

bin/configs/dart-openapi.yaml

@@ -0,0 +1,8 @@
+generatorName: dart
+outputDir: samples/client/petstore/dart/openapi
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/dart
+additionalProperties:
+  supportDart2: "false"
+  hideGenerationTimestamp: "true"
+  browserClient: "false"

bin/configs/go-experimental-go-petstore-oas2.yaml

@@ -0,0 +1,6 @@
+generatorName: go-experimental
+outputDir: samples/client/petstore/go-experimental/go-petstore
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/go-experimental
+additionalProperties:
+  packageName: petstore

bin/configs/go-experimental-go-petstore.yaml

@@ -0,0 +1,7 @@
+generatorName: go-experimental
+outputDir: samples/openapi3/client/petstore/go-experimental/go-petstore
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/go-experimental
+additionalProperties:
+  enumClassPrefix: "true"
+  packageName: petstore

bin/configs/go-extensions-x-auth-id-alias.yaml

@@ -1,6 +0,0 @@
-generatorName: go
-outputDir: samples/openapi3/client/extensions/x-auth-id-alias/go-experimental
-inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
-templateDir: modules/openapi-generator/src/main/resources/go
-additionalProperties:
-  packageName: x_auth_id_alias

bin/configs/go-petstore-oas2.yaml

@@ -4,4 +4,3 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/go
 additionalProperties:
   packageName: petstore
-  generateInterfaces: true

bin/configs/go-petstore-withXml.yaml

@@ -0,0 +1,8 @@
+generatorName: go
+outputDir: samples/client/petstore/go/go-petstore-withXml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/go
+additionalProperties:
+  packageName: petstore
+  withXml: "true"
+  withGoCodegenComment: "true"

bin/configs/go-petstore.yaml

@@ -1,9 +1,7 @@
 generatorName: go
 outputDir: samples/openapi3/client/petstore/go/go-petstore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/go
 additionalProperties:
   enumClassPrefix: "true"
   packageName: petstore
-  disallowAdditionalPropertiesIfNotPresent: false
-  generateInterfaces: true

bin/configs/java-feign-no-nullable.yaml

@@ -1,11 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/feign-no-nullable
-library: feign
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  booleanGetterPrefix: is
-  artifactId: petstore-feign-no-nullable
-  hideGenerationTimestamp: "true"
-  additionalModelTypeAnnotations: '@javax.annotation.concurrent.Immutable'
-  openApiNullable: "false"

bin/configs/java-feign.yaml

@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/feign
-library: feign
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  booleanGetterPrefix: is
-  artifactId: petstore-feign
-  hideGenerationTimestamp: "true"

bin/configs/java-feign10x.yaml

@@ -0,0 +1,9 @@
+generatorName: java
+outputDir: samples/client/petstore/java/feign10x
+library: feign
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  booleanGetterPrefix: is
+  artifactId: petstore-feign-10x
+  hideGenerationTimestamp: "true"

bin/configs/java-jersey2-8.yaml

@@ -1,12 +1,10 @@
 generatorName: java
 outputDir: samples/openapi3/client/petstore/java/jersey2-java8
 library: jersey2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
 additionalProperties:
   artifactId: petstore-openapi3-jersey2-java8
   hideGenerationTimestamp: true
   serverPort: "8082"
   dateLibrary: java8
   useOneOfDiscriminatorLookup: true
-  disallowAdditionalPropertiesIfNotPresent: false

bin/configs/java-jersey2-extensions-x-auth-id-alias.yaml

@@ -1,7 +0,0 @@
-generatorName: java
-outputDir: samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8
-library: jersey2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
-additionalProperties:
-  artifactId: openapi3-extensions-x-auth-id-alias-jersey2-java8
-  hideGenerationTimestamp: true

bin/configs/java-jersey2-special-characters.yaml

@@ -1,15 +0,0 @@
-generatorName: java
-outputDir: samples/openapi3/client/petstore/java/jersey2-java8-special-characters
-library: jersey2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/schema-with-special-characters.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-openapi3-jersey2-java8-special-characters
-  hideGenerationTimestamp: true
-  serverPort: "8082"
-  dateLibrary: java8
-  useOneOfDiscriminatorLookup: true
-  disallowAdditionalPropertiesIfNotPresent: false
-systemProperties:
-  skipValidateSpec: "false"
-

bin/configs/java-native-async.yaml

@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/native-async
-library: native
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-native
-  hideGenerationTimestamp: "true"
-  asyncNative: "true"

bin/configs/java-native-openapi3.yaml

@@ -1,11 +0,0 @@
-generatorName: java
-outputDir: samples/openapi3/client/petstore/java/native
-library: native
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-openapi3-native
-  hideGenerationTimestamp: true
-  serverPort: "8082"
-  useOneOfDiscriminatorLookup: true
-  disallowAdditionalPropertiesIfNotPresent: false

bin/configs/java-play-framework-no-nullable.yaml

@@ -1,7 +0,0 @@
-generatorName: java-play-framework
-outputDir: samples/server/petstore/java-play-framework-no-nullable
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  openApiNullable: "false"

bin/configs/java-retrofit2-play24.yaml

@@ -0,0 +1,12 @@
+generatorName: java
+outputDir: samples/client/petstore/java/retrofit2-play24
+library: retrofit2
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+additionalProperties:
+  usePlayWS: "true"
+  enableBuilderSupport: "true"
+  useBeanValidation: "true"
+  playVersion: play24
+  artifactId: petstore-java-client-retrofit2-play24
+  hideGenerationTimestamp: "true"
+  dateLibrary: java8

bin/configs/java-retrofit2-play25.yaml

@@ -0,0 +1,11 @@
+generatorName: java
+outputDir: samples/client/petstore/java/retrofit2-play25
+library: retrofit2
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+additionalProperties:
+  usePlayWS: "true"
+  enableBuilderSupport: "true"
+  useBeanValidation: "true"
+  playVersion: play25
+  artifactId: petstore-java-client-retrofit2-play25
+  hideGenerationTimestamp: "true"

bin/configs/java-retrofit2rx.yaml

@@ -0,0 +1,9 @@
+generatorName: java
+outputDir: samples/client/petstore/java/retrofit2rx
+library: retrofit2
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  useRxJava: "true"
+  artifactId: petstore-retrofit2-rx
+  hideGenerationTimestamp: "true"

bin/configs/java-retrofit2rx3.yaml

@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/retrofit2rx3
-library: retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  useRxJava3: "true"
-  artifactId: petstore-retrofit2-rx3
-  hideGenerationTimestamp: "true"

bin/configs/java-vertx-no-nullable.yaml

@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/vertx-no-nullable
-library: vertx
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-vertx-no-nullable
-  hideGenerationTimestamp: "true"
-  openApiNullable: "false"

bin/configs/kotlin-jvm-retrofit2-rx3.yaml

@@ -1,8 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/petstore/kotlin-retrofit2-rx3
-library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  artifactId: kotlin-petstore-retrofit2-rx3
-  useRxJava3: "true"

bin/configs/other/aspnetcore-3.1.yaml

@@ -5,4 +5,3 @@ templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
 additionalProperties:
   packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
   aspnetCoreVersion: "3.1"
-  userSecretsGuid: "76e9e993-9159-441c-9c5b-fe95e7f4f020"

bin/configs/other/cpp-oatpp-server.yaml

@@ -1,4 +0,0 @@
-generatorName: cpp-oatpp-server
-outputDir: samples/server/petstore/cpp-oatpp
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-oatpp-server

bin/configs/other/flash.yaml

@@ -0,0 +1,7 @@
+generatorName: flash
+outputDir: samples/client/petstore/flash
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/flash
+additionalProperties:
+  invokerPackage: org.openapitools
+  packageName: org.openapitools

bin/configs/other/java-vertx-web-rx.yaml

@@ -0,0 +1,7 @@
+generatorName: java-vertx-web
+outputDir: samples/server/petstore/java-vertx-web/rx
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaVertXWebServer
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  artifactId: java-vertx-web-rx-server

bin/configs/other/java-vertx-web.yaml

@@ -1,7 +0,0 @@
-generatorName: java-vertx-web
-outputDir: samples/server/petstore/java-vertx-web
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaVertXWebServer
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  artifactId: java-vertx-web-server

bin/configs/other/openapi3/objc-core-data.yaml

@@ -3,6 +3,5 @@ outputDir: samples/client/petstore/objc/core-data
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.json
 templateDir: modules/openapi-generator/src/main/resources/objc
 additionalProperties:
-  classPrefix: SWG
-  podName: SwaggerClient
   coreData: "true"
+  appName: PetstoreClient

bin/configs/other/openapi3/objc-default.yaml

@@ -3,5 +3,4 @@ outputDir: samples/client/petstore/objc/default
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.json
 templateDir: modules/openapi-generator/src/main/resources/objc
 additionalProperties:
-  classPrefix: SWG
-  podName: SwaggerClient
+  appName: PetstoreClient

bin/configs/other/openapi3/php-slim-deprecated-php-slim.yaml

@@ -0,0 +1,4 @@
+generatorName: php-slim-deprecated
+outputDir: samples/server/petstore/php-slim
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/php-slim-server

bin/configs/other/openapi3/typescript-angularjs.yaml

@@ -0,0 +1,3 @@
+generatorName: typescript-angularjs
+outputDir: samples/client/petstore/typescript-angularjs
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml

bin/configs/other/powershell.yaml

@@ -9,4 +9,3 @@ additionalProperties:
   packageName: PSPetstore
   powershellGalleryUrl: https://www.powershellgallery.com/packages/PSPetstore
   apiNamePrefix: PS
-  powershellVersion: "5.0"

bin/configs/php-OpenAPIClient-oas2.yaml

@@ -0,0 +1,4 @@
+generatorName: php
+outputDir: samples/client/petstore/php/OpenAPIClient-php
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/php

bin/configs/php-OpenAPIClient.yaml

@@ -1,4 +1,4 @@
 generatorName: php
-outputDir: samples/client/petstore/php/OpenAPIClient-php
+outputDir: samples/openapi3/client/petstore/php/OpenAPIClient-php
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/php

bin/configs/php-laravel.yaml

@@ -1,4 +0,0 @@
-generatorName: php-laravel
-outputDir: samples/server/petstore/php-laravel
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-laravel

bin/configs/php-lumen.yaml

@@ -1,4 +1,4 @@
 generatorName: php-lumen
 outputDir: samples/server/petstore/php-lumen
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/php-lumen

bin/configs/php-silex-deprecated-OpenAPIServer.yaml

@@ -0,0 +1,4 @@
+generatorName: php-silex-deprecated
+outputDir: samples/server/petstore/php-silex/OpenAPIServer
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/php-silex

bin/configs/php-slim-deprecated-php-slim.yaml

@@ -0,0 +1,4 @@
+generatorName: php-slim-deprecated
+outputDir: samples/server/petstore/php-slim
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/php-slim-server

bin/configs/php-slim4.yaml

@@ -1,4 +0,0 @@
-generatorName: php-slim4
-outputDir: samples/server/petstore/php-slim4
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-slim4-server

bin/configs/php-ze-ph.yaml

@@ -1,4 +1,4 @@
 generatorName: php-ze-ph
 outputDir: samples/server/petstore/php-ze-ph
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/php-ze-ph

bin/configs/python-experimental-extensions-x-auth-id-alias.yaml

@@ -1,6 +0,0 @@
-generatorName: python-experimental
-outputDir: samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/
-inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
-templateDir: modules/openapi-generator/src/main/resources/python
-additionalProperties:
-  packageName: x_auth_id_alias

bin/configs/python-experimental-features-dynamic-servers.yaml

@@ -1,6 +0,0 @@
-generatorName: python-experimental
-outputDir: samples/openapi3/client/features/dynamic-servers/python-experimental/
-inputSpec: modules/openapi-generator/src/test/resources/3_0/features/dynamic-servers.yaml
-templateDir: modules/openapi-generator/src/main/resources/python
-additionalProperties:
-  packageName: dynamic_servers

bin/configs/python-experimental.yaml

@@ -4,4 +4,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/python-experimental/
 templateDir: modules/openapi-generator/src/main/resources/python
 additionalProperties:
   packageName: petstore_api
-  recursionLimit: "1234"

bin/configs/python-flask-python2.yaml

@@ -0,0 +1,6 @@
+generatorName: python-flask
+outputDir: samples/server/petstore/python-flask-python2
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/python-flask
+additionalProperties:
+  supportPython2: true

bin/configs/ruby-features-dynamic-servers.yaml

@@ -1,9 +0,0 @@
-generatorName: ruby
-outputDir: samples/openapi3/client/features/dynamic-servers/ruby/
-inputSpec: modules/openapi-generator/src/test/resources/3_0/features/dynamic-servers.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
-additionalProperties:
-  gemVersion: 1.0.0
-  moduleName: DynamicServers
-  gemName: dynamic_servers
-  skipFormModel: "true"

bin/configs/ruby-generate-alias-as-model.yaml

@@ -1,12 +0,0 @@
-generatorName: ruby
-outputDir: samples/openapi3/client/features/generate-alias-as-model/ruby-client/
-library: typhoeus
-inputSpec: modules/openapi-generator/src/test/resources/3_0/features/generate-alias-as-model.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
-additionalProperties:
-  gemVersion: 1.0.0
-  moduleName: Petstore
-  gemName: petstore
-  skipFormModel: "true"
-strictSpecBehavior: false
-generateAliasAsModel: true

bin/configs/rust-reqwest-petstore-async.yaml

@@ -5,6 +5,5 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/rust
 additionalProperties:
   supportAsync: true
-  supportMultipleResponses: true
   packageName: petstore-reqwest-async
   useSingleRequestParameter: true

bin/configs/rust-reqwest-petstore.yaml

@@ -4,5 +4,5 @@ library: reqwest
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/rust
 additionalProperties:
-  supportAsync: false
+  supportAsync: "false"
   packageName: petstore-reqwest

bin/configs/spring-boot-beanvalidation-no-nullable.yaml

@@ -1,11 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/springboot-beanvalidation-no-nullable
-library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  java8: "false"
-  useBeanValidation: true
-  artifactId: spring-boot-beanvalidation-no-nullable
-  hideGenerationTimestamp: "true"
-  openApiNullable: "false"

bin/configs/spring-boot-beanvalidation.yaml

@@ -4,7 +4,7 @@ library: spring-boot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
-  java8: true
+  java8: "false"
   useBeanValidation: true
   artifactId: spring-boot-beanvalidation
   hideGenerationTimestamp: "true"

bin/configs/spring-boot-delegate.yaml

@@ -5,5 +5,5 @@ templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
   artifactId: springboot-delegate
   hideGenerationTimestamp: "true"
-  java8: true
+  java8: "false"
   delegatePattern: "true"

bin/configs/spring-cloud-no-nullable.yaml

@@ -1,10 +0,0 @@
-generatorName: spring
-outputDir: samples/client/petstore/spring-cloud-no-nullable
-library: spring-cloud
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud
-additionalProperties:
-  artifactId: petstore-spring-cloud-no-nullable
-  responseWrapper: HystrixCommand
-  hideGenerationTimestamp: "true"
-  openApiNullable: "false"

bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml

@@ -1,8 +0,0 @@
-generatorName: spring
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
-outputDir: samples/client/petstore/spring-cloud-spring-pageable
-artifactId: spring-cloud-spring-pageable
-library: spring-cloud
-additionalProperties:
-  hideGenerationTimestamp: 'true'

bin/configs/spring-mvc-no-nullable.yaml

@@ -1,10 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/spring-mvc-no-nullable
-library: spring-mvc
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  artifactId: spring-mvc-server-no-nullable
-  openApiNullable: "false"
-  serverPort: "8002"
-  hideGenerationTimestamp: "true"

bin/configs/spring-mvc-petstore-server-spring-pageable.yaml

@@ -1,8 +0,0 @@
-generatorName: spring
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-outputDir: samples/server/petstore/spring-mvc-spring-pageable
-artifactId: spring-mvc-spring-pageable
-library: spring-mvc
-additionalProperties:
-  hideGenerationTimestamp: 'true'

bin/configs/spring-mvc.yaml

@@ -4,9 +4,8 @@ library: spring-mvc
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
-  java8: true
+  java8: "false"
   booleanGetterPrefix: get
   artifactId: spring-mvc-server
   hideGenerationTimestamp: "true"
   serverPort: "8002"
-  additionalModelTypeAnnotations: '@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name");@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")'

bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml

@@ -1,10 +0,0 @@
-generatorName: spring
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8
-artifactId: springboot-spring-pageable-delegatePattern-without-j8
-library: spring-boot
-delegatePattern: true
-java8: false
-additionalProperties:
-  hideGenerationTimestamp: 'true'

bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml

@@ -1,9 +0,0 @@
-generatorName: spring
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern
-artifactId: springboot-spring-pageable-delegatePattern
-library: spring-boot
-delegatePattern: true
-additionalProperties:
-  hideGenerationTimestamp: 'true'

bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml

@@ -1,9 +0,0 @@
-generatorName: spring
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-outputDir: samples/server/petstore/springboot-spring-pageable-without-j8
-artifactId: springboot-spring-pageable-withoutj8
-library: spring-boot
-java8: false
-additionalProperties:
-  hideGenerationTimestamp: 'true'

bin/configs/springboot-petstore-server-spring-pageable.yaml

@@ -1,8 +0,0 @@
-generatorName: spring
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-outputDir: samples/server/petstore/springboot-spring-pageable
-artifactId: springboot-spring-pageable
-library: spring-boot
-additionalProperties:
-  hideGenerationTimestamp: 'true'

bin/configs/typescript-angular-v10-provided-in-root-with-npm.yaml

@@ -1,9 +0,0 @@
-generatorName: typescript-angular
-outputDir: samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-additionalProperties:
-  ngVersion: 10.0.0
-  npmVersion: 1.0.0
-  npmName: '@openapitools/typescript-angular-petstore'
-  npmRepository: https://skimdb.npmjs.com/registry
-  snapshot: false

bin/configs/typescript-angular-v10-provided-in-root.yaml

@@ -1,5 +0,0 @@
-generatorName: typescript-angular
-outputDir: samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-additionalProperties:
-  ngVersion: 10.0.0

bin/configs/typescript-angular-v9-provided-in-root-with-npm.yaml

@@ -1,9 +0,0 @@
-generatorName: typescript-angular
-outputDir: samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-additionalProperties:
-  ngVersion: 9.0.0
-  npmVersion: 1.0.0
-  npmName: '@openapitools/typescript-angular-petstore'
-  npmRepository: https://skimdb.npmjs.com/registry
-  snapshot: false

bin/configs/typescript-angular-v9-provided-in-root.yaml

@@ -1,5 +0,0 @@
-generatorName: typescript-angular
-outputDir: samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-additionalProperties:
-  ngVersion: 9.0.0

bin/configs/typescript-angular-with-prefixed-module-name-v8.yaml

@@ -8,4 +8,3 @@ additionalProperties:
   npmRepository: https://skimdb.npmjs.com/registry
   snapshot: false
   apiModulePrefix: PetStore
-  configurationPrefix: PetStore

bin/configs/typescript-angularjs.yaml

@@ -0,0 +1,3 @@
+generatorName: typescript-angularjs
+outputDir: samples/client/petstore/typescript-angularjs
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml

bin/configs/typescript-consolidated-deno.yaml

@@ -1,6 +0,0 @@
-generatorName: typescript
-outputDir: samples/openapi3/client/petstore/typescript/builds/deno
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-additionalProperties:
-  platform: deno
-  npmName: ts-petstore-client

bin/configs/typescript-consolidated-inversify.yaml

@@ -1,7 +0,0 @@
-generatorName: typescript
-outputDir: samples/openapi3/client/petstore/typescript/builds/inversify
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-additionalProperties:
-  platform: node
-  npmName: ts-petstore-client
-  useInversify: true

bin/configs/typescript-consolidated-jquery.yaml

@@ -1,6 +0,0 @@
-generatorName: typescript
-outputDir: samples/openapi3/client/petstore/typescript/builds/jquery
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-additionalProperties:
-  framework: jquery
-  npmName: ts-petstore-client

bin/configs/typescript-consolidated-node-object-parameters.yaml

@@ -1,7 +0,0 @@
-generatorName: typescript
-outputDir: samples/openapi3/client/petstore/typescript/builds/object_params
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-additionalProperties:
-  platform: node
-  npmName: ts-petstore-client
-  useObjectParameters: true

bin/configs/typescript-consolidated-node.yaml

@@ -1,6 +0,0 @@
-generatorName: typescript
-outputDir: samples/openapi3/client/petstore/typescript/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-additionalProperties:
-  platform: node
-  npmName: ts-petstore-client

bin/configs/typescript-rxjs-with-interfaces.yaml

@@ -0,0 +1,5 @@
+generatorName: typescript-rxjs
+outputDir: samples/client/petstore/typescript-rxjs/builds/with-interfaces
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+additionalProperties:
+  withInterfaces: "true"

bin/configs/typescript-rxjs-with-progress-subscriber.yaml

@@ -1,5 +0,0 @@
-generatorName: typescript-rxjs
-outputDir: samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-additionalProperties:
-  withProgressSubscriber: "true"

bin/generate-samples.sh

@@ -6,62 +6,21 @@ declare cwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 declare root="$(cd "$cwd" && cd ../ && pwd)"
 declare executable="${root}/modules/openapi-generator-cli/target/openapi-generator-cli.jar"
 
+echo "# START SCRIPT: $0"
+echo "This script generates all configs under bin/configs by default."
+echo "You may generate a targeted script or set of scripts using glob patterns."
+echo "For example: $0 bin/configs/java-*"
+echo ""
+echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
+
+sleep 5
 if [ ! -f "$executable" ]; then
   (cd "${root}" && mvn -B --no-snapshot-updates clean package -DskipTests=true -Dmaven.javadoc.skip=true -Djacoco.skip=true)
 fi
 
-export JAVA_OPTS="${JAVA_OPTS} -ea -server -Duser.timezone=UTC"
-export BATCH_OPTS="${BATCH_OPTS:-}"
+export JAVA_OPTS="${JAVA_OPTS} -server -Duser.timezone=UTC"
 
-files=()
-args=()
-end_option=false
-while [[ $# -gt 0 ]]; do
-  key="$1"
-  if [ "--" == "$key" ]; then
-    end_option=true
-  else
-    if [[ "$end_option" = true ]]; then
-      args+=("$1")
-    else
-      files+=("$1")
-    fi
-  fi
-  shift
-done
-
-header="# START SCRIPT: $0
-This script generates all configs under bin/configs by default.
-You may generate a targeted script or set of scripts using glob patterns.
-
-For example:
-    $0 bin/configs/java-*
-
-You may generate a single config with additional options if you use -- to
-separate the single config file from the generator arguments.
-
-For example:
-    $0 bin/configs/java-vertx.yaml -- --global-property debugModels=true
-
-"
-
-echo "$header"
-
-if [[ ${#files[@]} -eq 1 && "${files[0]}" != *'*'* ]]; then
-    # shellcheck disable=SC2086
-    # shellcheck disable=SC2068
-    java ${JAVA_OPTS} -jar "$executable" generate -c ${files[0]} ${args[@]}
-else
-    echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
-
-    sleep 5
-
-    if [ ${#files[@]} -eq 0 ]; then
-      files=("${root}"/bin/configs/*.yaml)
-    fi
-
-    # shellcheck disable=SC2086
-    # shellcheck disable=SC2068
-    java ${JAVA_OPTS} -jar "$executable" batch ${BATCH_OPTS} --includes-base-dir "${root}" --fail-fast  -- ${files[@]}
-fi
+configs=${@:-"${root}"/bin/configs/*.yaml}
 
+# shellcheck disable=SC2086
+java $JAVA_OPTS -jar "$executable" batch --includes-base-dir "${root}" --fail-fast  -- $configs

bin/utils/ensure-up-to-date

@@ -8,8 +8,11 @@ declare root="$(cd "$cwd" && cd ../../ && pwd)"
 declare executable="${root}/modules/openapi-generator-cli/target/openapi-generator-cli.jar"
 
 echo "# START SCRIPT: $0"
+
 echo "IMPORTANT: this script should be run by the CI (e.g. Shippable) to ensure that the 'samples/' folder is up to date."
-echo ""
+echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
+
+sleep 5
 
 "${root}/bin/generate-samples.sh"
 
@@ -19,13 +22,6 @@ if [ $status -ne 0 ]; then
   exit $status
 fi
 
-if [[ "--skip-docs" == "${1}" ]]; then
-  # We export here rather than modify our iterable so that:
-  #  - the scripts can show they ran and echo meaningfully
-  #  - the scripts can do cleanup (if necessary) when skipped
-  export SKIP_EXPORT_DOCS=true
-fi
-
 # Some special case generators may expect to be run as a stanalone process (e.g. modifying classpath)
 # Docs should always be run, regardless of batch or operation.
 declare -a always_iterate=(
@@ -53,9 +49,6 @@ if [ -n "$(git status --porcelain)" ]; then
     git --no-pager diff
     echo "Perform git status"
     git status
-    echo -e "\nThis script runs in pull requests against the anticipated merge commit (as if the PR was merged now)."
-    echo "When you see unexpected files here, it likely means that there are newer commits in master that you need to "
-    echo -e "rebase or merge into your branch.\n"
     echo "Please run 'bin/utils/ensure-up-to-date' locally and commit changes (UNCOMMITTED CHANGES ERROR)"
     exit 1
 else