fix some tests, update default generator

.circleci/config.yml

@@ -1,118 +0,0 @@
-version: 2
-jobs:
-  build:
-    #    docker:
-    #      #- image: openapitools/openapi-generator
-    #      - image: swaggerapi/petstore
-    #        environment:
-    #          SWAGGER_HOST=http://petstore.swagger.io
-    #          SWAGGER_BASE_PATH=/v2
-    machine:
-      image: circleci/classic:latest
-    working_directory: ~/OpenAPITools/openapi-generator
-    parallelism: 3
-    shell: /bin/bash --login
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
-      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
-    steps:
-    # Restore the dependency cache
-    - restore_cache:
-        keys:
-        # Default branch if not
-        - source-v2-{{ .Branch }}-{{ .Revision }}
-        - source-v2-{{ .Branch }}-
-        - source-v2-
-    # Machine Setup
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-    # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
-    - checkout
-    # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
-    # In many cases you can simplify this from what is generated here.
-    # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
-    - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-    # This is based on your 1.0 configuration file or project settings
-    - run:
-        command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
-    - run:
-        command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; '
-    - run:
-       command: |-
-         printf '127.0.0.1       petstore.swagger.io
-         ' | sudo tee -a /etc/hosts
-    # Dependencies
-    # Install latest stable node for angular 6
-    - run:
-        name: Install node@stable (for angular 6)
-        command: |
-          set +e
-          curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
-          export NVM_DIR="/opt/circleci/.nvm"
-          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-          nvm install stable
-          nvm alias default stable
-
-          # Each step uses the same `$BASH_ENV`, so need to modify it
-          echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
-          echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
-    - run: node --version
-#    - run: docker pull openapitools/openapi-petstore
-#    - run: docker run -d -e OPENAPI_BASE_PATH=/v3 -e DISABLE_API_KEY=1 -e DISABLE_OAUTH=1 -p 80:8080 openapitools/openapi-petstore
-    - run: docker pull swaggerapi/petstore
-    - run: docker run --name petstore.swagger -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
-    - run: docker ps -a
-    - run: sleep 30
-    - run: cat /etc/hosts
-    # Test
-    - run: mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-    - run: ./CI/circle_parallel.sh 
-    # Save dependency cache
-    - save_cache:
-        key: source-v2-{{ .Branch }}-{{ .Revision }}
-        paths:
-        # This is a broad list of cache paths to include many possible development environments
-        # You can probably delete some of these entries
-        - vendor/bundle
-        - ~/virtualenvs
-        - ~/.m2
-        - ~/.ivy2
-        - ~/.sbt
-        - ~/.bundle
-        - ~/.go_workspace
-        - ~/.gradle
-        - ~/.cache/bower
-        - ".git"
-        - ~/.stack
-        - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
-        - ~/R
-    # save "default" cache using the key "source-v2-"
-    - save_cache:
-        key: source-v2-
-        paths:
-        # This is a broad list of cache paths to include many possible development environments
-        # You can probably delete some of these entries
-        - vendor/bundle
-        - ~/virtualenvs
-        - ~/.m2
-        - ~/.ivy2
-        - ~/.sbt
-        - ~/.bundle
-        - ~/.go_workspace
-        - ~/.gradle
-        - ~/.cache/bower
-        - ".git"
-        - ~/.stack
-        - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
-        - ~/R
-    # Teardown
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-    # Save test results
-    - store_test_results:
-        path: /tmp/circleci-test-results
-    # Save artifacts
-    - store_artifacts:
-        path: /tmp/circleci-artifacts
-    - store_artifacts:
-        path: /tmp/circleci-test-results

.gitattributes

@@ -1,2 +1 @@
 **/*.mustache linguist-vendored=true
-* text=auto eol=lf

.github/.test/samples.json

@@ -807,7 +807,7 @@
       ]
     },
     {
-      "input": "php-mezzio-ph-petstore-server.sh",
+      "input": "php-ze-ph-petstore-server.sh",
       "matches": [
         "Server: PHP"
       ]
@@ -1244,30 +1244,6 @@
         "Client: TypeScript"
       ]
     },
-    {
-      "input": "typescript-nestjs-v6-petstore-not-provided-in-root-with-npm.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "typescript-nestjs-v6-petstore-not-provided-in-root.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "typescript-nestjs-v6-petstore-provided-in-root-with-npm.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "typescript-nestjs-v6-petstore-provided-in-root.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
     {
       "input": "typescript-node-petstore-with-npm.sh",
       "matches": [

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,16 +5,7 @@
  
 - [ ] 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.
-- [ ] Run the following to [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) and update samples:
-  ```
-  ./mvnw clean package 
-  ./bin/generate-samples.sh
-  ./bin/utils/export_docs_generators.sh
-  ``` 
-  Commit all changed files. 
-  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/).
-- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `5.3.x`, `6.0.x`
-- [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request.
+- [ ] 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/).
+- [ ] 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/actions/run-samples/action.yaml

@@ -1,19 +0,0 @@
-name: 'Run samples'
-description: 'Runs sample integration test profile with Maven'
-inputs:
-  name:
-    description: 'The Maven profile name'
-    required: true
-  goal:
-    description: 'Maven goal'
-    required: false
-    default: 'verify'
-  args:
-    description: 'Additional maven arguments'
-    required: false
-    default: ''
-runs:
-  using: "composite"
-  steps:
-    - run: mvn --no-snapshot-updates --batch-mode --quiet ${{ inputs.goal }} -P${{ inputs.name }} -Dintegration-test -Dmaven.javadoc.skip=true ${{ inputs.args }}
-      shell: bash

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"

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

@@ -24,19 +24,18 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v1
         with:
-          distribution: 'adopt'
           java-version: ${{ matrix.java }}
 
-      - uses: actions/cache@v2.1.6
+      - 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.1.6
+      - uses: actions/cache@v2
         with:
           path: |
             ~/.gradle/caches
@@ -50,7 +49,7 @@ jobs:
         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@v2.2.4
+        uses: actions/upload-artifact@v1
         if: matrix.java == '8' && matrix.os == 'ubuntu-latest'
         with:
           name: artifact
@@ -81,7 +80,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
       - name: Download build artifact
-        uses: actions/download-artifact@v2.0.10
+        uses: actions/download-artifact@v1
         with:
           name: artifact
       - name: Run Ensures Script
@@ -90,6 +89,6 @@ jobs:
           git config --global core.fileMode false
           git config --global core.safecrlf false
           git config --global core.autocrlf true
-          mvn clean package -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
-          # test with java (jersey2) client generation only as ensure-uptodate script is run in another job instead
-          ./bin/generate-samples.sh ./bin/configs/java-jersey2-8.yaml
+          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

@@ -19,7 +19,7 @@ jobs:
     # This action will "unshallow" so we have all tag info
     - name: Get latest tag
       id: tagger
-      uses: jimschubert/query-tag-action@v2
+      uses: jimschubert/query-tag-action@v1
       with:
         include: 'v*'
         exclude: '*-rc*'

.github/workflows/openapi-generator-test-results.yaml

@@ -1,19 +0,0 @@
-name: OpenAPI Generator Test Report
-
-on:
-  workflow_run:
-    workflows: ['OpenAPI Generator']
-    types:
-      - completed
-
-# separate workflow required due to https://github.com/dorny/test-reporter#recommended-setup-for-public-repositories
-jobs:
-  report:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dorny/test-reporter@v1
-        with:
-          artifact: surefire-test-results
-          name: JUnit Test results
-          path: '**/surefire-reports/TEST-*.xml'
-          reporter: java-junit

.github/workflows/openapi-generator.yaml

@@ -1,214 +0,0 @@
-name: OpenAPI Generator
-
-on:
-  push:
-    branches:
-      - master
-      - '[5-9]+.[0-9]+.x'
-  pull_request:
-    branches:
-      - master
-      - '[5-9]+.[0-9]+.x'
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 8
-      - name: Cache maven dependencies
-        uses: actions/cache@v2.1.6
-        env:
-          cache-name: cache-maven-repository
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gradle
-            !~/.gradle/caches/*/plugin-resolution/
-            !~/.m2/repository/org/openapitools/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-      - name: Run maven
-        run: mvn --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-      - run: ls -la  modules/openapi-generator-cli/target
-      - name: Upload openapi-generator-cli.jar artifact
-        uses: actions/upload-artifact@v2.2.4
-        with:
-          name: openapi-generator-cli.jar
-          path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
-          retention-days: 1
-
-  test:
-    name: Unit tests
-    runs-on: ubuntu-latest
-    needs:
-      - build
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 8
-      - name: Cache maven dependencies
-        uses: actions/cache@v2.1.6
-        env:
-          cache-name: cache-maven-repository
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gradle
-            !~/.gradle/caches/*/plugin-resolution/
-            !~/.m2/repository/org/openapitools/
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-      - name: Run unit tests
-        run: mvn --no-snapshot-updates --batch-mode --quiet --fail-at-end test -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-      - name: Publish unit test reports
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v2.2.4
-        with:
-          name: surefire-test-results
-          path: '**/surefire-reports/TEST-*.xml'
-
-  documentation:
-    name: Docs up-to-date
-    runs-on: ubuntu-latest
-    needs:
-      - build
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 8
-      - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v2.0.10
-        with:
-          name: openapi-generator-cli.jar
-          path: modules/openapi-generator-cli/target
-      - name: Generate docs
-        run: |
-          bash bin/meta-codegen.sh
-          bash bin/utils/export_docs_generators.sh
-          bash bin/utils/copy-to-website.sh
-          bash bin/utils/export_generators_readme.sh
-      - name: Verify git status
-        run: |
-          if [[ "$(git status --porcelain)" != "" ]]; then
-            echo "UNCOMMITTED CHANGES ERROR"
-            echo "There are uncommitted changes in working tree after execution of 'bin/ensure-up-to-date'"
-            echo "Perform git diff"
-            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
-          fi
-
-  samples:
-    name: Samples up-to-date
-    needs:
-      - build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 8
-      - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v2.0.10
-        with:
-          name: openapi-generator-cli.jar
-          path: modules/openapi-generator-cli/target
-      - name: Generate samples
-        run: bash bin/generate-samples.sh
-      - name: Verify git status
-        run: |
-          if [[ "$(git status --porcelain)" != "" ]]; then
-            echo "UNCOMMITTED CHANGES ERROR"
-            echo "There are uncommitted changes in working tree after execution of 'bin/generate-samples.sh'"
-            echo "Perform git diff"
-            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/generate-samples.sh' locally and commit changes (UNCOMMITTED CHANGES ERROR)"
-            exit 1
-          fi
-
-  test-maven-plugin:
-    name: Maven plugin tests
-    runs-on: ubuntu-latest
-    needs:
-      - build
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Cache maven dependencies
-        uses: actions/cache@v2.1.6
-        env:
-          cache-name: cache-maven-repository
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gradle
-            !~/.gradle/caches/*/plugin-resolution/
-            !~/.m2/repository/org/openapitools/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-maven-plugin-${{ env.cache-name }}-
-            ${{ runner.os }}-test-maven-plugin-
-      - name: Run tests
-        run: |
-          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:
-    name: Gradle plugin tests
-    runs-on: ubuntu-latest
-    needs:
-      - build
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Cache maven dependencies
-        uses: actions/cache@v2.1.6
-        env:
-          cache-name: cache-maven-repository
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gradle
-            !~/.gradle/caches/modules-2/modules-2.lock
-            !~/.gradle/caches/*/plugin-resolution/
-            !~/.m2/repository/org/openapitools/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-gradle-plugin-${{ env.cache-name }}-
-            ${{ runner.os }}-test-gradle-plugin-
-      - name: Run tests
-        run: |
-          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk)
-          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)

.github/workflows/samples-dart.yaml

@@ -1,80 +0,0 @@
-name: Samples Dart
-
-on:
-  push:
-    branches:
-      - master
-      - '[5-9]+.[0-9]+.x'
-  pull_request:
-    branches:
-      - master
-      - '[5-9]+.[0-9]+.x'
-    paths:
-      - 'samples/openapi3/client/petstore/dart*/**'
-
-jobs:
-  tests-dart-2-10:
-    name: Tests Dart 2.10
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: 8
-      - name: Cache maven dependencies
-        uses: actions/cache@v2.1.6
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gradle
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-      - name: Cache test dependencies
-        uses: actions/cache@v2.1.6
-        env:
-          cache-name: pub-cache
-        with:
-          path: $PUB_CACHE
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('samples/**/pubspec.yaml') }}
-      - uses: dart-lang/setup-dart@v1
-        with:
-          sdk: 2.10.5
-      - name: Run tests
-        uses: ./.github/actions/run-samples
-        with:
-          name: samples.dart-2.10
-
-  tests-dart-2-13:
-    name: Tests Dart 2.13
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: 8
-      - name: Cache maven dependencies
-        uses: actions/cache@v2.1.6
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gradle
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-      - name: Cache test dependencies
-        uses: actions/cache@v2.1.6
-        env:
-          cache-name: pub-cache
-        with:
-          path: $PUB_CACHE
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('samples/**/pubspec.yaml') }}
-      - uses: dart-lang/setup-dart@v1
-        with:
-          sdk: 2.13.0
-      - name: Run tests
-        uses: ./.github/actions/run-samples
-        with:
-          name: samples.dart-2.13

.github/workflows/samples-kotlin.yaml

@@ -1,66 +0,0 @@
-name: Samples Kotlin
-
-on:
-  push:
-    branches:
-      - master
-      - '[5-9]+.[0-9]+.x'
-  pull_request:
-    branches:
-      - master
-      - '[5-9]+.[0-9]+.x'
-    paths:
-      - 'samples/client/petstore/kotlin*/**'
-
-env:
-  GRADLE_VERSION: 6.9
-
-jobs:
-  build:
-    name: Build Kotlin
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          - samples/client/petstore/kotlin
-          - samples/client/petstore/kotlin-gson
-          - samples/client/petstore/kotlin-jackson
-          # needs Android configured
-          #- samples/client/petstore/kotlin-json-request-string
-          - samples/client/petstore/kotlin-jvm-okhttp4-coroutines
-          - samples/client/petstore/kotlin-moshi-codegen
-          # need some special setup
-          #- samples/client/petstore/kotlin-multiplatform
-          - samples/client/petstore/kotlin-nonpublic
-          - samples/client/petstore/kotlin-nullable
-          - samples/client/petstore/kotlin-okhttp3
-          - samples/client/petstore/kotlin-retrofit2
-          - samples/client/petstore/kotlin-retrofit2-kotlinx_serialization
-          - samples/client/petstore/kotlin-retrofit2-rx3
-          - samples/client/petstore/kotlin-string
-          - samples/client/petstore/kotlin-threetenbp
-          - samples/client/petstore/kotlin-uppercase-enum
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: 8
-      - name: Cache maven dependencies
-        uses: actions/cache@v2.1.6
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.gradle
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-      - name: Install Gradle wrapper
-        uses: eskatos/gradle-command-action@v1
-        with:
-          gradle-version: ${{ env.GRADLE_VERSION }}
-          build-root-directory: ${{ matrix.sample }}
-          arguments: wrapper
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: ./gradlew build -x test

.github/workflows/sonar.yml

@@ -10,13 +10,12 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'OpenAPITools' }}
+
     steps:
     - uses: actions/checkout@v1
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v1
       with:
-        distribution: 'adopt'
         java-version: 11
     - name: Compile with Maven
       run: mvn -B -q clean install jacoco:report

.gitignore

@@ -31,7 +31,6 @@ packages/
 .vscode/
 **/.vs
 .factorypath
-.metals/*
 
 .settings
 
@@ -176,15 +175,13 @@ samples/client/petstore/python-tornado/.venv/
 
 # PHP
 samples/client/petstore/php/OpenAPIClient-php/composer.lock
-samples/client/petstore/php-dt/composer.lock
-samples/client/petstore/php-dt-modern/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-mezzio-ph/composer.lock
-samples/server/petstore/php-mezzio-ph-modern/composer.lock
+samples/server/petstore/php-ze-ph/composer.lock
 
 # ts
 samples/client/petstore/typescript-angular2/npm/npm-debug.log
@@ -215,7 +212,6 @@ cabal.project.local
 samples/client/petstore/haskell-http-client/docs/haddock-bundle.min.js
 samples/client/petstore/haskell-http-client/docs/meta.json
 samples/client/petstore/haskell-http-client/docs/quick-jump.css
-samples/server/petstore/haskell-servant/stack.yaml.lock
 
 # R
 .Rproj.user
@@ -262,6 +258,3 @@ samples/client/petstore/c/*.so
 # Ruby
 samples/openapi3/client/petstore/ruby/Gemfile.lock
 samples/openapi3/client/petstore/ruby-faraday/Gemfile.lock
-
-# Crystal
-samples/client/petstore/crystal/lib

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip

.travis.yml

@@ -62,38 +62,21 @@ addons:
     - petstore.swagger.io
 
 before_install:
-  - sudo rm -rf /var/lib/apt/lists/*
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) edge"
-  - sudo apt-get update
-  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
-  - mkdir -vp ~/.docker/cli-plugins/
-  - curl --silent -L "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
-  - chmod a+x ~/.docker/cli-plugins/docker-buildx
-  # to run petstore server locally via docker
-  - echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin || true
-  - 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
-  # install crystal
-  - echo 'deb http://download.opensuse.org/repositories/devel:/languages:/crystal/xUbuntu_16.04/ /' | sudo tee /etc/apt/sources.list.d/devel:languages:crystal.list
-  - curl -fsSL https://download.opensuse.org/repositories/devel:languages:crystal/xUbuntu_16.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_languages_crystal.gpg > /dev/null
-  - sudo apt update
-  - sudo apt install crystal
-  - crystal --version
   - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.22.0
   - export PATH="$HOME/.yarn/bin:$PATH"
   # install rust
   - curl https://sh.rustup.rs -sSf | sh -s -- -y -v
   # required when sudo: required for the Ruby petstore tests
   - gem install bundler
-  - nvm install 12.20.0
-  - nvm use 12.20.0
   - npm install -g typescript
   - npm install -g npm
   - npm config set registry http://registry.npmjs.org/
   # set python 3.6.3 as default
   - source ~/virtualenv/python3.6/bin/activate
+  # to run petstore server locally via docker
+  - 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
@@ -139,7 +122,7 @@ before_install:
     fi;
   - pushd .; cd website; yarn install; popd
   # install Deno
-  - sh -s v1.6.2 < ./CI/deno_install.sh
+  - curl -fsSL https://deno.land/x/install/install.sh | sh -s v1.1.2
   - export PATH="$HOME/.deno/bin:$PATH"
 
 install:
@@ -157,10 +140,6 @@ install:
 script:
   # fail fast
   - set -e
-  # show docker buildx version
-  - docker buildx version
-  # fail if the template files contains tabs
-  - /bin/bash ./bin/utils/detect_tab_in_templates.sh
   # fail if the test files have changes
   - bin/utils/detect_test_file_changes.rb bin/utils/test_file_list.yaml
   # fail if templates/generators contain carriage return '\r'
@@ -209,14 +188,12 @@ after_success:
       echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin;
       export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[');
       export build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ");
-      docker buildx create --use;
+      docker build --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online;
       if [ ! -z "$TRAVIS_TAG" ]; then
-          docker buildx build --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_GENERATOR_IMAGE_NAME:latest -t $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online;
-          echo "Built and tagged $DOCKER_GENERATOR_IMAGE_NAME";
+          docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG;
       fi;
-      if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-          docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online;
-          echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME for master";
+      if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then
+          docker push $DOCKER_GENERATOR_IMAGE_NAME && echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME";
       fi;
     fi;
   ## docker: build cli image and push to Docker Hub
@@ -225,14 +202,12 @@ after_success:
       cp docker-entrypoint.sh ./modules/openapi-generator-cli;
       export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[');
       export build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ");
-      docker buildx create --use;
-      docker buildx build --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli;
+      docker build --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli;
       if [ ! -z "$TRAVIS_TAG" ]; then
-          docker buildx build --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli;
-          echo "Built and tagged $DOCKER_GENERATOR_IMAGE_NAME";
+          docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG;
       fi;
-      if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-          docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli;
+      if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then
+          docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME;
           echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME";
       fi;
     fi;

CI/.drone.yml

@@ -1,25 +1,7 @@
 kind: pipeline
 name: default
+
 steps:
-# test Java 11 HTTP client
-- name: java11-test
-  image: openjdk:11.0
-  commands:
-  - ./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
-  - ./mvnw clean test -f samples/client/petstore/java/native-async/pom.xml
-  - ./mvnw clean test -f samples/openapi3/client/petstore/java/native/pom.xml
-  # test all generators with fake petstore spec (2.0, 3.0)
-  - /bin/bash bin/utils/test-fake-petstore-for-all.sh
-  # generate test scripts
-  - /bin/bash bin/tests/run-all-test
-# test nim client
-- name: nim-client-test
-  image: nimlang/nim
-  commands:
-  - (cd samples/client/petstore/nim/ && nim c sample_client.nim)
 # test protobuf schema generator
 - name: protobuf-schema-test
   image: nanoservice/protobuf-go
@@ -50,12 +32,22 @@ steps:
 - name: haskell-client-test
   image: haskell:8.6.5
   commands:
-  - (cd samples/client/petstore/haskell-http-client/ && stack --allow-different-user --install-ghc --no-haddock-deps haddock --fast && stack --allow-different-user test --fast)
-# test erlang client and server
-- name: erlang
-  image: erlang:alpine
+  - (cd samples/client/petstore/haskell-http-client/ && stack --install-ghc --no-haddock-deps haddock --fast && stack test --fast)
+# test Java 11 HTTP client
+- name: java11-test
+  image: openjdk:11.0
   commands:
-  - (cd samples/client/petstore/erlang-client && rebar3 compile)
-  - (cd samples/client/petstore/erlang-proper && rebar3 compile)
-  # comment out as the tests pass locally but not in the CI
-  #- (cd samples/server/petstore/erlang-server && rebar3 compile)
+  - ./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
+  - ./mvnw clean test -f samples/client/petstore/java/native-async/pom.xml
+  - ./mvnw clean test -f samples/openapi3/client/petstore/java/native/pom.xml
+  # test all generators with fake petstore spec (2.0, 3.0)
+  - /bin/bash bin/utils/test-fake-petstore-for-all.sh
+  # generate test scripts
+  - /bin/bash bin/tests/run-all-test
+  # generate all petstore samples (client, servers, doc)
+  - /bin/bash bin/generate-samples.sh
+  # generate all petstore samples (openapi3)
+  - /bin/bash bin/generate-samples.sh bin/configs/other/*.yaml

CI/bitrise.yml

@@ -0,0 +1,51 @@
+---
+format_version: '8'
+default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
+project_type: other
+trigger_map:
+- push_branch: "*"
+  workflow: primary
+- pull_request_source_branch: "*"
+  workflow: primary
+workflows:
+  primary:
+    steps:
+    - git-clone@4.0.17: {}
+    - brew-install@0.10.2:
+        inputs:
+        - packages: maven
+    - script@1.1.6:
+        title: Install Cocoapods
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+
+            sudo gem install cocoapods
+    - script@1.1.6:
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+
+            set -e
+
+            mvn --no-snapshot-updates package -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+        title: Build openapi-generator
+    - script@1.1.6:
+        title: Update Swift samples
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+
+            set -e
+
+            bin/generate-samples.sh ./bin/configs/other/swift5-*
+    - script@1.1.6:
+        title: Run Swift5 tests
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+
+            set -e
+
+            ./samples/client/test/swift5/swift5_test_all.sh
+

CI/circle_parallel.sh

@@ -24,19 +24,30 @@ if [ "$NODE_INDEX" = "1" ]; then
   ls -l /home/circleci/.ivy2/cache
 
 elif [ "$NODE_INDEX" = "2" ]; then
+  # run ensure-up-to-date sample script on SNAPSHOT version only
+  project_version=`mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout`
+  if [[ $project_version == *"-SNAPSHOT" ]]; then
+    echo "Running node $NODE_INDEX to test ensure-up-to-date"
+    java -version
+
+    # clear any changes to the samples
+    git checkout -- .
+
+    # look for outdated samples
+    ./bin/utils/ensure-up-to-date
+  fi
   echo "Running node $NODE_INDEX to test haskell"
   # install haskell
   curl -sSL https://get.haskellstack.org/ | sh
   stack upgrade
   stack --version
-  # prepare r
+  # install r
   sudo sh -c 'echo "deb http://cran.rstudio.com/bin/linux/ubuntu trusty/" >> /etc/apt/sources.list'
   gpg --keyserver keyserver.ubuntu.com --recv-key E084DAB9
   gpg -a --export E084DAB9 | sudo apt-key add -
   sudo apt-get update
   sudo apt-get -y install r-base
   R --version
-
   # install curl
   sudo apt-get -y build-dep libcurl4-gnutls-dev
   sudo apt-get -y install libcurl4-gnutls-dev
@@ -55,6 +66,15 @@ else
   export PATH="/usr/local/go1.14/go/bin:$PATH"
   go version
 
+  # install dart2
+  sudo apt-get update
+  sudo apt-get install apt-transport-https
+  sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -'
+  sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list'
+  sudo apt-get update
+  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
 fi

CI/deno_install.sh

@@ -1,52 +0,0 @@
-#!/bin/sh
-# Copyright 2019 the Deno authors. All rights reserved. MIT license.
-# TODO(everyone): Keep this script simple and easily auditable.
-
-set -e
-
-if ! command -v unzip >/dev/null; then
-	echo "Error: unzip is required to install Deno (see: https://github.com/denoland/deno_install#unzip-is-required)." 1>&2
-	exit 1
-fi
-
-if [ "$OS" = "Windows_NT" ]; then
-	target="x86_64-pc-windows-msvc"
-else
-	case $(uname -s) in
-	Darwin) target="x86_64-apple-darwin" ;;
-	*) target="x86_64-unknown-linux-gnu" ;;
-	esac
-fi
-
-if [ $# -eq 0 ]; then
-	deno_uri="https://github.com/denoland/deno/releases/latest/download/deno-${target}.zip"
-else
-	deno_uri="https://github.com/denoland/deno/releases/download/${1}/deno-${target}.zip"
-fi
-
-deno_install="${DENO_INSTALL:-$HOME/.deno}"
-bin_dir="$deno_install/bin"
-exe="$bin_dir/deno"
-
-if [ ! -d "$bin_dir" ]; then
-	mkdir -p "$bin_dir"
-fi
-
-curl --fail --location --progress-bar --output "$exe.zip" "$deno_uri"
-unzip -d "$bin_dir" -o "$exe.zip"
-chmod +x "$exe"
-rm "$exe.zip"
-
-echo "Deno was installed successfully to $exe"
-if command -v deno >/dev/null; then
-	echo "Run 'deno --help' to get started"
-else
-	case $SHELL in
-	/bin/zsh) shell_profile=".zshrc" ;;
-	*) shell_profile=".bash_profile" ;;
-	esac
-	echo "Manually add the directory to your \$HOME/$shell_profile (or similar)"
-	echo "  export DENO_INSTALL=\"$deno_install\""
-	echo "  export PATH=\"\$DENO_INSTALL/bin:\$PATH\""
-	echo "Run '$exe --help' to get started"
-fi

CONTRIBUTING.md

@@ -48,9 +48,7 @@ Code change should conform to the programming style guide of the respective lang
 - C#: https://msdn.microsoft.com/en-us/library/vstudio/ff926074.aspx
 - C++: https://google.github.io/styleguide/cppguide.html
 - C++ (Tizen): https://wiki.tizen.org/Native_Platform_Coding_Idiom_and_Style_Guide#C.2B.2B_Coding_Style
-- C++ (Unreal Engine 4): https://docs.unrealengine.com/en-US/ProductionPipelines/DevelopmentSetup/CodingStandard/index.html
 - Clojure: https://github.com/bbatsov/clojure-style-guide
-- Crystal: https://crystal-lang.org/reference/conventions/coding_style.html
 - Dart: https://www.dartlang.org/guides/language/effective-dart/style
 - Elixir: https://github.com/christopheradams/elixir_style_guide
 - Eiffel: https://www.eiffel.org/doc/eiffel/Coding%20Standards
@@ -88,10 +86,12 @@ To add test cases (optional) covering the change in the code generator, please r
 
 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`.
+- 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)
-- Finally, git commit the updated samples files: `git commit -a` (`git add -A` if added files with new test cases)
+- 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)
 
 To start the CI tests, you can:

README.md

@@ -3,35 +3,21 @@
 
 <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)](https://opencollective.com/openapi_generator) [![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)
+[![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)
 
 </div>
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`5.2.1`):
-[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-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)
-[![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)
+[![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)
 
-
-[5.3.x](https://github.com/OpenAPITools/openapi-generator/tree/5.3.x) (`5.3.x`):
-[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/5.3.x.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator)
-[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/5.3.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
-[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=5.3.x&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator)
-[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/5.3.x)](https://cloud.drone.io/OpenAPITools/openapi-generator)
-[![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/5.3.x?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67)
-
-[6.0.x](https://github.com/OpenAPITools/openapi-generator/tree/6.0.x) (`6.0.x`):
-[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/6.0.x.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator)
-[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/6.0.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
-[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=6.0.x&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator)
-[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/6.0.x)](https://cloud.drone.io/OpenAPITools/openapi-generator)
-[![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/6.0.x?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67)
-
 </div>
 
 <div align="center">
@@ -61,7 +47,6 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [<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)
-[<img src="https://openapi-generator.tech/img/companies/apideck.jpg" width="128" height="128">](https://www.apideck.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
 
@@ -75,11 +60,11 @@ 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, .NET 5.0. Libraries: RestSharp, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **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** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 11.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) |
-| **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **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, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, 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**, **Markdown**, **PlantUML**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| **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) |
+| **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/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| **Others**                       | **GraphQL**, **JMeter**, **MySQL Schema**, **Protocol Buffer**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 
 ## Table of contents
 
@@ -117,11 +102,9 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 6.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/) | Nov/Dec 2021   | Minor release with breaking changes (no fallback) |
-| 5.3.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.3.0-SNAPSHOT/) | Aug/Sep 2021   | Minor release with breaking changes (with fallback) |
-| 5.2.1 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.2.1-SNAPSHOT/) | 09.08.2021   | Patch release (enhancements, bug fixes, etc) |
-| [5.2.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.2.0) (latest stable release)                                                    | 09.07.2021   | Minor release with breaking changes (with fallback) |
-| [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |
+| 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](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0-beta3) (latest beta release) | 20.11.2020   | Major beta 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
 
@@ -177,16 +160,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.2.0/openapi-generator-cli-5.2.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta3/openapi-generator-cli-5.0.0-beta3.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.0/openapi-generator-cli-5.2.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta3/openapi-generator-cli-5.0.0-beta3.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.2.0/openapi-generator-cli-5.2.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta3/openapi-generator-cli-5.0.0-beta3.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -278,7 +261,7 @@ To reinstall with the latest master, run `brew uninstall openapi-generator && br
 To install OpenJDK (pre-requisites), please run
 ```sh
 brew tap AdoptOpenJDK/openjdk
-brew install --cask adoptopenjdk12
+brew cask install adoptopenjdk12
 export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-12.0.2.jdk/Contents/Home/
 ```
 
@@ -411,7 +394,7 @@ openapi-generator-cli version
 To use a specific version of "openapi-generator-cli"
 
 ```sh
-openapi-generator-cli version-manager set 5.2.0
+openapi-generator-cli version-manager set 4.3.1
 ```
 
 Or install it as dev-dependency:
@@ -435,7 +418,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
 (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`)
 
 <!-- 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.2.0/openapi-generator-cli-5.2.0.jar)
+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-beta3/openapi-generator-cli-5.0.0-beta3.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`
@@ -448,10 +431,10 @@ To get a list of PHP specified options (which can be passed to the generator wit
 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:
 
 ```sh
-./bin/generate-samples.sh ./bin/configs/java-okhttp-gson.yaml
+./bin/java-petstore-okhttp-gson.sh
 ```
 
-(On Windows, please install [GIT Bash for Windows](https://gitforwindows.org/) to run the command above)
+(On Windows, run `.\bin\windows\java-petstore-okhttp-gson.bat` instead)
 
 This script uses the default library, which is `okhttp-gson`. It will run the generator with this command:
 
@@ -459,8 +442,6 @@ This script uses the default library, which is `okhttp-gson`. It will run the ge
 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 java \
-  -t modules/openapi-generator/src/main/resources/Java \
-  --additional-properties artifactId=petstore-okhttp-gson,hideGenerationTimestamp:true \
   -o samples/client/petstore/java/okhttp-gson
 ```
 
@@ -526,7 +507,13 @@ cd samples/client/petstore/java/okhttp-gson
 mvn package
 ```
 
-Other generators have [samples](https://github.com/OpenAPITools/openapi-generator/tree/master/samples) too.
+Other languages have petstore samples, too:
+
+- [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.
 
 ### [3.1 - Customization](#table-of-contents)
 
@@ -560,7 +547,7 @@ When code is generated from this project, it shall be considered **AS IS** and o
 
 ### [3.5 - IDE Integration](#table-of-contents)
 
-Here is a list of community-contributed IDE plug-ins that integrate with OpenAPI Generator:
+Here is a list of community-conitributed IDE plug-ins that integrate with OpenAPI Generator:
 
 - Eclipse: [Codewind OpenAPI Tools for Eclipse](https://www.eclipse.org/codewind/open-api-tools-for-eclipse.html) by [IBM](https://www.ibm.com)
 - IntelliJ IDEA: [OpenAPI Generator](https://plugins.jetbrains.com/plugin/8433-openapi-generator) by [Jim Schubert](https://jimschubert.us/#/)
@@ -573,7 +560,6 @@ Here is a list of community-contributed IDE plug-ins that integrate with OpenAPI
 ## [4 - Companies/Projects using OpenAPI Generator](#table-of-contents)
 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.
 
-- [Aalborg University](https://www.aau.dk)
 - [Adaptant Solutions AG](https://www.adaptant.io/)
 - [adesso SE](https://www.adesso.de/)
 - [Agoda](https://www.agoda.com/)
@@ -599,7 +585,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Cupix](https://www.cupix.com/)
 - [Datadog](https://www.datadoghq.com)
 - [DB Systel](https://www.dbsystel.de)
-- [Devsupply](https://www.devsupply.com/)
 - [DocSpring](https://docspring.com/)
 - [dwango](https://dwango.co.jp/)
 - [Edge Impulse](https://www.edgeimpulse.com/)
@@ -615,11 +600,9 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [GetYourGuide](https://www.getyourguide.com/)
 - [GMO Pepabo](https://pepabo.com/en/)
 - [GoDaddy](https://godaddy.com)
-- [Gumtree](https://gumtree.com)
 - [Here](https://developer.here.com/)
 - [IBM](https://www.ibm.com/)
 - [Instana](https://www.instana.com)
-- [Inquisico](https://inquisico.com)
 - [JustStar](https://www.juststarinfo.com)
 - [k6.io](https://k6.io/)
 - [Klarna](https://www.klarna.com/)
@@ -627,7 +610,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Kubernetes](https://kubernetes.io)
 - [Linode](https://www.linode.com/)
 - [Logicdrop](https://www.logicdrop.com)
-- [Lumeris](https://www.lumeris.com)
 - [LVM Versicherungen](https://www.lvm.de)
 - [MailSlurp](https://www.mailslurp.com)
 - [Médiavision](https://www.mediavision.fr/)
@@ -635,14 +617,12 @@ 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/)
-- [Neverfail](https://www.neverfail.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](https://plaid.com)
 - [PLAID, Inc.](https://plaid.co.jp/)
 - [Ponicode](https://ponicode.dev/)
 - [Pricefx](https://www.pricefx.com/)
@@ -661,21 +641,17 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Stingray](http://www.stingray.com)
 - [Suva](https://www.suva.ch/)
 - [Telstra](https://dev.telstra.com)
-- [The University of Aizu](https://www.u-aizu.ac.jp/en/)
 - [TravelTime platform](https://www.traveltimeplatform.com/)
 - [TribalScale](https://www.tribalscale.com)
 - [TUI InfoTec GmbH](http://www.tui-infotec.com/)
-- [Twitter](https://twitter.com)
 - [unblu inc.](https://www.unblu.com/)
 - [Veamly](https://www.veamly.com/)
-- [VMWare](https://www.vmware.com/)
 - [wbt-solutions](https://www.wbt-solutions.de/)
 - [Woleet](https://www.woleet.io/)
 - [WSO2](https://wso2.com/)
 - [Vouchery.io](https://vouchery.io)
 - [Xero](https://www.xero.com/)
 - [Yahoo Japan](https://www.yahoo.co.jp/)
-- [viadee](https://www.viadee.de/)
 - [Vonage](https://vonage.com)
 - [YITU Technology](https://www.yitutech.com/)
 - [Yelp](https://www.yelp.com/)
@@ -791,7 +767,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 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-12 - [Interoperability by construction: code generation for Arrowhead Clients](https://ieeexplore.ieee.org/document/9274746) by Michele Albano, Brian Nielsen at [2020 IEEE Conference on Industrial Cyberphysical Systems (ICPS)](https://ieeexplore.ieee.org/xpl/conhome/9274544/proceeding)
 - 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/)
@@ -811,25 +786,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2020-10-31 - [[B2] OpenAPI Specification으로 타입-세이프하게 API 개발하기: 희망편 VS 절망편](https://www.youtube.com/watch?v=J4JHLESAiFk) by 최태건 at [FEConf 2020](https://2020.feconf.kr/)
 - 2020-11-05 - [Automated REST-Api Code Generation: Wie IT-Systeme miteinander sprechen](https://www.massiveart.com/blog/automated-rest-api-code-generation-wie-it-systeme-miteinander-sprechen) by Stefan Rottensteiner at [MASSIVE ART Blog](https://www.massiveart.com/blog)
 - 2020-12-01 - [OpenAPI GeneratorでGoのAPIサーバー/クライアントコードを自動生成する](https://qiita.com/saki-engineering/items/b20d8b6074c4da9664a5) by [@saki-engineering](https://qiita.com/saki-engineering)
-- 2020-12-04 - [Scaling the Test Coverage of OpenAPI Generator for 30+ Programming Languages](https://www.youtube.com/watch?v=7Lke9dHRqT0) by [William Cheng](https://github.com/wing328) at [Open Source Summit Japan + Automotive Linux Summit 2020](https://events.linuxfoundation.org/archive/2020/open-source-summit-japan/) ([Slides](https://speakerdeck.com/wing328/scaling-the-test-coverage-of-openapi-generator-for-30-plus-programming-languages))
-- 2020-12-09 - [プロジェクトにOpenAPI Generatorで自動生成された型付きAPI Clientを導入した話](https://qiita.com/yoshifujiT/items/905c18700ede23f40840) by [@yoshifujiT](https://github.com/yoshifujiT)
-- 2020-12-15 - [Next.js + NestJS + GraphQLで変化に追従するフロントエンドへ 〜 ショッピングクーポンの事例紹介](https://techblog.yahoo.co.jp/entry/2020121530052952/) by [小倉 陸](https://github.com/ogugu9) at [Yahoo! JAPAN Tech Blog](https://techblog.yahoo.co.jp/)
-- 2021-01-08 - [Hello, New API – Part 1](https://www.nginx.com/blog/hello-new-api-part-1/) by [Jeremy Schulman](https://www.nginx.com/people/jeremy-schulman/) at [Major League Baseball](https://www.mlb.com)
-- 2021-01-18 - [「アプリ開発あるある」を疑うことから始まった、API Clientコードの自動生成【デブスト2020】](https://codezine.jp/article/detail/13406?p=2) by [CodeZine編集部](https://codezine.jp/author/1)
-- 2021-02-05 - [REST-API-Roundtrip with SpringDoc and OpenAPI Generator](https://blog.viadee.de/en/rest-api-roundtrip) by [Benjamin Klatt](https://twitter.com/benklatt) at [viadee](https://www.viadee.de/en/)
-- 2021-02-17 - [REST-API-Roundtrip with SpringDoc and OpenAPI Generator](https://medium.com/nerd-for-tech/rest-api-roundtrip-with-springdoc-and-openapi-generator-30bd27ccf698) by [cloud @viadee](https://cloud-viadee.medium.com/)
-- 2021-03-08 - [OpenAPI Generator 工具的躺坑尝试](https://blog.csdn.net/u013019701/article/details/114531975) by [独家雨天](https://blog.csdn.net/u013019701) at [CSDN官方博客](https://blog.csdn.net/) 
-- 2021-03-16 - [如何基于 Swagger 使用 OpenAPI Generator 生成 JMeter 脚本？](https://cloud.tencent.com/developer/article/1802704) by [高楼Zee](https://cloud.tencent.com/developer/user/5836255) at [腾讯云专栏](https://cloud.tencent.com/developer/column)
-- 2021-03-24 - [openapi-generator-cli による TypeScript 型定義](https://zenn.dev/takepepe/articles/openapi-generator-cli-ts) by [Takefumi Yoshii](https://zenn.dev/takepepe)
-- 2021-03-28 - [Trying out NestJS part 4: Generate Typescript clients from OpenAPI documents](https://dev.to/arnaudcortisse/trying-out-nestjs-part-4-generate-typescript-clients-from-openapi-documents-28mk) by [Arnaud Cortisse](https://dev.to/arnaudcortisse) 
-- 2021-03-31 - [Open API Server Implementation Using OpenAPI Generator](https://www.baeldung.com/java-openapi-generator-server) at [Baeldung](https://www.baeldung.com/)
-- 2021-03-31 - [使用OpenAPI Generator實現Open API Server](https://www.1ju.org/article/java-openapi-generator-server) at [億聚網](https://www.1ju.org/)
-- 2021-04-19 - [Introducing Twilio’s OpenAPI Specification Beta](https://www.twilio.com/blog/introducing-twilio-open-api-specification-beta) by [GARETH PAUL JONES](https://www.twilio.com/blog/author/gpj) at [Twilio Blog](https://www.twilio.com/blog)
-- 2021-04-22 - [Leveraging OpenApi strengths in a Micro-Service environment](https://medium.com/unibuddy-technology-blog/leveraging-openapi-strengths-in-a-micro-service-environment-3d7f9e7c26ff) by Nicolas Jellab at [Unibuddy Technology Blog](https://medium.com/unibuddy-technology-blog)
-- 2021-04-27 - [From zero to publishing PowerShell API clients in PowerShell Gallery within minutes](https://speakerdeck.com/wing328/from-zero-to-publishing-powershell-api-clients-in-powershell-gallery-within-minutes) by [William Cheng](https://github.com/wing328) at [PowerShell + DevOps Global Summit 2021](https://events.devopscollective.org/event/powershell-devops-global-summit-2021/)
-- 2021-05-31 - [FlutterでOpen Api Generator(Swagger)を使う](https://aakira.app/blog/2021/05/flutter-open-api/) by [AAkira](https://twitter.com/_a_akira)
-- 2021-06-22 - [Rest API Documentation and Client Generation With OpenAPI](https://dzone.com/articles/rest-api-documentation-and-client-generation-with) by [Prasanth Gullapalli](https://dzone.com/users/1011797/prasanthnath.g@gmail.com.html) 
-- 2021-07-16 - [銀行事業のサーバーサイド開発について / LINE 京都開発室 エンジニア採用説明会](https://www.youtube.com/watch?v=YrrKQHxLPpQ) by 野田誠人, Robert Mitchell
 
 ## [6 - About Us](#table-of-contents)
 
@@ -859,19 +815,16 @@ Here is a list of template creators:
    * Bash: @bkryza
    * C: @PowerOfCreation @zhemant [:heart:](https://www.patreon.com/zhemant)
    * C++ REST: @Danielku15
-   * C++ Tiny: @AndersSpringborg @kaareHH @michelealbano @mkakbas 
    * C++ UE4: @Kahncode
    * C# (.NET 2.0): @who
    * C# (.NET Standard 1.3 ): @Gronsak
    * C# (.NET 4.5 refactored): @jimschubert [:heart:](https://www.patreon.com/jimschubert)
-   * C# (HttpClient): @Blackclaws 
    * Clojure: @xhh
-   * Crystal: @wing328
    * Dart: @yissachar
    * Dart (refactor): @joernahrens
    * Dart 2: @swipesight
    * Dart (Jaguar): @jaumard
-   * Dart (Dio): @josh-burton
+   * Dart (Dio): @athornz
    * Elixir: @niku
    * Elm: @eriktim
    * Eiffel: @jvelilla
@@ -905,7 +858,6 @@ Here is a list of template creators:
    * OCaml: @cgensoul
    * Perl: @wing328 [:heart:](https://www.patreon.com/wing328)
    * PHP (Guzzle): @baartosz
-   * PHP (with Data Transfer): @Articus
    * PowerShell: @beatcracker
    * PowerShell (refactored in 5.0.0): @wing328
    * Python: @spacether
@@ -926,11 +878,10 @@ Here is a list of template creators:
    * TypeScript (Angular7): @topce
    * TypeScript (Axios): @nicokoenig
    * TypeScript (Fetch): @leonyu
-   * TypeScript (Inversify): @gualtierim
    * TypeScript (jQuery): @bherila
-   * TypeScript (Nestjs): @vfrank66
    * TypeScript (Node):  @mhardorf
    * TypeScript (Rxjs): @denyo
+   * TypeScript (Inversify): @gualtierim
    * TypeScript (redux-query): @petejohansonxo
  * Server Stubs
    * Ada: @stcarrez
@@ -944,7 +895,6 @@ Here is a list of template creators:
    * Erlang Server: @galaxie
    * F# (Giraffe) Server: @nmfisher
    * Go Server: @guohuang
-   * Go (Echo) Server: @ph4r5h4d
    * Go (Gin) Server: @kemokemo
    * GraphQL Express Server: @renepardon
    * Haskell Servant: @algas
@@ -964,11 +914,9 @@ Here is a list of template creators:
    * NodeJS Express: @YishTish
    * PHP Laravel: @renepardon
    * PHP Lumen: @abcsun
-   * PHP Mezzio (with Path Handler): @Articus
    * PHP Slim: @jfastnacht
-   * PHP Slim4: @ybelenko
    * PHP Symfony: @ksm2
-   * Python FastAPI: @krjakbrjak
+   * PHP Zend Expressive (with Path Handler): @Articus
    * Python AIOHTTP: @Jyhess
    * Ruby on Rails 5: @zlx
    * Rust (rust-server): @metaswitch
@@ -987,10 +935,8 @@ Here is a list of template creators:
  * Schema
    * Avro: @sgadouar
    * GraphQL: @wing328 [:heart:](https://www.patreon.com/wing328)
-   * Ktorm: @Luiz-Monad
    * MySQL: @ybelenko
    * Protocol Buffer: @wing328
-   * WSDL @adessoDpd
 
 :heart: = Link to support the contributor directly
 
@@ -1023,7 +969,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 
 #### Members of Technical Committee
 
-| Languages/Generators         | Member (join date)                                                                                                                                                                                                                |
+| Languages         | Member (join date)                                                                                                                                                                                                                |
 | :---------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | ActionScript      |                                                                                                                                                                                                                                   |
 | Ada               | @stcarrez (2018/02) @michelealbano (2018/02)                                                                                                                                                                                        |
@@ -1032,20 +978,19 @@ 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) @Blackclaws (2021/03) @lucamazzanti (2021/05)                                                                               |
+| C#                | @mandrean (2017/08) @frankyjuang (2019/09) @shibayan (2020/02)                                                                                             |
 | Clojure           |                                                                                                                                                                                                                                   |
-| Dart              | @jaumard (2018/09) @josh-burton (2019/12) @amondnet (2019/12) @sbu-WBT (2020/12) @kuhnroyal (2020/12) @agilob (2020/12)                                                                                                      |
+| Dart              | @ircecho (2017/07) @swipesight (2018/09) @jaumard (2018/09) @athornz (2019/12) @amondnet (2019/12)                                                                                                        |
 | Eiffel            | @jvelilla (2017/09)                                                                                                                                                                                                               |
 | Elixir            | @mrmstn (2018/12)                                                                                                                                                                                                                 |
 | 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) @jirikuncar (2021/01) @ph4r5h4d (2021/04)                                                                                                                                   |
+| Go                | @antihax (2017/11) @grokify (2018/07) @kemokemo (2018/09) @bkabrda (2019/07)                                                                                                                                   |
 | GraphQL           | @renepardon (2018/12)                                                                                                                                                                                                             |
 | Groovy            |                                                                                                                                                                                                                                   |
 | Haskell           |                                                                                                                                                                                                                                   |
-| Java              | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @nmuesch (2021/01)                          |
-| JMeter               | @kannkyo (2021/01)                                                                                                                                                                                                            |
+| Java              | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @bkabrda (2020/01)                          |
 | Kotlin            | @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)                                                        |
 | Lua               | @daurnimator (2017/08)                                                                                                                                                                                                            |
 | Nim               |                                                                                                                                                                                                                                   |
@@ -1083,7 +1028,7 @@ OpenAPI Generator is a fork of [Swagger Codegen](https://github.com/swagger-api/
 - [Daniel](https://github.com/Danielku15)
 - [Emiliano Bonassi](https://github.com/emilianobonassi)
 - [Erik Timmers](https://github.com/eriktim)
-- [Esteban Gehring](https://github.com/macjohnny)
+- [Esteban Marin](https://github.com/macjohnny)
 - [Gustavo Paz](https://github.com/gustavoapaz)
 - [Javier Velilla](https://github.com/jvelilla)
 - [Jean-François Côté](https://github.com/JFCote)

appveyor.yml

@@ -29,34 +29,17 @@ install:
   - cmd: java -version
   - cmd: gradle -v
   - cmd: dir/w
-  - git clone https://github.com/wing328/swagger-samples --depth 1
+  - git clone https://github.com/wing328/swagger-samples
   - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"
-  - ps: Start-Sleep -s 15
   - ps: $PSVersionTable.PSVersion
-  - ps: Install-Module -Name Pester -Force -Scope CurrentUser
+  - ps: Install-Module Pester -Force -Scope CurrentUser
 build_script:
   - dotnet --info
-  # build C# aspnetcore 5.0 server
-  - dotnet build samples\server\petstore\aspnetcore-5.0\Org.OpenAPITools.sln
-  # build C# aspnetcore 3.1 server
-  - dotnet build samples\server\petstore\aspnetcore-3.1\Org.OpenAPITools.sln
-  # build C# aspnetcore 3.0 server
-  - dotnet build samples\server\petstore\aspnetcore-3.0\Org.OpenAPITools.sln
-  # build C# aspnetcore 2.2 server
-  - dotnet build samples\server\petstore\aspnetcore\Org.OpenAPITools.sln
-  # build C# API client (multiple frameworks)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln
-  # build C# API client (httpclient)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\Org.OpenAPITools.sln
   # 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 (.net 5.0)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\Org.OpenAPITools.sln
-  # build C# API client (.net 5.0 with ConditionalSerialization)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\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"
@@ -71,19 +54,11 @@ build_script:
   # 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 (multiple frameworks)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  # test c# API client (httpclient)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # 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
-  # test C# API client (.net 5.0)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  # test C# API Client using conditional-serialization
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\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/aspnetcore-2.2.yaml

@@ -1,7 +0,0 @@
-generatorName: aspnetcore
-outputDir: samples/server/petstore/aspnetcore
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/aspnetcore/2.1
-additionalProperties:
-  packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
-  aspnetCoreVersion: "2.2"

bin/configs/aspnetcore-5.0.yaml

@@ -1,7 +0,0 @@
-generatorName: aspnetcore
-outputDir: samples/server/petstore/aspnetcore-5.0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
-additionalProperties:
-  packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
-  aspnetCoreVersion: "5.0"

bin/configs/cpp-qt-client.yaml

@@ -1,7 +0,0 @@
-generatorName: cpp-qt-client
-outputDir: samples/client/petstore/cpp-qt
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-qt-client
-additionalProperties:
-  cppNamespace: test_namespace
-  modelNamePrefix: PFX

bin/configs/cpp-qt-qhttpengine-server.yaml

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

bin/configs/cpp-qt5-qhttpengine-server.yaml

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

bin/configs/cpp-tiny.yaml

@@ -1,7 +0,0 @@
-generatorName: cpp-tiny
-outputDir: samples/client/petstore/cpp-tiny
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-tiny
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  controller: "esp32"

bin/configs/crystal.yaml

@@ -1,9 +0,0 @@
-generatorName: crystal
-outputDir: samples/client/petstore/crystal
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/crystal
-additionalProperties:
-  shardVersion: 1.0.0
-  moduleName: Petstore
-  shardName: petstore
-strictSpecBehavior: false

bin/configs/csharp-OpenAPIClient.yaml

@@ -1,6 +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
-templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'

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

@@ -1,12 +0,0 @@
-# for .net standard httpclient
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient
-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
-library: httpclient
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
-  targetFramework: netstandard2.0

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

@@ -1,11 +0,0 @@
-# for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0
-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: net5.0

bin/configs/csharp-netcore-OpenAPIClientCoreAndNet47.yaml

@@ -1,8 +0,0 @@
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  targetFramework: netstandard2.1;netcoreapp3.0
-  useCompareNetObjects: "true"

bin/configs/csharp-netcore-OpenAPIClient_ConditionalSerialization.yaml

@@ -1,12 +0,0 @@
-# for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization
-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: '{fa96c953-af24-457d-8a01-f2fd2a7547a9}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
-  targetFramework:  netstandard2.0
-  conditionalSerialization: true

bin/configs/dart-dio-next-petstore-client-lib-fake.yaml

@@ -1,10 +0,0 @@
-generatorName: dart-dio-next
-outputDir: samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
-typeMappings:
-  Client: "ModelClient"
-  File: "ModelFile"
-  EnumClass: "ModelEnumClass"
-additionalProperties:
-  hideGenerationTimestamp: "true"

bin/configs/dart-dio-petstore-client-lib-fake.yaml

@@ -2,9 +2,5 @@ generatorName: dart-dio
 outputDir: samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/dart-dio
-typeMappings:
-  Client: "ModelClient"
-  File: "ModelFile"
-  EnumClass: "ModelEnumClass"
 additionalProperties:
   hideGenerationTimestamp: "true"

bin/configs/dart-dio-petstore-client-lib-oas2.yaml

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

bin/configs/dart-jaguar-openapi-flutter.yaml

@@ -0,0 +1,7 @@
+generatorName: dart-jaguar
+outputDir: samples/client/petstore/dart-jaguar/flutter_petstore/openapi
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/dart-jaguar
+additionalProperties:
+  pubName: openapi
+  hideGenerationTimestamp: "true"

bin/configs/dart-jaguar-openapi-flutter_proto.yaml

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

bin/configs/dart-jaguar-openapi.yaml

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

bin/configs/dart-jaguar-openapi_proto.yaml

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

bin/configs/dart-petstore-client-lib-fake.yaml

@@ -2,8 +2,5 @@ generatorName: dart
 outputDir: samples/openapi3/client/petstore/dart2/petstore_client_lib_fake
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/dart2
-typeMappings:
-  Client: "ModelClient"
-  File: "ModelFile"
 additionalProperties:
   hideGenerationTimestamp: "true"

bin/configs/dart-petstore-client-lib-oas2.yaml

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

bin/configs/dart-petstore-json-serializable-client-lib-fake.yaml

@@ -1,10 +0,0 @@
-generatorName: dart
-outputDir: samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart2
-typeMappings:
-  Client: "ModelClient"
-  File: "ModelFile"
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  serializationLibrary: json_serializable

bin/configs/elixir.yaml

@@ -1,6 +1,6 @@
 generatorName: elixir
 outputDir: samples/client/petstore/elixir
-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/elixir
 additionalProperties:
   invokerPackage: OpenapiPetstore

bin/configs/go-echo-server-petstore-new.yaml

@@ -1,6 +0,0 @@
-generatorName: go-echo-server
-outputDir: samples/server/petstore/go-echo-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/go-echo-server
-additionalProperties:
-  hideGenerationTimestamp: "true"

bin/configs/go-server-chi-api-server.yaml

@@ -1,9 +0,0 @@
-generatorName: go-server
-outputDir: samples/server/petstore/go-chi-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/go-server
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  packageName: petstoreserver
-  addResponseHeaders: true
-  router: "chi"

bin/configs/go-server-go-api-server.yaml

@@ -5,4 +5,3 @@ templateDir: modules/openapi-generator/src/main/resources/go-server
 additionalProperties:
   hideGenerationTimestamp: "true"
   packageName: petstoreserver
-  addResponseHeaders: true

bin/configs/go-server-required.yaml

@@ -1,9 +0,0 @@
-generatorName: go-server
-outputDir: samples/server/petstore/go-server-required
-inputSpec: modules/openapi-generator/src/test/resources/3_0/server-required.yaml
-templateDir: modules/openapi-generator/src/main/resources/go-server
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  packageName: petstoreserver
-  addResponseHeaders: true
-  router: "chi"

bin/configs/java-feign.yaml

@@ -1,7 +1,7 @@
 generatorName: java
 outputDir: samples/client/petstore/java/feign
 library: feign
-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/Java
 additionalProperties:
   booleanGetterPrefix: is

bin/configs/java-jersey2-8-oas2.yaml

@@ -2,7 +2,6 @@ generatorName: java
 outputDir: samples/client/petstore/java/jersey2-java8
 library: jersey2
 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-jersey2-java8
   hideGenerationTimestamp: true

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

@@ -2,7 +2,6 @@ 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
-templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
   artifactId: openapi3-extensions-x-auth-id-alias-jersey2-java8
   hideGenerationTimestamp: true

bin/configs/java-jersey2-java8-localdatetime.yaml

@@ -1,11 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/jersey2-java8-localdatetime
-library: jersey2
-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-jersey2-java8-localdatetime
-  hideGenerationTimestamp: "true"
-  dateLibrary: java8-localdatetime
-  java8: true
-  delegatePattern: true

bin/configs/java-micronaut-client.yaml

@@ -1,9 +0,0 @@
-generatorName: java-micronaut-client
-outputDir: samples/client/petstore/java-micronaut-client/
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-additionalProperties:
-  artifactId: petstore-micronaut
-  hideGenerationTimestamp: "true"
-  configureAuth: "false"
-  build: "all"
-  test: "spock"

bin/configs/java-microprofile-rest-client.yaml

@@ -2,6 +2,5 @@ generatorName: java
 outputDir: samples/client/petstore/java/microprofile-rest-client
 library: microprofile
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
   artifactId: microprofile-rest-client

bin/configs/java-native-openapi3.yaml

@@ -0,0 +1,11 @@
+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-okhttp-gson-dynamicOperations.yaml

@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/okhttp-gson-dynamicOperations
-library: okhttp-gson
-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-okhttp-gson-dynamicoperations
-  hideGenerationTimestamp: "true"
-  dynamicOperations: "true"

bin/configs/java-resteasy.yaml

@@ -2,7 +2,6 @@ generatorName: java
 outputDir: samples/client/petstore/java/resteasy
 library: resteasy
 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-resteasy
   hideGenerationTimestamp: "true"

bin/configs/java-resttemplate-withXml.yaml

@@ -2,9 +2,7 @@ generatorName: java
 outputDir: samples/client/petstore/java/resttemplate-withXml
 library: resttemplate
 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:
-  java8: true
   withXml: "true"
   artifactId: petstore-resttemplate-withxml
   hideGenerationTimestamp: "true"

bin/configs/java-resttemplate.yaml

@@ -2,8 +2,6 @@ generatorName: java
 outputDir: samples/client/petstore/java/resttemplate
 library: resttemplate
 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-resttemplate
   hideGenerationTimestamp: "true"
-  java8: true

bin/configs/java-retrofit2-play26.yaml

@@ -2,7 +2,6 @@ generatorName: java
 outputDir: samples/client/petstore/java/retrofit2-play26
 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:
   usePlayWS: "true"
   enableBuilderSupport: "true"

bin/configs/java-webclient-nullable-array.yaml

@@ -1,8 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/webclient-nulable-arrays
-library: webclient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-webclient-nullable-arrays
-  hideGenerationTimestamp: "true"

bin/configs/java-webclient.yaml

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

bin/configs/jaxrs-cxf-cdi-default-values.yaml

@@ -1,7 +0,0 @@
-generatorName: jaxrs-cxf-cdi
-outputDir: samples/server/petstore/jaxrs-cxf-cdi-default-value
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_8535.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  artifactId: jaxrs-cxf-cdi-default-value

bin/configs/jaxrs-resteasy-default-values.yaml

@@ -1,7 +0,0 @@
-generatorName: jaxrs-resteasy
-outputDir: samples/server/petstore/jaxrs-resteasy/default-value
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_8535.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  artifactId: jaxrs-resteasy-default-value

bin/configs/jaxrs-resteasy-java8.yaml

@@ -1,8 +0,0 @@
-generatorName: jaxrs-resteasy
-outputDir: samples/server/petstore/jaxrs-resteasy/java8
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy
-additionalProperties:
-  artifactId: jaxrs-resteasy-java8-server
-  hideGenerationTimestamp: "true"
-  dateLibrary: java8

bin/configs/jaxrs-spec-interface.yaml

@@ -1,7 +1,6 @@
 generatorName: jaxrs-spec
 outputDir: samples/server/petstore/jaxrs-spec-interface
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
 additionalProperties:
   artifactId: jaxrs-spec-interface-petstore-server
   interfaceOnly: "true"

bin/configs/jaxrs-spec.yaml

@@ -1,7 +1,6 @@
 generatorName: jaxrs-spec
 outputDir: samples/server/petstore/jaxrs-spec
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
 additionalProperties:
   artifactId: jaxrs-spec-petstore-server
   serializableModel: "true"

bin/configs/kotlin-json-request-string.yaml

@@ -5,5 +5,3 @@ templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   requestDateConverter: toString
   artifactId: kotlin-petstore-json-request-string
-  parcelizeModels: true
-  supportAndroidApiLevel25AndBelow: true

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

@@ -1,10 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/petstore/kotlin-retrofit2-kotlinx_serialization
-library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  serializationLibrary: kotlinx_serialization
-  artifactId: kotlin-petstore-retrofit2-kotlinx_serialization
-  enumPropertyNaming: UPPERCASE
-  serializableModel: "true"

bin/configs/kotlin-spring-boot-delegate.yaml

@@ -1,9 +0,0 @@
-generatorName: kotlin-spring
-outputDir: samples/server/petstore/kotlin-springboot-delegate
-library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
-additionalProperties:
-  delegatePattern: "true"
-  swaggerAnnotations: "true"
-  beanValidations: "true"

bin/configs/kotlin-spring-boot-reactive.yaml

@@ -1,10 +1,10 @@
 generatorName: kotlin-spring
 outputDir: samples/server/petstore/kotlin-springboot-reactive
-library: spring-boot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
 additionalProperties:
   serviceImplementation: "true"
+  library: spring-boot
   reactive: "true"
   swaggerAnnotations: "true"
   beanValidations: "true"

bin/configs/kotlin-spring-boot.yaml

@@ -1,10 +1,10 @@
 generatorName: kotlin-spring
 outputDir: samples/server/petstore/kotlin-springboot
-library: spring-boot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
 additionalProperties:
   serviceImplementation: "true"
+  library: spring-boot
   serializableModel: "true"
   swaggerAnnotations: "true"
   beanValidations: "true"

bin/configs/ktorm-schema.yaml

@@ -1,7 +0,0 @@
-generatorName: ktorm-schema
-outputDir: samples/schema/petstore/ktorm
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/ktorm-schema
-additionalProperties:
-  hideGenerationTimestamp: true
-  importModelPackageName: org.openapitools.client.models

bin/configs/nim.yaml

@@ -1,6 +1,6 @@
 generatorName: nim
 outputDir: samples/client/petstore/nim
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/nim-client
 additionalProperties:
   packageName: petstore

bin/configs/other/android-httpclient.yaml

@@ -1,5 +1,6 @@
 generatorName: android
 outputDir: samples/client/petstore/android/httpclient
-library: httpclient
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/android
+additionalProperties:
+  library: httpclient

bin/configs/other/android-volley.yaml

@@ -2,6 +2,5 @@ generatorName: android
 outputDir: samples/client/petstore/android/volley
 library: volley
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/android
 additionalProperties:
   artifactId: petstore-android-volley

bin/configs/other/aspnetcore-3.1.yaml

@@ -4,6 +4,5 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
 additionalProperties:
   packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
-  # comment out below as 3.1 the default
-  #aspnetCoreVersion: "3.1"
+  aspnetCoreVersion: "3.1"
   userSecretsGuid: "76e9e993-9159-441c-9c5b-fe95e7f4f020"

bin/configs/other/aspnetcore.yaml

@@ -0,0 +1,6 @@
+generatorName: aspnetcore
+outputDir: samples/server/petstore/aspnetcore
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/aspnetcore/2.1
+additionalProperties:
+  packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'

bin/configs/other/clojure.yaml

@@ -1,4 +1,3 @@
 generatorName: clojure
 outputDir: samples/client/petstore/clojure
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.json
-templateDir: modules/openapi-generator/src/main/resources/clojure

bin/configs/other/cpp-qt5-client.yaml

@@ -0,0 +1,7 @@
+generatorName: cpp-qt5-client
+outputDir: samples/client/petstore/cpp-qt5
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/cpp-qt5-client
+additionalProperties:
+  cppNamespace: test_namespace
+  modelNamePrefix: PFX

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

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

bin/configs/other/csharp-OpenAPIClientNet35.yaml

@@ -1,7 +1,6 @@
 generatorName: csharp
 outputDir: samples/client/petstore/csharp/OpenAPIClientNet35
 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
 additionalProperties:
   targetFramework: v3.5
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'

bin/configs/other/csharp-OpenAPIClientNet40.yaml

@@ -1,7 +1,6 @@
 generatorName: csharp
 outputDir: samples/client/petstore/csharp/OpenAPIClientNet40
 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
 additionalProperties:
   targetFramework: v4.0
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'

bin/configs/other/csharp-OpenAPIClientNetCoreProject.yaml

@@ -1,7 +1,6 @@
 generatorName: csharp
 outputDir: samples/client/petstore/csharp/OpenAPIClientNetCoreProject
 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
 additionalProperties:
   targetFramework: netstandard1.3
   packageGuid: '{67035b31-f8e5-41a4-9673-954035084f7d}'

bin/configs/other/csharp-OpenAPIClientNetStandard.yaml

@@ -1,7 +1,6 @@
 generatorName: csharp
 outputDir: samples/client/petstore/csharp/OpenAPIClientNetStandard
 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
 additionalProperties:
   targetFramework: netstandard1.3
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'

bin/configs/other/csharp-OpenAPIClientWithPropertyChanged.yaml

@@ -1,7 +1,6 @@
 generatorName: csharp
 outputDir: samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged
 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
 additionalProperties:
   packageGuid: '{5CD900DE-8266-412F-A758-28E1F9C623D5}'
   generatePropertyChanged: "true"

bin/configs/other/dynamic-html.yaml

@@ -1,4 +1,3 @@
 generatorName: dynamic-html
 outputDir: samples/documentation/dynamic-html
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/openapi-static

bin/configs/other/eiffel.yaml

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

bin/configs/other/fsharp-functions.yaml

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

bin/configs/other/html.md.yaml

@@ -1,4 +1,3 @@
 generatorName: html
 outputDir: samples/documentation/html.md
 inputSpec: modules/openapi-generator/src/test/resources/2_0/markdown.yaml
-templateDir: modules/openapi-generator/src/main/resources/htmlDocs