remove go.sum

add go.sum
trigger build
2022-02-20 22:58:15 +08:00 · 2022-02-20 22:58:04 +08:00 · 2022-02-20 22:37:26 +08:00 · 2022-02-20 22:36:55 +08:00 · 2022-02-20 22:29:39 +08:00 · 2022-02-20 22:21:29 +08:00
9828 changed files with 412482 additions and 194726 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,16 +1,135 @@
-version: 2
+version: 2.1
+commands: # a reusable command with parameters
+  command_build_and_test:
+    parameters:
+      nodeNo:
+        default: "0"
+        type: string
+    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
+      #    - 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:
+          name: "Setup custom environment variables"
+          command: echo 'export CIRCLE_NODE_INDEX="<<parameters.nodeNo>>"' >> $BASH_ENV
+      - 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
+  command_docker_build_and_test:
+    parameters:
+      nodeNo:
+        default: "0"
+        type: string
+    steps:
+      # 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:
+      # Test
+      #      - run: mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+      - run:
+          name: "Setup custom environment variables"
+          command: echo 'export CIRCLE_NODE_INDEX="<<parameters.nodeNo>>"' >> $BASH_ENV
+      - run: ./CI/circle_parallel.sh
+      # 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
 jobs:
-  build:
-    #    docker:
-    #      #- image: openapitools/openapi-generator
-    #      - image: swaggerapi/petstore
-    #        environment:
-    #          SWAGGER_HOST=http://petstore.swagger.io
-    #          SWAGGER_BASE_PATH=/v2
+  node0:
    machine:
      image: circleci/classic:latest
    working_directory: ~/OpenAPITools/openapi-generator
-    parallelism: 4
    shell: /bin/bash --login
    environment:
      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
@@ -18,85 +137,68 @@ jobs:
      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
-#    - 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
+      - command_build_and_test:
+          nodeNo: "0"
+  node1:
+    machine:
+      image: circleci/classic:latest
+    working_directory: ~/OpenAPITools/openapi-generator
+    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:
+      - command_build_and_test:
+          nodeNo: "1"
+  node2:
+    machine:
+      image: circleci/classic:latest
+    working_directory: ~/OpenAPITools/openapi-generator
+    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:
+      - command_build_and_test:
+          nodeNo: "2"
+  node3:
+    machine:
+      image: circleci/classic:latest
+    working_directory: ~/OpenAPITools/openapi-generator
+    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:
+      - checkout
+      - command_build_and_test:
+          nodeNo: "3"
+  node4:
+    docker:
+      - image: fkrull/multi-python
+    working_directory: ~/OpenAPITools/openapi-generator
+    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:
+      - checkout
+      - command_docker_build_and_test:
+          nodeNo: "4"
+workflows:
+  version: 2
+  build:
+    jobs:
+      - node0
+      - node1
+      - node2
+      - node3
+      - node4
--- a/.github/.test/samples.json
+++ b/.github/.test/samples.json
@@ -145,12 +145,6 @@
        "Documentation: Cwiki"
      ]
    },
-    {
-      "input": "dart-jaguar-petstore.sh",
-      "matches": [
-        "Client: Dart"
-      ]
-    },
    {
      "input": "dart-dio-petstore.sh",
      "matches": [
@@ -223,12 +217,6 @@
        "Server: Scala"
      ]
    },
-    {
-      "input": "flash-petstore.sh",
-      "matches": [
-        "Client: Flash/ActionScript"
-      ]
-    },
    {
      "input": "go-gin-petstore-server.sh",
      "matches": [
@@ -722,18 +710,6 @@
        "Schema: MySQL"
      ]
    },
-    {
-      "input": "nancyfx-petstore-server-async.sh",
-      "matches": [
-        "Server: C-Sharp"
-      ]
-    },
-    {
-      "input": "nancyfx-petstore-server.sh",
-      "matches": [
-        "Server: C-Sharp"
-      ]
-    },
    {
      "input": "nodejs-petstore-google-cloud-functions.sh",
      "matches": [
@@ -944,24 +920,6 @@
        "Server: Spring"
      ]
    },
-    {
-      "input": "spring-mvc-petstore-j8-async-server.sh",
-      "matches": [
-        "Server: Spring"
-      ]
-    },
-    {
-      "input": "spring-mvc-petstore-j8-localdatetime.sh",
-      "matches": [
-        "Server: Spring"
-      ]
-    },
-    {
-      "input": "spring-mvc-petstore-server.sh",
-      "matches": [
-        "Server: Spring"
-      ]
-    },
    {
      "input": "spring-stubs.sh",
      "matches": [
--- a/.github/auto-labeler.yml
+++ b/.github/auto-labeler.yml
@@ -62,9 +62,6 @@ labels:
      - '\s*?-[gl] erlang(-.*)?-client\s*?'
      - '\s*?\[erlang-proper\]\s*?'
      - '\s*?-[gl] erlang-proper\s*?'
-    'Client: Flash/ActionScript':
-      - '\s*?\[flash\]\s*?'
-      - '\s*?-[gl] flash(?!-)\b'
    'Client: Go':
      - '\s*?\[go\]\s*?'
      - '\s*?-[gl] go(?!-)\b'
@@ -223,8 +220,6 @@ labels:
    'Server: C-Sharp':
      - '\s*?\[aspnetcore\]\s*?'
      - '\s*?-[gl] aspnetcore\s*?'
-      - '\s*?\[csharp-nancyfx\]\s*?'
-      - '\s*?-[gl] csharp-nancyfx\s*?'
    # 'Server: Ceylon': # TODO: REMOVE UNUSED LABEL
    'Server: Eiffel':
      - '\s*?\[eiffel(-.*)?-server\]\s*?'
--- a/.github/workflows/check-supported-versions.yaml
+++ b/.github/workflows/check-supported-versions.yaml
@@ -50,7 +50,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@v2.3.1
        if: matrix.java == '8' && matrix.os == 'ubuntu-latest'
        with:
          name: artifact
@@ -81,7 +81,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@v2.1.0
        with:
          name: artifact
      - name: Run Ensures Script
--- a/.github/workflows/openapi-generator.yaml
+++ b/.github/workflows/openapi-generator.yaml
@@ -39,7 +39,7 @@ jobs:
        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
+        uses: actions/upload-artifact@v2.3.1
        with:
          name: openapi-generator-cli.jar
          path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -75,7 +75,7 @@ jobs:
        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
+        uses: actions/upload-artifact@v2.3.1
        with:
          name: surefire-test-results
          path: '**/surefire-reports/TEST-*.xml'
@@ -93,7 +93,7 @@ jobs:
          java-version: 8
          distribution: 'temurin'
      - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v2.0.10
+        uses: actions/download-artifact@v2.1.0
        with:
          name: openapi-generator-cli.jar
          path: modules/openapi-generator-cli/target
@@ -132,7 +132,7 @@ jobs:
          java-version: 8
          distribution: 'temurin'
      - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v2.0.10
+        uses: actions/download-artifact@v2.1.0
        with:
          name: openapi-generator-cli.jar
          path: modules/openapi-generator-cli/target
@@ -216,5 +216,6 @@ jobs:
            ${{ runner.os }}-test-gradle-plugin-
      - name: Run tests
        run: |
+          mvn --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk)
          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
--- a/.github/workflows/samples-dotnet.yaml
+++ b/.github/workflows/samples-dotnet.yaml
@@ -0,0 +1,34 @@
+name: Samples C# .Net 6
+
+on:
+  push:
+    paths:
+      - 'samples/client/petstore/csharp-netcore/**net6.0**/'
+      - 'samples/server/petstore/aspnetcore-6.0/**'
+  pull_request:
+    paths:
+      - 'samples/client/petstore/csharp-netcore/**net6.0**/'
+      - 'samples/server/petstore/aspnetcore-6.0/**'
+jobs:
+  build:
+    name: Build .Net projects
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0
+          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt
+          - samples/server/petstore/aspnetcore-6.0
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: dotnet build Org.OpenAPITools.sln
+      - name: Test
+        working-directory: ${{ matrix.sample }}
+        run: dotnet test Org.OpenAPITools.sln
--- a/.github/workflows/samples-go.yaml
+++ b/.github/workflows/samples-go.yaml
@@ -0,0 +1,29 @@
+name: Samples Go
+
+on:
+  push:
+    paths:
+      - 'samples/server/petstore/go*/**'
+  pull_request:
+    paths:
+      - 'samples/server/petstore/go*/**'
+
+jobs:
+  build:
+    name: Build Go
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/server/petstore/go-gin-api-server
+          - samples/server/petstore/go-api-server
+          - samples/server/petstore/go-echo-server
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '^1.17.1'
+      - name: Build and Test
+        working-directory: ${{ matrix.sample }}
+        run: ./test.bash
--- a/.github/workflows/samples-groovy.yaml
+++ b/.github/workflows/samples-groovy.yaml
@@ -0,0 +1,45 @@
+name: Samples Groovy
+
+on:
+  push:
+    paths:
+      - 'samples/client/petstore/groovy**'
+  pull_request:
+    paths:
+      - 'samples/client/petstore/groovy**'
+
+env:
+  GRADLE_VERSION: 6.9
+
+jobs:
+  build:
+    name: Build Groovy
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/groovy
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Cache maven dependencies
+        uses: actions/cache@v2.1.7
+        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@v2
+        with:
+          gradle-version: ${{ env.GRADLE_VERSION }}
+          build-root-directory: ${{ matrix.sample }}
+          arguments: wrapper
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: ./gradlew build -x test
--- a/.github/workflows/samples-java-client-jdk11.yaml
+++ b/.github/workflows/samples-java-client-jdk11.yaml
@@ -0,0 +1,56 @@
+name: Samples Java Client JDK11
+
+on:
+  push:
+    paths:
+      - 'samples/client/petstore/java*/**'
+  pull_request:
+    paths:
+      - 'samples/client/petstore/java*/**'
+jobs:
+  build:
+    name: Build Java Client JDK11
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/petstore/jaxrs-cxf-client
+          - samples/client/petstore/java/native
+          - samples/client/petstore/java/native-async
+          - samples/client/petstore/java/retrofit2
+          - samples/client/petstore/java/retrofit2rx2
+          - samples/client/petstore/java/retrofit2rx3
+          - samples/client/petstore/java/retrofit2-play26
+          - samples/client/petstore/java/resttemplate
+          - samples/client/petstore/java/resttemplate-withXml
+          - samples/client/petstore/java/webclient
+          - samples/client/petstore/java/webclient-nulable-arrays
+          - samples/client/petstore/java/vertx
+          - samples/client/petstore/java/jersey2-java8-localdatetime
+          - samples/client/petstore/java/resteasy
+          - samples/client/petstore/java/google-api-client
+          - samples/client/petstore/java/rest-assured
+          - samples/client/petstore/java/rest-assured-jackson
+          - samples/client/petstore/java/microprofile-rest-client
+          - samples/client/petstore/java/apache-httpclient
+          - samples/client/petstore/java/feign
+          - samples/client/petstore/java/jersey1
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - name: Cache maven dependencies
+        uses: actions/cache@v2.1.7
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.m2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: mvn clean package
--- a/.github/workflows/samples-java-play-framework.yaml
+++ b/.github/workflows/samples-java-play-framework.yaml
@@ -0,0 +1,47 @@
+name: Samples Java Play Framework
+
+on:
+  push:
+    paths:
+      - 'samples/server/petstore/java-play-framework**'
+  pull_request:
+    paths:
+      - 'samples/server/petstore/java-play-framework**'
+jobs:
+  build:
+    name: Build Java Play Framework
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # servers
+          - samples/server/petstore/java-play-framework
+          - samples/server/petstore/java-play-framework-api-package-override
+          - samples/server/petstore/java-play-framework-async
+          - samples/server/petstore/java-play-framework-controller-only
+          - samples/server/petstore/java-play-framework-fake-endpoints
+          - samples/server/petstore/java-play-framework-fake-endpoints-with-security
+          - samples/server/petstore/java-play-framework-no-bean-validation
+          - samples/server/petstore/java-play-framework-no-exception-handling
+          - samples/server/petstore/java-play-framework-no-interface
+          - samples/server/petstore/java-play-framework-no-nullable
+          - samples/server/petstore/java-play-framework-no-swagger-ui
+          - samples/server/petstore/java-play-framework-no-wrap-calls
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - name: Cache maven dependencies
+        uses: actions/cache@v2.1.7
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.m2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: mvn clean package
--- a/.github/workflows/samples-jaxrs.yaml
+++ b/.github/workflows/samples-jaxrs.yaml
@@ -0,0 +1,59 @@
+name: Samples JAX-RS
+
+on:
+  push:
+    paths:
+      - 'samples/server/petstore/jaxrs*/**'
+  pull_request:
+    paths:
+      - 'samples/server/petstore/jaxrs*/**'
+jobs:
+  build:
+    name: Build JAX-RS
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # servers
+          - samples/server/petstore/jaxrs/jersey2
+          - samples/server/petstore/jaxrs/jersey2-useTags
+          - samples/server/petstore/jaxrs-jersey
+          - samples/server/petstore/jaxrs-spec
+          - samples/server/petstore/jaxrs-spec-interface
+          - samples/server/petstore/jaxrs-spec-interface-response
+          - samples/server/petstore/jaxrs-jersey
+          - samples/server/petstore/jaxrs-spec
+          - samples/server/petstore/jaxrs-spec-interface
+          - samples/server/petstore/jaxrs-spec-interface-response
+          - samples/server/petstore/jaxrs/jersey1
+          - samples/server/petstore/jaxrs/jersey1-useTags
+          - samples/server/petstore/jaxrs-datelib-j8
+          - samples/server/petstore/jaxrs-resteasy/default
+          - samples/server/petstore/jaxrs-resteasy/eap
+          - samples/server/petstore/jaxrs-resteasy/eap-joda
+          - samples/server/petstore/jaxrs-resteasy/eap-java8
+          - samples/server/petstore/jaxrs-resteasy/joda
+          - samples/server/petstore/jaxrs-resteasy/default-value
+          - samples/server/petstore/jaxrs-cxf
+          - samples/server/petstore/jaxrs-cxf-annotated-base-path
+          - samples/server/petstore/jaxrs-cxf-cdi
+          - samples/server/petstore/jaxrs-cxf-cdi-default-value
+          - samples/server/petstore/jaxrs-cxf-non-spring-app
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Cache maven dependencies
+        uses: actions/cache@v2.1.7
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.m2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: mvn clean package
--- a/.github/workflows/samples-kotlin-client.yaml
+++ b/.github/workflows/samples-kotlin-client.yaml
@@ -0,0 +1,64 @@
+name: Samples Kotlin cilent
+
+on:
+  push:
+    branches:
+      - 'samples/client/petstore/kotlin*/**'
+  pull_request:
+    paths:
+      - 'samples/client/petstore/kotlin*/**'
+
+env:
+  GRADLE_VERSION: 6.9
+
+jobs:
+  build:
+    name: Build Kotlin client
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # client
+          - 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-jvm-volley
+          - samples/client/petstore/kotlin-moshi-codegen
+          - 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
+          - samples/client/petstore/kotlin-array-simple-string
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Cache maven dependencies
+        uses: actions/cache@v2.1.7
+        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@v2
+        with:
+          gradle-version: ${{ env.GRADLE_VERSION }}
+          build-root-directory: ${{ matrix.sample }}
+          arguments: wrapper
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: ./gradlew build -x test
--- a/.github/workflows/samples-kotlin-server.yaml
+++ b/.github/workflows/samples-kotlin-server.yaml
@@ -0,0 +1,54 @@
+name: Samples Kotlin server
+
+on:
+  push:
+    branches:
+      - 'samples/server/petstore/kotlin*/**'
+  pull_request:
+    paths:
+      - 'samples/server/petstore/kotlin*/**'
+
+env:
+  GRADLE_VERSION: 6.9
+
+jobs:
+  build:
+    name: Build Kotlin server
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # server
+          - samples/server/petstore/kotlin-springboot
+          - samples/server/petstore/kotlin-springboot-modelMutable
+          - samples/server/petstore/kotlin-springboot-delegate
+          - samples/server/petstore/kotlin-springboot-reactive
+          - samples/server/petstore/kotlin-server/ktor
+          - samples/server/petstore/kotlin-server/jaxrs-spec
+          - samples/server/petstore/kotlin-server-modelMutable
+          # no build.gradle file
+          #- samples/server/petstore/kotlin-vertx-modelMutable
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Cache maven dependencies
+        uses: actions/cache@v2.1.7
+        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@v2
+        with:
+          gradle-version: ${{ env.GRADLE_VERSION }}
+          build-root-directory: ${{ matrix.sample }}
+          arguments: wrapper
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: ./gradlew build -x test
--- a/.github/workflows/samples-kotlin.yaml
+++ b/.github/workflows/samples-kotlin.yaml
@@ -1,65 +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
-          - 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: 'temurin'
-          java-version: 8
-      - name: Cache maven dependencies
-        uses: actions/cache@v2.1.7
-        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@v2
-        with:
-          gradle-version: ${{ env.GRADLE_VERSION }}
-          build-root-directory: ${{ matrix.sample }}
-          arguments: wrapper
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: ./gradlew build -x test
--- a/.github/workflows/samples-scala.yaml
+++ b/.github/workflows/samples-scala.yaml
@@ -0,0 +1,44 @@
+name: Samples Scala
+
+on:
+  push:
+    paths:
+      - 'samples/client/petstore/scala**'
+      - 'samples/server/petstore/scala**'
+  pull_request:
+    paths:
+      - 'samples/client/petstore/scala**'
+      - 'samples/server/petstore/scala**'
+jobs:
+  build:
+    name: Build Scala client, servers
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/petstore/scalaz
+          # servers
+          - samples/server/petstore/scala-lagom-server
+          - samples/server/petstore/scala-play-server
+          - samples/server/petstore/scala-akka-http-server
+          - samples/server/petstore/scalatra
+          - samples/server/petstore/scala-finch # cannot be tested with jdk11
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Cache maven dependencies
+        uses: actions/cache@v2.1.7
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.ivy2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/build.sbt') }}
+      - name: Build and test
+        working-directory: ${{ matrix.sample }}
+        run: sbt -v +test
--- a/.github/workflows/samples-spring.yaml
+++ b/.github/workflows/samples-spring.yaml
@@ -0,0 +1,57 @@
+name: Samples Java Spring
+
+on:
+  push:
+    paths:
+      - 'samples/server/petstore/spring*/**'
+      - 'samples/openapi3/server/petstore/spring*/**'
+  pull_request:
+    paths:
+      - 'samples/server/petstore/spring*/**'
+      - 'samples/openapi3/server/petstore/spring*/**'
+jobs:
+  build:
+    name: Build Java Spring
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/petstore/spring-cloud
+          - samples/openapi3/client/petstore/spring-cloud
+          - samples/client/petstore/spring-cloud-date-time
+          - samples/openapi3/client/petstore/spring-cloud-date-time
+          - samples/client/petstore/spring-stubs
+          - samples/openapi3/client/petstore/spring-stubs
+          - samples/openapi3/client/petstore/spring-stubs-skip-default-interface
+          # servers
+          - samples/server/petstore/springboot
+          - samples/openapi3/server/petstore/springboot
+          - samples/server/petstore/springboot-beanvalidation
+          - samples/server/petstore/springboot-useoptional
+          - samples/openapi3/server/petstore/springboot-useoptional
+          - samples/server/petstore/springboot-reactive
+          - samples/openapi3/server/petstore/springboot-reactive
+          - samples/server/petstore/springboot-implicitHeaders
+          - samples/openapi3/server/petstore/springboot-implicitHeaders
+          - samples/server/petstore/springboot-delegate
+          - samples/openapi3/server/petstore/springboot-delegate
+          - samples/server/petstore/spring-boot-nullable-set
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Cache maven dependencies
+        uses: actions/cache@v2.1.7
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.m2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: mvn clean package
--- a/.gitignore
+++ b/.gitignore
@@ -201,15 +201,11 @@ samples/server/petstore/aspnetcore/.vs/
 effective.pom

 # kotlin
-samples/client/petstore/kotlin/src/main/kotlin/test/
-samples/client/petstore/kotlin-threetenbp/build
-samples/client/petstore/kotlin-string/build
 samples/openapi3/client/petstore/kotlin/build
 samples/server/petstore/kotlin-server/ktor/build
 samples/server/petstore/kotlin-springboot/build
-samples/client/petstore/kotlin-multiplatform/build/
-samples/client/petstore/kotlin-okhttp3/build/
-\?
+samples/client/petstore/kotlin*/src/main/kotlin/test/
+samples/client/petstore/kotlin*/build/

 # haskell
 .stack-work
@@ -249,9 +245,6 @@ samples/server/petstore/erlang-server/rebar.lock
 **/dart*/**/pubspec.lock
 # Dart dio
 **/dart*/**/*.g.dart
-# Dart jaguar
-**/dart*/**/*.jser.dart
-**/dart*/**/*.jretro.dart

 # JS
 samples/client/petstore/javascript-es6/package-lock.json
--- a/.mvn/wrapper/maven-wrapper.jar
+++ b/.mvn/wrapper/maven-wrapper.jar
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
--- a/CI/circle_parallel.sh
+++ b/CI/circle_parallel.sh
@@ -11,7 +11,9 @@ export NODE_ENV=test

 function cleanup {
  # Show logs of 'petstore.swagger' container to troubleshoot Unit Test failures, if any.
-  docker logs petstore.swagger # container name specified in circle.yml
+  if [ "$NODE_INDEX" != "4" ]; then
+    docker logs petstore.swagger # container name specified in circle.yml
+  fi
 }

 trap cleanup EXIT
@@ -59,8 +61,8 @@ elif [ "$NODE_INDEX" = "3" ]; then
  #sudo make altinstall
  pyenv install --list 
  pyenv install 3.6.3
+  pyenv install 2.7.14
  pyenv global 3.6.3
-  python3 --version

  # Install node@stable (for angular 6)
  set +e
@@ -79,6 +81,20 @@ elif [ "$NODE_INDEX" = "3" ]; then

  mvn --no-snapshot-updates --quiet verify -Psamples.circleci.node3 -Dorg.slf4j.simpleLogger.defaultLogLevel=error

+elif [ "$NODE_INDEX" = "4" ]; then
+
+  echo "Running node $NODE_INDEX to test 'samples.circleci.node4' defined in pom.xml ..."
+
+  # install maven and java so we can use them to run our tests
+  apt-get update && apt-get install -y default-jdk maven sudo
+  java -version
+  export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
+  echo $JAVA_HOME
+  # show os version
+  uname -a
+
+  mvn --no-snapshot-updates --quiet verify -Psamples.circleci.node4 -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+
 else
  echo "Running node $NODE_INDEX to test 'samples.circleci.others' defined in pom.xml ..."
  #sudo update-java-alternatives -s java-1.7.0-openjdk-amd64
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@

 <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)](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/zt-12jxxd7p2-XUeQM~4pzsU9x~eGLQqX2g) [![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.3.1`):
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`6.0.x`):
 [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.com/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)
@@ -17,20 +17,6 @@
 [![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.4.x](https://github.com/OpenAPITools/openapi-generator/tree/5.4.x) (`5.4.x`):
-[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/5.4.x.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator)
-[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/5.4.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.4.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.4.x)](https://cloud.drone.io/OpenAPITools/openapi-generator)
-[![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/5.4.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">
@@ -62,6 +48,7 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [<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)
 [<img src="https://openapi-generator.tech/img/companies/pexa.png" width="128" height="128">](https://www.pexa.com.au/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+[<img src="https://openapi-generator.tech/img/companies/numary.png" width="128" height="128">](https://www.numary.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,8 +62,8 @@ 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** (Apache HttpClient, 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, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **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 clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient, 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, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **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/), [Apache Camel](https://camel.apache.org/)), **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**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
@@ -117,10 +104,8 @@ 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/) | Jan/Feb 2022   | Minor release with breaking changes (no fallback) |
-| 5.4.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.4.0-SNAPSHOT/) | Dec 2021   | Minor release with breaking changes (with fallback) |
-| 5.3.1 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.3.1-SNAPSHOT/) | Nov/Dec 2021   | Patch release (enhancements, bug fixes, etc) |  
-| [5.3.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.3.0) (latest stable release)                                                    | 24.10.2021   | Minor release with breaking changes (with fallback) |
+| 6.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/) | Feb/Mar 2022   | Major release with breaking changes (no fallback) |
+| [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0) (latest stable release)                                                    | 31.01.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)                       |

 OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0
@@ -177,16 +162,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.3.0/openapi-generator-cli-5.3.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.4.0/openapi-generator-cli-5.4.0.jar`

 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.3.0/openapi-generator-cli-5.3.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.4.0/openapi-generator-cli-5.4.0.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.3.0/openapi-generator-cli-5.3.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.4.0/openapi-generator-cli-5.4.0.jar
 ```

 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -411,7 +396,7 @@ openapi-generator-cli version
 To use a specific version of "openapi-generator-cli"

 ```sh
-openapi-generator-cli version-manager set 5.3.0
+openapi-generator-cli version-manager set 5.4.0
 ```

 Or install it as dev-dependency:
@@ -435,7 +420,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.3.0/openapi-generator-cli-5.3.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.4.0/openapi-generator-cli-5.4.0.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`
@@ -585,6 +570,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [ASKUL](https://www.askul.co.jp)
 - [Arduino](https://www.arduino.cc/)
 - [b<>com](https://b-com.com/en)
+- [百度营销](https://e.baidu.com)
 - [Banzai Cloud](https://banzaicloud.com)
 - [BIMData.io](https://bimdata.io)
 - [Bithost GmbH](https://www.bithost.ch)
@@ -634,6 +620,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Lumeris](https://www.lumeris.com)
 - [LVM Versicherungen](https://www.lvm.de)
 - [MailSlurp](https://www.mailslurp.com)
+- [Manticore Search](https://manticoresearch.com)
 - [Médiavision](https://www.mediavision.fr/)
 - [Metaswitch](https://www.metaswitch.com/)
 - [MoonVision](https://www.moonvision.io/)
@@ -651,6 +638,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [PLAID, Inc.](https://plaid.co.jp/)
 - [Ponicode](https://ponicode.dev/)
 - [Pricefx](https://www.pricefx.com/)
+- [PrintNanny](https://www.print-nanny.com/)
 - [Prometheus/Alertmanager](https://github.com/prometheus/alertmanager)
 - [Qavar](https://www.qavar.com)
 - [QEDIT](https://qed-it.com)
@@ -771,6 +759,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2019-11-26 - [CordaCon 2019 Highlights: Braid Server and OpenAPI Generator for Corda Client API’s](https://blog.b9lab.com/cordacon-2019-highlights-braid-server-and-openapi-generator-for-corda-flows-api-s-d24179ccb27c) by [Adel Rustum](https://blog.b9lab.com/@adelrestom) at [B9lab](https://blog.b9lab.com/)
 - 2019-12-03 - [A Road to Less Coding: Auto-Generate APILibrary](https://www.corda.net/blog/a-road-to-less-coding-auto-generate-apilibrary/) at [Corda Blog](https://www.corda.net/blog/)
 - 2019-12-04 - [Angular＋NestJS＋OpenAPI（Swagger）でマイクロサービスを視野に入れた環境を考える](https://qiita.com/teracy55/items/0327c7a170ec772970c6) by [てらしー](https://twitter.com/teracy55)
+- 2019-12-05 - [Code generation on the Java VM](https://speakerdeck.com/sullis/code-generation-on-the-java-vm-2019-12-05) by [Sean Sullivan](https://speakerdeck.com/sullis)
 - 2019-12-17 - [OpenAPI Generator で OAuth2 アクセストークン発行のコードまで生成してみる](https://www.techscore.com/blog/2019/12/17/openapi-generator-oauth2-accesstoken/) by [TECHSCORE](https://www.techscore.com/blog/)
 - 2019-12-23 - [Use Ada for Your Web Development](https://www.electronicdesign.com/technologies/embedded-revolution/article/21119177/use-ada-for-your-web-development) by [Stephane Carrez](https://github.com/stcarrez)
 - 2019-12-23 - [OpenAPIのスキーマを分割・構造化していく方法](https://gift-tech.co.jp/articles/structured-openapi-schema) by [小飯塚達也](https://github.com/t2h5) at [GiFT, Inc](https://gift-tech.co.jp/)
@@ -846,6 +835,9 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2021-10-17 - [Generate a TypeScript HTTP Client From An OpenAPI Spec In DotNET 5](https://richardwillis.info/blog/generate-a-type-script-http-client-from-an-open-api-spec-in-dot-net-5) by [Richard Willis](https://github.com/badsyntax)
 - 2021-11-06 - [スタートアップの開発で意識したこと](https://zenn.dev/woo_noo/articles/5cb09f8e2899ae782ad1) by [woo-noo](https://zenn.dev/woo_noo)
 - 2021-11-09 - [Effective Software Development using OpenAPI Generator](https://apexlabs.ai/post/effective-software-development-using-openapi-generator) by Ajil Oomme
+- 2021-12-07 - [An Introduction to OpenAPI](https://betterprogramming.pub/4-use-cases-of-openapi-which-are-good-to-know-1a041f4ad71e) by [Na'aman Hirschfeld](https://naamanhirschfeld.medium.com/)
+- 2021-01-02 - [Towards a secure API client generator for IoT devices](https://arxiv.org/abs/2201.00270) by Anders Aaen Springborg, Martin Kaldahl Andersen, Kaare Holland Hattel, Michele Albano
+

 ## [6 - About Us](#table-of-contents)

@@ -860,10 +852,12 @@ OpenAPI Generator core team members are contributors who have been making signif
 * [@ackintosh](https://github.com/ackintosh) (2018/02) [:heart:](https://www.patreon.com/ackintosh/overview)
 * [@jmini](https://github.com/jmini) (2018/04)  [:heart:](https://www.patreon.com/jmini)
 * [@etherealjoy](https://github.com/etherealjoy) (2019/06)
-* [@spacether](https://github.com/spacether) (2020/05)
+* [@spacether](https://github.com/spacether) (2020/05) [:heart:][spacether sponsorship]

 :heart: = Link to support the contributor directly

+[spacether sponsorship]: https://github.com/sponsors/spacether/
+
 #### Template Creator

 **NOTE**: Embedded templates are only supported in _Mustache_ format. Support for all other formats is experimental and subject to change at any time.
@@ -880,6 +874,7 @@ Here is a list of template creators:
   * C# (.NET 2.0): @who
   * C# (.NET Standard 1.3 ): @Gronsak
   * C# (.NET 4.5 refactored): @jimschubert [:heart:](https://www.patreon.com/jimschubert)
+   * C# (GenericHost): @devhl-labs
   * C# (HttpClient): @Blackclaws 
   * Clojure: @xhh
   * Crystal: @wing328
@@ -917,6 +912,7 @@ Here is a list of template creators:
   * JMeter: @davidkiss
   * Kotlin: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
   * Kotlin (MultiPlatform): @andrewemery
+   * Kotlin (Volley): @alisters
   * Lua: @daurnimator
   * Nim: @hokamoto
   * OCaml: @cgensoul
@@ -925,7 +921,8 @@ Here is a list of template creators:
   * PHP (with Data Transfer): @Articus
   * PowerShell: @beatcracker
   * PowerShell (refactored in 5.0.0): @wing328
-   * Python: @spacether
+   * Python: @spacether [:heart:][spacether sponsorship]
+   * Python-Experimental: @spacether [:heart:][spacether sponsorship]
   * R: @ramnov
   * Ruby (Faraday): @meganemura @dkliban
   * Rust: @farcaller
@@ -967,12 +964,14 @@ Here is a list of template creators:
   * GraphQL Express Server: @renepardon
   * Haskell Servant: @algas
   * Haskell Yesod: @yotsuya
+   * Java Camel: @carnevalegiacomo
   * Java MSF4J: @sanjeewa-malalgoda
   * Java Spring Boot: @diyfr
   * Java Undertow: @stevehu
   * Java Play Framework: @JFCote
   * Java PKMST: @anshu2185 @sanshuman @rkumar-pk @ninodpillai
   * Java Vert.x: @lwlee2608
+   * Java Micronaut: @andriy-dmytruk
   * JAX-RS RestEasy: @chameleon82
   * JAX-RS CXF: @hiveship
   * JAX-RS CXF (CDI): @nickcmaynard
@@ -980,6 +979,7 @@ Here is a list of template creators:
   * Kotlin: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
   * Kotlin (Spring Boot): @dr4ke616
   * Kotlin (Vertx): @Wooyme
+   * Kotlin (JAX-RS): @anttileppa
   * NodeJS Express: @YishTish
   * PHP Laravel: @renepardon
   * PHP Lumen: @abcsun
@@ -1053,6 +1053,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | 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)                                                                               |
 | Clojure           |                                                                                                                                                                                                                                   |
+| Crystal           | @cyangle (2021/01) |
 | Dart              | @jaumard (2018/09) @josh-burton (2019/12) @amondnet (2019/12) @sbu-WBT (2020/12) @kuhnroyal (2020/12) @agilob (2020/12) @ahmednfwela (2021/08)                                                                                                      |
 | Eiffel            | @jvelilla (2017/09)                                                                                                                                                                                                               |
 | Elixir            | @mrmstn (2018/12)                                                                                                                                                                                                                 |
@@ -1074,7 +1075,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Perl              | @wing328 (2017/07) [:heart:](https://www.patreon.com/wing328) @yue9944882 (2019/06)                                                                                                                                               |
 | PHP               | @jebentier (2017/07), @dkarlovi (2017/07), @mandrean (2017/08), @jfastnacht (2017/09), @ackintosh (2017/09) [:heart:](https://www.patreon.com/ackintosh/overview), @ybelenko (2018/07), @renepardon (2018/12)                     |
 | PowerShell        | @wing328 (2020/05)                                                                                                                                                                                                                                  |
-| Python            | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) @Jyhess (2019/01) @arun-nalla (2019/11) @spacether (2019/11)                                                |
+| Python            | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) @Jyhess (2019/01) @arun-nalla (2019/11) @spacether (2019/11) [:heart:][spacether sponsorship]               |
 | R                 | @Ramanth (2019/07) @saigiridhar21 (2019/07)                                                                                                                                                                                       |
 | Ruby              | @cliffano (2017/07) @zlx (2017/09) @autopp (2019/02)                                                                                                                                                                             |
 | Rust              | @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05)                                                                                                                               |
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -48,6 +48,8 @@ build_script:
  - 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 (generichost)
+  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\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
@@ -75,6 +77,8 @@ test_script:
  - 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 (generichost)
+  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\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
--- a/bin/configs/aspnetcore-6.0.yaml
+++ b/bin/configs/aspnetcore-6.0.yaml
@@ -0,0 +1,8 @@
+generatorName: aspnetcore
+outputDir: samples/server/petstore/aspnetcore-6.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: "6.0"
+  userSecretsGuid: 'cb87e868-8646-48ef-9bb6-344b537d0d37'
--- a/bin/configs/other/avro-schema.yaml
+++ b/bin/configs/other/avro-schema.yaml
--- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml
@@ -0,0 +1,11 @@
+# for csharp-netcore generichost
+generatorName: csharp-netcore
+outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+library: generichost
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  targetFramework: net6.0
+  nullableReferenceTypes: true
--- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml
@@ -0,0 +1,11 @@
+# for csharp-netcore generichost
+generatorName: csharp-netcore
+outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+library: generichost
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  targetFramework: net6.0
+  nullableReferenceTypes: false
--- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml
@@ -0,0 +1,10 @@
+# for csharp-netcore generichost
+generatorName: csharp-netcore
+outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+library: generichost
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  targetFramework: netstandard2.0
--- a/bin/configs/csharp-netcore-OpenAPIClientCore.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClientCore.yaml
@@ -4,5 +4,5 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-f
 templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
 additionalProperties:
  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  targetFramework: netcoreapp2.0
+  targetFramework: netcoreapp3.1
  useCompareNetObjects: "true"
--- a/bin/configs/csharp-netcore-OpenAPIClientCoreAndNet47.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClientCoreAndNet47.yaml
@@ -4,5 +4,5 @@ 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
+  targetFramework: netstandard2.1;net47
  useCompareNetObjects: "true"
--- a/bin/configs/dart-dio-next-dio-http-petstore-client-lib-fake.yaml
+++ b/bin/configs/dart-dio-next-dio-http-petstore-client-lib-fake.yaml
@@ -1,11 +0,0 @@
-generatorName: dart-dio-next
-outputDir: samples/openapi3/client/petstore/dart-dio-next/dio_http_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"
-  dioLibrary: "dio_http"
--- a/bin/configs/java-camel-petstore-new.yaml
+++ b/bin/configs/java-camel-petstore-new.yaml
@@ -0,0 +1,17 @@
+generatorName: java-camel
+outputDir: samples/server/petstore/java-camel
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/java-camel-server
+additionalProperties:
+  oas3: "true"
+  hideGenerationTimestamp: true
+  camelRestBindingMode: "auto"
+  performBeanValidation: true
+  #dateLibrary: "java8-localdatetime"
+  camelDataformatProperties: "json.out.disableFeatures=WRITE_DATES_AS_TIMESTAMPS"
+  library: "spring-boot"
+  withXml: true
+  jackson: true
+  camelUseDefaulValidationtErrorProcessor: true
+  camelRestClientRequestValidation: true
+  camelSecurityDefinitions: true
--- a/bin/configs/java-micronaut-client.yaml
+++ b/bin/configs/java-micronaut-client.yaml
@@ -7,3 +7,4 @@ additionalProperties:
  configureAuth: "false"
  build: "all"
  test: "spock"
+  requiredPropertiesInConstructor: "false"
--- a/bin/configs/java-micronaut-server.yaml
+++ b/bin/configs/java-micronaut-server.yaml
@@ -0,0 +1,10 @@
+generatorName: java-micronaut-server
+outputDir: samples/server/petstore/java-micronaut-server/
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+additionalProperties:
+  artifactId: petstore-micronaut-server
+  hideGenerationTimestamp: "true"
+  build: "all"
+  test: "spock"
+  requiredPropertiesInConstructor: "true"
+  useAuth: "false"
--- a/bin/configs/java-okhttp-gson-nextgen.yaml
+++ b/bin/configs/java-okhttp-gson-nextgen.yaml
@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/okhttp-gson-nextgen
-library: okhttp-gson-nextgen
-#inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-okhttp-gson-nextgen
-  hideGenerationTimestamp: "true"
--- a/bin/configs/java-okhttp-gson.yaml
+++ b/bin/configs/java-okhttp-gson.yaml
@@ -1,7 +1,7 @@
 generatorName: java
 outputDir: samples/client/petstore/java/okhttp-gson
 library: okhttp-gson
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml
 templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
  artifactId: petstore-okhttp-gson
--- a/bin/configs/java-play-framework-fake-endpoints-with-security.yaml
+++ b/bin/configs/java-play-framework-fake-endpoints-with-security.yaml
@@ -0,0 +1,6 @@
+generatorName: java-play-framework
+outputDir: samples/server/petstore/java-play-framework-fake-endpoints-with-security
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+additionalProperties:
+  hideGenerationTimestamp: "true"
--- a/bin/configs/k6.yaml
+++ b/bin/configs/k6.yaml
@@ -0,0 +1,6 @@
+generatorName: k6
+outputDir: samples/client/petstore/k6
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/k6
+additionalProperties:
+  appName: PetstoreClient
--- a/bin/configs/kotlin-array-simple-string.yaml
+++ b/bin/configs/kotlin-array-simple-string.yaml
@@ -0,0 +1,6 @@
+generatorName: kotlin
+outputDir: samples/client/petstore/kotlin-array-simple-string
+inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+additionalProperties:
+  artifactId: kotlin-array-simple-string
--- a/bin/configs/kotlin-enum-default-value.yaml
+++ b/bin/configs/kotlin-enum-default-value.yaml
@@ -6,3 +6,4 @@ additionalProperties:
  artifactId: kotlin-enum-default-value
  serializableModel: "true"
  dateLibrary: java8
+  enumUnknownDefaultCase: true
--- a/bin/configs/kotlin-jvm-okhttp3-okhttp3.yaml
+++ b/bin/configs/kotlin-jvm-okhttp3-okhttp3.yaml
@@ -5,3 +5,4 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
  artifactId: kotlin-petstore-okhttp3
+  enumUnknownDefaultCase: true
--- a/bin/configs/kotlin-jvm-volley.yaml
+++ b/bin/configs/kotlin-jvm-volley.yaml
@@ -0,0 +1,9 @@
+generatorName: kotlin
+outputDir: samples/client/petstore/kotlin-jvm-volley
+library: jvm-volley
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+additionalProperties:
+  artifactId: kotlin-petstore-jvm-volley
+  generateRoomModels: "true"
+  serializationLibrary: "gson"
--- a/bin/configs/kotlin-modelMutable.yaml
+++ b/bin/configs/kotlin-modelMutable.yaml
@@ -0,0 +1,7 @@
+generatorName: kotlin
+outputDir: samples/client/petstore/kotlin-modelMutable
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+additionalProperties:
+  artifactId: kotlin-modelMutable
+  modelMutable: "true"
--- a/bin/configs/kotlin-server-jaxrs-spec.yaml
+++ b/bin/configs/kotlin-server-jaxrs-spec.yaml
@@ -0,0 +1,7 @@
+generatorName: kotlin-server
+outputDir: samples/server/petstore/kotlin-server/jaxrs-spec
+library: jaxrs-spec
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-server
+additionalProperties:
+  useCoroutines: "true"
--- a/bin/configs/kotlin-server-modelMutable.yaml
+++ b/bin/configs/kotlin-server-modelMutable.yaml
@@ -0,0 +1,8 @@
+generatorName: kotlin-server
+outputDir: samples/server/petstore/kotlin-server-modelMutable
+library: ktor
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-server
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  modelMutable: "true"
--- a/bin/configs/kotlin-vertx-modelMutable.yaml
+++ b/bin/configs/kotlin-vertx-modelMutable.yaml
@@ -0,0 +1,6 @@
+generatorName: kotlin-vertx
+outputDir: samples/server/petstore/kotlin-vertx-modelMutable
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-vertx-server
+additionalProperties:
+  modelMutable: "true"
--- a/bin/configs/ktorm-schema-modelMutable.yaml
+++ b/bin/configs/ktorm-schema-modelMutable.yaml
@@ -0,0 +1,8 @@
+generatorName: ktorm-schema
+outputDir: samples/schema/petstore/ktorm-modelMutable
+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
+  modelMutable: "true"
--- a/bin/configs/other/csharp-nancyfx-nancyfx-async.yaml
+++ b/bin/configs/other/csharp-nancyfx-nancyfx-async.yaml
@@ -1,7 +0,0 @@
-generatorName: csharp-nancyfx
-outputDir: samples/server/petstore/nancyfx-async
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-nancyfx
-additionalProperties:
-  asyncServer: "true"
-  packageGuid: '{768B8DC6-54EE-4D40-9B20-7857E1D742A4}'
--- a/bin/configs/other/csharp-nancyfx-nancyfx.yaml
+++ b/bin/configs/other/csharp-nancyfx-nancyfx.yaml
@@ -1,7 +0,0 @@
-generatorName: csharp-nancyfx
-outputDir: samples/server/petstore/nancyfx
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-nancyfx
-additionalProperties:
-  asyncServer: "false"
-  packageGuid: '{768B8DC6-54EE-4D40-9B20-7857E1D742A4}'
--- a/bin/configs/other/openapi3/flash.yaml
+++ b/bin/configs/other/openapi3/flash.yaml
@@ -1,7 +0,0 @@
-generatorName: flash
-outputDir: samples/client/petstore/flash
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/flash
-additionalProperties:
-  invokerPackage: org.openapitools
-  packageName: org.openapitools
--- a/bin/configs/python-experimental.yaml
+++ b/bin/configs/python-experimental.yaml
@@ -0,0 +1,7 @@
+generatorName: python-experimental
+outputDir: samples/openapi3/client/petstore/python-experimental
+inputSpec: modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/python-experimental
+additionalProperties:
+  packageName: petstore_api
+  recursionLimit: "1234"
--- a/bin/configs/spring-boot-beanvalidation-no-nullable-oas3.yaml
+++ b/bin/configs/spring-boot-beanvalidation-no-nullable-oas3.yaml
@@ -0,0 +1,13 @@
+generatorName: spring
+outputDir: samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable
+library: spring-boot
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  java8: "false"
+  useBeanValidation: true
+  artifactId: spring-boot-beanvalidation-no-nullable
+  hideGenerationTimestamp: "true"
+  openApiNullable: "false"
--- a/bin/configs/spring-boot-beanvalidation-no-nullable.yaml
+++ b/bin/configs/spring-boot-beanvalidation-no-nullable.yaml
@@ -4,6 +4,7 @@ library: spring-boot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  java8: "false"
  useBeanValidation: true
  artifactId: spring-boot-beanvalidation-no-nullable
--- a/bin/configs/spring-boot-beanvalidation.yaml
+++ b/bin/configs/spring-boot-beanvalidation.yaml
@@ -4,6 +4,8 @@ library: spring-boot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
+  useSwaggerUI: false
  java8: true
  useBeanValidation: true
  artifactId: spring-boot-beanvalidation
--- a/bin/configs/spring-boot-delegate-j8.yaml
+++ b/bin/configs/spring-boot-delegate-j8.yaml
@@ -3,6 +3,7 @@ outputDir: samples/server/petstore/springboot-delegate-j8
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-delegate-j8
  hideGenerationTimestamp: "true"
  delegatePattern: "true"
--- a/bin/configs/spring-boot-delegate-oas3.yaml
+++ b/bin/configs/spring-boot-delegate-oas3.yaml
@@ -0,0 +1,11 @@
+generatorName: spring
+outputDir: samples/openapi3/server/petstore/springboot-delegate
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: springboot-delegate
+  hideGenerationTimestamp: "true"
+  java8: true
+  delegatePattern: "true"
--- a/bin/configs/spring-boot-delegate.yaml
+++ b/bin/configs/spring-boot-delegate.yaml
@@ -3,6 +3,7 @@ outputDir: samples/server/petstore/springboot-delegate
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-delegate
  hideGenerationTimestamp: "true"
  java8: true
--- a/bin/configs/spring-boot-implicitHeaders-oas3.yaml
+++ b/bin/configs/spring-boot-implicitHeaders-oas3.yaml
@@ -0,0 +1,11 @@
+generatorName: spring
+outputDir: samples/openapi3/server/petstore/springboot-implicitHeaders
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  oas3: "true"
+  artifactId: springboot-implicitHeaders
+  hideGenerationTimestamp: "true"
+  implicitHeaders: true
--- a/bin/configs/spring-boot-implicitHeaders.yaml
+++ b/bin/configs/spring-boot-implicitHeaders.yaml
@@ -4,5 +4,6 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  artifactId: springboot-implicitHeaders
+  documentationProvider: springfox
  hideGenerationTimestamp: "true"
  implicitHeaders: true
--- a/bin/configs/spring-boot-oas3.yaml
+++ b/bin/configs/spring-boot-oas3.yaml
@@ -0,0 +1,10 @@
+generatorName: spring
+outputDir: samples/openapi3/server/petstore/springboot
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: springboot
+  snapshotVersion: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-reactive-oas3.yaml
+++ b/bin/configs/spring-boot-reactive-oas3.yaml
@@ -0,0 +1,11 @@
+generatorName: spring
+outputDir: samples/openapi3/server/petstore/springboot-reactive
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: springboot-reactive
+  reactive: "true"
+  hideGenerationTimestamp: "true"
+  delegatePattern: "true"
--- a/bin/configs/spring-boot-reactive.yaml
+++ b/bin/configs/spring-boot-reactive.yaml
@@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  artifactId: springboot-reactive
+  documentationProvider: springfox
  reactive: "true"
  hideGenerationTimestamp: "true"
  delegatePattern: "true"
--- a/bin/configs/spring-boot-source.yaml
+++ b/bin/configs/spring-boot-source.yaml
@@ -0,0 +1,10 @@
+generatorName: spring
+outputDir: samples/openapi3/server/petstore/springboot-source
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: source
+  artifactId: springboot
+  snapshotVersion: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-springdoc.yaml
+++ b/bin/configs/spring-boot-springdoc.yaml
@@ -0,0 +1,11 @@
+generatorName: spring
+outputDir: samples/openapi3/server/petstore/spring-boot-springdoc
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  useSwaggerUI: false
+  artifactId: spring-boot-springdoc
+  snapshotVersion: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-useoptional-oas3.yaml
+++ b/bin/configs/spring-boot-useoptional-oas3.yaml
@@ -0,0 +1,10 @@
+generatorName: spring
+outputDir: samples/openapi3/server/petstore/springboot-useoptional
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  useOptional: true
+  artifactId: spring-boot-useoptional
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-useoptional.yaml
+++ b/bin/configs/spring-boot-useoptional.yaml
@@ -3,6 +3,7 @@ outputDir: samples/server/petstore/springboot-useoptional
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  useOptional: true
  artifactId: spring-boot-useoptional
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-virtualan.yaml
+++ b/bin/configs/spring-boot-virtualan.yaml
@@ -4,6 +4,7 @@ library: spring-boot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  apiPackage: org.openapitools.virtualan.api
  modelPackage: org.openapitools.virtualan.model
  virtualService: true
--- a/bin/configs/spring-boot.yaml
+++ b/bin/configs/spring-boot.yaml
@@ -3,6 +3,7 @@ outputDir: samples/server/petstore/springboot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot
  snapshotVersion: "true"
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-cloud-async-oas3.yaml
+++ b/bin/configs/spring-cloud-async-oas3.yaml
@@ -0,0 +1,12 @@
+generatorName: spring
+outputDir: samples/openapi3/client/petstore/spring-cloud-async
+library: spring-cloud
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  async: "true"
+  java8: "true"
+  artifactId: petstore-spring-cloud
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-cloud-async.yaml
+++ b/bin/configs/spring-cloud-async.yaml
@@ -4,6 +4,7 @@ library: spring-cloud
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  async: "true"
  java8: "true"
  artifactId: petstore-spring-cloud
--- a/bin/configs/spring-cloud-date-time-oas3.yaml
+++ b/bin/configs/spring-cloud-date-time-oas3.yaml
@@ -0,0 +1,12 @@
+generatorName: spring
+library: spring-cloud
+outputDir: samples/openapi3/client/petstore/spring-cloud-date-time
+inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: spring-cloud-date-time-oas3
+  interfaceOnly: "true"
+  singleContentTypes: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-cloud-date-time.yaml
+++ b/bin/configs/spring-cloud-date-time.yaml
@@ -0,0 +1,11 @@
+generatorName: spring
+library: spring-cloud
+outputDir: samples/client/petstore/spring-cloud-date-time
+inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  documentationProvider: springfox
+  artifactId: spring-cloud-date-time
+  interfaceOnly: "true"
+  singleContentTypes: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-cloud-oas3-fakeapi.yaml
+++ b/bin/configs/spring-cloud-oas3-fakeapi.yaml
@@ -0,0 +1,12 @@
+generatorName: spring
+library: spring-cloud
+outputDir: samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: spring-cloud-oas3
+  interfaceOnly: "true"
+  singleContentTypes: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-cloud-oas3.yaml
+++ b/bin/configs/spring-cloud-oas3.yaml
@@ -0,0 +1,12 @@
+generatorName: spring
+library: spring-cloud
+outputDir: samples/openapi3/client/petstore/spring-cloud
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: spring-cloud-oas3
+  interfaceOnly: "true"
+  singleContentTypes: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml
+++ b/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml
@@ -0,0 +1,10 @@
+generatorName: spring
+outputDir: samples/openapi3/client/petstore/spring-cloud-spring-pageable
+library: spring-cloud
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: spring-cloud-spring-pageable
+  hideGenerationTimestamp: 'true'
--- a/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml
+++ b/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml
@@ -4,5 +4,6 @@ library: spring-cloud
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: spring-cloud-spring-pageable
  hideGenerationTimestamp: 'true'
--- a/bin/configs/spring-cloud.yaml
+++ b/bin/configs/spring-cloud.yaml
@@ -4,5 +4,6 @@ library: spring-cloud
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: petstore-spring-cloud
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-mvc-default-values.yaml
+++ b/bin/configs/spring-mvc-default-values.yaml
@@ -1,7 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/spring-mvc-default-value
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_8535.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  artifactId: spring-mvc-default-value
--- a/bin/configs/spring-mvc-j8-async.yaml
+++ b/bin/configs/spring-mvc-j8-async.yaml
@@ -1,11 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/spring-mvc-j8-async
-library: spring-mvc
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  async: "true"
-  java8: true
-  artifactId: spring-mvc-server-j8-async
-  hideGenerationTimestamp: "true"
-  serverPort: "8002"
--- a/bin/configs/spring-mvc-j8-localdatetime.yaml
+++ b/bin/configs/spring-mvc-j8-localdatetime.yaml
@@ -1,11 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/spring-mvc-j8-localdatetime
-library: spring-mvc
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  booleanGetterPrefix: get
-  artifactId: spring-mvc-j8-localdatetime
-  hideGenerationTimestamp: "true"
-  serverPort: "8002"
-  dateLibrary: java8-localdatetime
--- a/bin/configs/spring-mvc-no-nullable.yaml
+++ b/bin/configs/spring-mvc-no-nullable.yaml
@@ -1,10 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/spring-mvc-no-nullable
-library: spring-mvc
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  artifactId: spring-mvc-server-no-nullable
-  openApiNullable: "false"
-  serverPort: "8002"
-  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml
+++ b/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml
@@ -1,8 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/spring-mvc-spring-pageable
-library: spring-mvc
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  artifactId: spring-mvc-spring-pageable
-  hideGenerationTimestamp: 'true'
--- a/bin/configs/spring-mvc.yaml
+++ b/bin/configs/spring-mvc.yaml
@@ -1,13 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/spring-mvc
-library: spring-mvc
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  java8: true
-  booleanGetterPrefix: get
-  artifactId: spring-mvc-server
-  hideGenerationTimestamp: "true"
-  serverPort: "8002"
-  additionalModelTypeAnnotations: '@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name");@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")'
-  additionalEnumTypeAnnotations: '@com.fasterxml.jackson.annotation.JsonFormat'
--- a/bin/configs/spring-nullable-set.yaml
+++ b/bin/configs/spring-nullable-set.yaml
@@ -0,0 +1,10 @@
+generatorName: spring
+library: spring-boot
+outputDir: samples/server/petstore/spring-boot-nullable-set
+inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/10167-nullable-set.yml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  artifactId: spring-boot-nullable-set
+  interfaceOnly: "true"
+  singleContentTypes: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-stubs-oas3.yaml
+++ b/bin/configs/spring-stubs-oas3.yaml
@@ -0,0 +1,11 @@
+generatorName: spring
+outputDir: samples/openapi3/client/petstore/spring-stubs
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: spring-stubs
+  interfaceOnly: "true"
+  singleContentTypes: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-stubs-skip-default-interface.yaml
+++ b/bin/configs/spring-stubs-skip-default-interface.yaml
@@ -0,0 +1,13 @@
+generatorName: spring
+outputDir: samples/openapi3/client/petstore/spring-stubs-skip-default-interface
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: spring-stubs
+  interfaceOnly: "true"
+  unhandledException: true
+  skipDefaultInterface: true
+  singleContentTypes: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-stubs.yaml
+++ b/bin/configs/spring-stubs.yaml
@@ -3,6 +3,7 @@ outputDir: samples/client/petstore/spring-stubs
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: spring-stubs
  interfaceOnly: "true"
  singleContentTypes: "true"
--- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml
@@ -6,5 +6,6 @@ templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 delegatePattern: true
 java8: false
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-spring-pageable-delegatePattern-without-j8
  hideGenerationTimestamp: 'true'
--- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml
@@ -5,5 +5,6 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 delegatePattern: true
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-spring-pageable-delegatePattern
  hideGenerationTimestamp: 'true'
--- a/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml
@@ -5,5 +5,6 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 java8: false
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-spring-pageable-withoutj8
  hideGenerationTimestamp: 'true'
--- a/bin/configs/springboot-petstore-server-spring-pageable.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable.yaml
@@ -4,5 +4,6 @@ library: spring-boot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-spring-pageable
  hideGenerationTimestamp: 'true'
--- a/bin/configs/swift5-frozenEnums.yaml
+++ b/bin/configs/swift5-frozenEnums.yaml
@@ -7,6 +7,6 @@ additionalProperties:
  podAuthors: ""
  podSummary: PetstoreClient
  sortParamsByRequiredFlag: false
-  generateFrozenEnums: false
+  enumUnknownDefaultCase: true
  projectName: PetstoreClient
  podHomepage: https://github.com/openapitools/openapi-generator
--- a/bin/configs/typescript-angular-v12-provided-in-root-with-npm.yaml
+++ b/bin/configs/typescript-angular-v12-provided-in-root-with-npm.yaml
@@ -3,7 +3,7 @@ outputDir: samples/client/petstore/typescript-angular-v12-provided-in-root/build
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/typescript-angular
 additionalProperties:
-  ngVersion: 12.0.0
+  ngVersion: 12.2.0
  npmVersion: 1.0.0
  npmName: '@openapitools/typescript-angular-petstore'
  npmRepository: https://skimdb.npmjs.com/registry
--- a/bin/configs/typescript-angular-v12-provided-in-root.yaml
+++ b/bin/configs/typescript-angular-v12-provided-in-root.yaml
@@ -3,4 +3,4 @@ outputDir: samples/client/petstore/typescript-angular-v12-provided-in-root/build
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/typescript-angular
 additionalProperties:
-  ngVersion: 12.0.0
+  ngVersion: 12.2.0
--- a/bin/configs/typescript-axios-with-node-imports.yaml
+++ b/bin/configs/typescript-axios-with-node-imports.yaml
@@ -0,0 +1,7 @@
+generatorName: typescript-axios
+outputDir: samples/client/petstore/typescript-axios/builds/with-node-imports
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+additionalProperties:
+  withNodeImports: "true"
+  multipartFormData: "true"
--- a/bin/configs/typescript-axios-with-string-enums.yaml
+++ b/bin/configs/typescript-axios-with-string-enums.yaml
@@ -0,0 +1,6 @@
+generatorName: typescript-axios
+outputDir: samples/client/petstore/typescript-axios/builds/with-string-enums
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+additionalProperties:
+  stringEnums: true
--- a/bin/configs/typescript-with-unique-items.yaml
+++ b/bin/configs/typescript-with-unique-items.yaml
@@ -0,0 +1,4 @@
+generatorName: typescript
+outputDir: samples/client/others/typescript/builds/with-unique-items
+inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript/unique_items.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -36,7 +36,7 @@ _How_ you provide values to options also depends on the tool. OpenAPI Generator
 openApiGenerate {
    globalProperties = [
        apis: "",
-        models: "User,Pet"
+        models: "User:Pet"
    ]
 }
 ```
--- a/docs/faq-generators.md
+++ b/docs/faq-generators.md
@@ -5,7 +5,7 @@ title: "FAQ: Generators"

 ### What are some server generator use cases?

-We have around 40+ server generators, with more added regularly. Some of these include Spring in your choice of Java or Kotlin, the Finch and Scalatra frameworks using Scala, and C# generators for NancyFX and WebAPI (to name only a few).
+We have around 40+ server generators, with more added regularly. Some of these include Spring in your choice of Java or Kotlin, the Finch and Scalatra frameworks using Scala, and C# generators for ASP.NET and Azure Functions (to name only a few).

 Besides generating the server code as a starting point to implement the API backend, here are some use cases of the server generators:

--- a/docs/generators.md
+++ b/docs/generators.md
@@ -24,15 +24,12 @@ The following generators are available:
 * [dart](generators/dart.md)  
 * [dart-dio](generators/dart-dio.md)  
 * [dart-dio-next (experimental)](generators/dart-dio-next.md)  
-* [dart-jaguar (deprecated)](generators/dart-jaguar.md)  
 * [eiffel](generators/eiffel.md)  
 * [elixir](generators/elixir.md)  
 * [elm](generators/elm.md)  
 * [erlang-client](generators/erlang-client.md)  
 * [erlang-proper](generators/erlang-proper.md)  
-* [flash-deprecated (deprecated)](generators/flash-deprecated.md)  
 * [go](generators/go.md)  
-* [go-deprecated (deprecated)](generators/go-deprecated.md)  
 * [groovy](generators/groovy.md)  
 * [haskell-http-client](generators/haskell-http-client.md)  
 * [java](generators/java.md)  
@@ -53,7 +50,8 @@ The following generators are available:
 * [php](generators/php.md)  
 * [php-dt (beta)](generators/php-dt.md)  
 * [powershell (beta)](generators/powershell.md)  
-* [python (experimental)](generators/python.md)  
+* [python](generators/python.md)  
+* [python-experimental (experimental)](generators/python-experimental.md)  
 * [python-legacy](generators/python-legacy.md)  
 * [r](generators/r.md)  
 * [ruby](generators/ruby.md)  
@@ -63,11 +61,9 @@ The following generators are available:
 * [scala-httpclient-deprecated (deprecated)](generators/scala-httpclient-deprecated.md)  
 * [scala-sttp (beta)](generators/scala-sttp.md)  
 * [scalaz](generators/scalaz.md)  
-* [swift4-deprecated (deprecated)](generators/swift4-deprecated.md)  
 * [swift5](generators/swift5.md)  
 * [typescript (experimental)](generators/typescript.md)  
 * [typescript-angular](generators/typescript-angular.md)  
-* [typescript-angularjs-deprecated (deprecated)](generators/typescript-angularjs-deprecated.md)  
 * [typescript-aurelia](generators/typescript-aurelia.md)  
 * [typescript-axios](generators/typescript-axios.md)  
 * [typescript-fetch](generators/typescript-fetch.md)  
@@ -85,7 +81,6 @@ The following generators are available:
 * [cpp-pistache-server](generators/cpp-pistache-server.md)  
 * [cpp-qt-qhttpengine-server](generators/cpp-qt-qhttpengine-server.md)  
 * [cpp-restbed-server](generators/cpp-restbed-server.md)  
-* [csharp-nancyfx](generators/csharp-nancyfx.md)  
 * [csharp-netcore-functions (beta)](generators/csharp-netcore-functions.md)  
 * [erlang-server](generators/erlang-server.md)  
 * [fsharp-functions (beta)](generators/fsharp-functions.md)  
@@ -96,7 +91,9 @@ The following generators are available:
 * [graphql-nodejs-express-server](generators/graphql-nodejs-express-server.md)  
 * [haskell](generators/haskell.md)  
 * [haskell-yesod (beta)](generators/haskell-yesod.md)  
+* [java-camel](generators/java-camel.md)  
 * [java-inflector](generators/java-inflector.md)  
+* [java-micronaut-server (beta)](generators/java-micronaut-server.md)  
 * [java-msf4j](generators/java-msf4j.md)  
 * [java-pkmst](generators/java-pkmst.md)  
 * [java-play-framework](generators/java-play-framework.md)  
@@ -111,14 +108,12 @@ The following generators are available:
 * [jaxrs-resteasy-eap](generators/jaxrs-resteasy-eap.md)  
 * [jaxrs-spec](generators/jaxrs-spec.md)  
 * [kotlin-server](generators/kotlin-server.md)  
-* [kotlin-server-deprecated (deprecated)](generators/kotlin-server-deprecated.md)  
 * [kotlin-spring](generators/kotlin-spring.md)  
 * [kotlin-vertx (beta)](generators/kotlin-vertx.md)  
 * [nodejs-express-server (beta)](generators/nodejs-express-server.md)  
 * [php-laravel](generators/php-laravel.md)  
 * [php-lumen](generators/php-lumen.md)  
 * [php-mezzio-ph](generators/php-mezzio-ph.md)  
-* [php-silex-deprecated (deprecated)](generators/php-silex-deprecated.md)  
 * [php-slim-deprecated (deprecated)](generators/php-slim-deprecated.md)  
 * [php-slim4](generators/php-slim4.md)  
 * [php-symfony](generators/php-symfony.md)  
--- a/docs/generators/README.md
+++ b/docs/generators/README.md
@@ -15,13 +15,11 @@ The following generators are available:
 * [csharp-netcore](csharp-netcore.md)  
 * [dart](dart.md)  
 * [dart-dio](dart-dio.md)  
-* [dart-jaguar](dart-jaguar.md)  
 * [eiffel](eiffel.md)  
 * [elixir](elixir.md)  
 * [elm](elm.md)  
 * [erlang-client](erlang-client.md)  
 * [erlang-proper](erlang-proper.md)  
-* [flash](flash.md)  
 * [go](go.md)  
 * [go-experimental (experimental)](go-experimental.md)  
 * [groovy](groovy.md)  
@@ -69,7 +67,6 @@ The following generators are available:
 * [cpp-pistache-server](cpp-pistache-server.md)  
 * [cpp-qt5-qhttpengine-server](cpp-qt5-qhttpengine-server.md)  
 * [cpp-restbed-server](cpp-restbed-server.md)  
-* [csharp-nancyfx](csharp-nancyfx.md)  
 * [erlang-server](erlang-server.md)  
 * [fsharp-functions (beta)](fsharp-functions.md)  
 * [fsharp-giraffe-server (beta)](fsharp-giraffe-server.md)  
@@ -92,7 +89,6 @@ The following generators are available:
 * [jaxrs-resteasy-eap](jaxrs-resteasy-eap.md)  
 * [jaxrs-spec](jaxrs-spec.md)  
 * [kotlin-server](kotlin-server.md)  
-* [kotlin-server-deprecated](kotlin-server-deprecated.md)  
 * [kotlin-spring](kotlin-spring.md)  
 * [kotlin-vertx (beta)](kotlin-vertx.md)  
 * [nodejs-express-server (beta)](nodejs-express-server.md)  
--- a/Show More
+++ b/Show More