test py libs with experimental

2020-09-28 09:59:45 +08:00
10792 changed files with 227998 additions and 461859 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,118 +0,0 @@
-version: 2
-jobs:
-  build:
-    #    docker:
-    #      #- image: openapitools/openapi-generator
-    #      - image: swaggerapi/petstore
-    #        environment:
-    #          SWAGGER_HOST=http://petstore.swagger.io
-    #          SWAGGER_BASE_PATH=/v2
-    machine:
-      image: circleci/classic:latest
-    working_directory: ~/OpenAPITools/openapi-generator
-    parallelism: 3
-    shell: /bin/bash --login
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
-      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
-    steps:
-    # Restore the dependency cache
-    - restore_cache:
-        keys:
-        # Default branch if not
-        - source-v2-{{ .Branch }}-{{ .Revision }}
-        - source-v2-{{ .Branch }}-
-        - source-v2-
-    # Machine Setup
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-    # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
-    - checkout
-    # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
-    # In many cases you can simplify this from what is generated here.
-    # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
-    - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-    # This is based on your 1.0 configuration file or project settings
-    - run:
-        command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
-    - run:
-        command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; '
-    - run:
-       command: |-
-         printf '127.0.0.1       petstore.swagger.io
-         ' | sudo tee -a /etc/hosts
-    # Dependencies
-    # Install latest stable node for angular 6
-    - run:
-        name: Install node@stable (for angular 6)
-        command: |
-          set +e
-          curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
-          export NVM_DIR="/opt/circleci/.nvm"
-          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-          nvm install stable
-          nvm alias default stable
-
-          # Each step uses the same `$BASH_ENV`, so need to modify it
-          echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
-          echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
-    - run: node --version
-#    - run: docker pull openapitools/openapi-petstore
-#    - run: docker run -d -e OPENAPI_BASE_PATH=/v3 -e DISABLE_API_KEY=1 -e DISABLE_OAUTH=1 -p 80:8080 openapitools/openapi-petstore
-    - run: docker pull swaggerapi/petstore
-    - run: docker run --name petstore.swagger -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
-    - run: docker ps -a
-    - run: sleep 30
-    - run: cat /etc/hosts
-    # Test
-    - run: mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-    - run: ./CI/circle_parallel.sh 
-    # Save dependency cache
-    - save_cache:
-        key: source-v2-{{ .Branch }}-{{ .Revision }}
-        paths:
-        # This is a broad list of cache paths to include many possible development environments
-        # You can probably delete some of these entries
-        - vendor/bundle
-        - ~/virtualenvs
-        - ~/.m2
-        - ~/.ivy2
-        - ~/.sbt
-        - ~/.bundle
-        - ~/.go_workspace
-        - ~/.gradle
-        - ~/.cache/bower
-        - ".git"
-        - ~/.stack
-        - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
-        - ~/R
-    # save "default" cache using the key "source-v2-"
-    - save_cache:
-        key: source-v2-
-        paths:
-        # This is a broad list of cache paths to include many possible development environments
-        # You can probably delete some of these entries
-        - vendor/bundle
-        - ~/virtualenvs
-        - ~/.m2
-        - ~/.ivy2
-        - ~/.sbt
-        - ~/.bundle
-        - ~/.go_workspace
-        - ~/.gradle
-        - ~/.cache/bower
-        - ".git"
-        - ~/.stack
-        - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
-        - ~/R
-    # Teardown
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-    # Save test results
-    - store_test_results:
-        path: /tmp/circleci-test-results
-    # Save artifacts
-    - store_artifacts:
-        path: /tmp/circleci-artifacts
-    - store_artifacts:
-        path: /tmp/circleci-test-results
--- a/.github/.test/samples.json
+++ b/.github/.test/samples.json
@@ -807,7 +807,7 @@
      ]
    },
    {
-      "input": "php-mezzio-ph-petstore-server.sh",
+      "input": "php-ze-ph-petstore-server.sh",
      "matches": [
        "Server: PHP"
      ]
@@ -1244,30 +1244,6 @@
        "Client: TypeScript"
      ]
    },
-    {
-      "input": "typescript-nestjs-v6-petstore-not-provided-in-root-with-npm.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "typescript-nestjs-v6-petstore-not-provided-in-root.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "typescript-nestjs-v6-petstore-provided-in-root-with-npm.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "typescript-nestjs-v6-petstore-provided-in-root.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
    {
      "input": "typescript-node-petstore-with-npm.sh",
      "matches": [
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,16 +5,7 @@
 
 - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md).
 - [ ] Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
- [ ] Run the following to [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) and update samples:
-  ```
-  ./mvnw clean package 
-  ./bin/generate-samples.sh
-  ./bin/utils/export_docs_generators.sh
-  ``` 
-  Commit all changed files. 
-  This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. 
-  These must match the expectations made by your contribution. 
-  You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. 
-  For Windows users, please run the script in [Git BASH](https://gitforwindows.org/).
- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `5.1.x`, `6.0.x`
- [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request.
+- [ ] If contributing template-only or documentation-only changes which will change sample output, [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) beforehand.
+- [ ] Run the shell script `./bin/generate-samples.sh`to update all Petstore samples related to your fix. This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. For Windows users, please run the script in [Git BASH](https://gitforwindows.org/).
+- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`
+- [ ] Copy the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language.
--- a/.github/workflows/check-supported-versions.yaml
+++ b/.github/workflows/check-supported-versions.yaml
@@ -6,7 +6,7 @@ on:

 jobs:
  build:
-    name: 'Build: JDK ${{ matrix.java }} (${{ matrix.os }})'
+    name: Build on JDK ${{ matrix.java }} and ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
@@ -48,6 +48,10 @@ jobs:
        shell: bash
        run: mvn -nsu -B --quiet -Djacoco.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress clean install --file pom.xml ${{ matrix.flags }}

+      - name: Test gradle
+        shell: bash
+        run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace
+
      - name: Upload Maven build artifact
        uses: actions/upload-artifact@v1
        if: matrix.java == '8' && matrix.os == 'ubuntu-latest'
@@ -55,19 +59,8 @@ jobs:
          name: artifact
          path: modules/openapi-generator-cli/target/openapi-generator-cli.jar

-      - name: Test Gradle plugin usage
-        shell: bash
-        run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace
-
-      - name: Test Maven plugin integration
-        if: matrix.java == '8'
-        shell: bash
-        run: |
-          cd modules/openapi-generator-maven-plugin
-          mvn verify -Pintegration
-
  verify:
-    name: Verify outputs on ${{ matrix.os }}
+    name: Verifies integrity of the commit on ${{ matrix.os }}
    needs: build
    runs-on: ${{ matrix.os }}
    strategy:
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,6 @@ packages/
 .vscode/
 **/.vs
 .factorypath
-.metals/*

 .settings

@@ -177,12 +176,12 @@ samples/client/petstore/python-tornado/.venv/
 # PHP
 samples/client/petstore/php/OpenAPIClient-php/composer.lock
 samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/composer.lock
-samples/openapi3/server/petstore/php-mezzio-ph/composer.lock
+samples/openapi3/server/petstore/php-ze-ph/composer.lock
 samples/server/petstore/php-laravel/lib/composer.lock
 samples/server/petstore/php-lumen/lib/composer.lock
 samples/server/petstore/php-slim4/composer.lock
 samples/server/petstore/php-symfony/SymfonyBundle-php/composer.lock
-samples/server/petstore/php-mezzio-ph/composer.lock
+samples/server/petstore/php-ze-ph/composer.lock

 # ts
 samples/client/petstore/typescript-angular2/npm/npm-debug.log
@@ -235,15 +234,11 @@ samples/client/petstore/erlang-proper/rebar.lock
 samples/server/petstore/erlang-server/_build/
 samples/server/petstore/erlang-server/rebar.lock

-# Dart
-**/dart*/**/.dart_tool
-**/dart*/**/.packages
-**/dart*/**/pubspec.lock
-# Dart dio
-**/dart*/**/*.g.dart
-# Dart jaguar
-**/dart*/**/*.jser.dart
-**/dart*/**/*.jretro.dart
+# dart
+samples/client/petstore/dart/petstore/packages
+samples/client/petstore/dart/flutter_petstore/test/packages
+samples/client/petstore/dart/petstore/test/packages
+**/.dart_tool

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

 before_install:
-  # to run petstore server locally via docker
-  - echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin || true
-  - docker pull swaggerapi/petstore
-  - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
-  - docker ps -a
-  # install crystal
-  - curl -sSL https://dist.crystal-lang.org/apt/setup.sh | sudo bash
-  - curl -sL "https://keybase.io/crystal/pgp_keys.asc" | sudo apt-key add -
-  - echo "deb https://dist.crystal-lang.org/apt crystal main" | sudo tee /etc/apt/sources.list.d/crystal.list
-  - sudo apt-get update
-  - sudo apt install crystal
  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.22.0
  - export PATH="$HOME/.yarn/bin:$PATH"
  # install rust
  - curl https://sh.rustup.rs -sSf | sh -s -- -y -v
  # required when sudo: required for the Ruby petstore tests
  - gem install bundler
-  - nvm install 12.20.0
-  - nvm use 12.20.0
  - npm install -g typescript
  - npm install -g npm
  - npm config set registry http://registry.npmjs.org/
  # set python 3.6.3 as default
  - source ~/virtualenv/python3.6/bin/activate
+  # to run petstore server locally via docker
+  - docker pull swaggerapi/petstore
+  - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
+  - docker ps -a
  # -- skip bash test to shorten build time
  # Add bats test framework and cURL for Bash script integration tests
  #- sudo add-apt-repository ppa:duggan/bats --yes
@@ -131,7 +122,7 @@ before_install:
    fi;
  - pushd .; cd website; yarn install; popd
  # install Deno
-  - sh -s v1.6.2 < ./CI/deno_install.sh
+  - curl -fsSL https://deno.land/x/install/install.sh | sh -s v1.1.2
  - export PATH="$HOME/.deno/bin:$PATH"

 install:
@@ -149,8 +140,6 @@ install:
 script:
  # fail fast
  - set -e
-  # fail if the test files have changes
-  - bin/utils/detect_test_file_changes.rb bin/utils/test_file_list.yaml
  # fail if templates/generators contain carriage return '\r'
  - /bin/bash ./bin/utils/detect_carriage_return.sh
  # fail if generators contain merge conflicts
@@ -159,8 +148,8 @@ script:
  - /bin/bash ./bin/utils/detect_tab_in_java_class.sh
  # run integration tests defined in maven pom.xml
  # WARN: Travis will timeout after 10 minutes of no stdout/stderr activity, which is problematic with mvn --quiet.
-  - mvn -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-  - mvn -e --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - mvn --no-snapshot-updates --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - mvn --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 after_success:
  # push to maven repo
  - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
--- a/CI/.drone.yml
+++ b/CI/.drone.yml
@@ -2,20 +2,6 @@ kind: pipeline
 name: default

 steps:
-# test nim client
- name: nim-client-test
-  image: nimlang/nim
-  commands:
-  - (cd samples/client/petstore/nim/ && nim c sample_client.nim)
-# test protobuf schema generator
- name: protobuf-schema-test
-  image: nanoservice/protobuf-go
-  commands:
-  - protoc --version
-  - mkdir /var/tmp/go/
-  - cd samples/config/petstore/protobuf-schema
-  - protoc --go_out=/var/tmp/go/ services/*
-  - protoc --go_out=/var/tmp/go/ models/*
 # test aspnetcore 3.x
 - name: aspnetcore-test
  image: mcr.microsoft.com/dotnet/core/sdk:3.1
@@ -42,12 +28,11 @@ steps:
 - name: java11-test
  image: openjdk:11.0
  commands:
-  - ./mvnw --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - ./mvnw -quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
  - ./mvnw --quiet verify -Psamples.droneio -Dorg.slf4j.simpleLogger.defaultLogLevel=error
  # test java native client
  - ./mvnw clean test -f samples/client/petstore/java/native/pom.xml
  - ./mvnw clean test -f samples/client/petstore/java/native-async/pom.xml
-  - ./mvnw clean test -f samples/openapi3/client/petstore/java/native/pom.xml
  # test all generators with fake petstore spec (2.0, 3.0)
  - /bin/bash bin/utils/test-fake-petstore-for-all.sh
  # generate test scripts
--- a/CI/bitrise.yml
+++ b/CI/bitrise.yml
@@ -0,0 +1,51 @@
+---
+format_version: '8'
+default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
+project_type: other
+trigger_map:
+- push_branch: "*"
+  workflow: primary
+- pull_request_source_branch: "*"
+  workflow: primary
+workflows:
+  primary:
+    steps:
+    - git-clone@4.0.17: {}
+    - brew-install@0.10.2:
+        inputs:
+        - packages: maven
+    - script@1.1.6:
+        title: Install Cocoapods
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+
+            sudo gem install cocoapods
+    - script@1.1.6:
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+
+            set -e
+
+            mvn --no-snapshot-updates package -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+        title: Build openapi-generator
+    - script@1.1.6:
+        title: Update Swift samples
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+
+            set -e
+
+            bin/generate-samples.sh ./bin/configs/other/swift5-*
+    - script@1.1.6:
+        title: Run Swift5 tests
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+
+            set -e
+
+            ./samples/client/test/swift5/swift5_test_all.sh
+
--- a/CI/circle_parallel.sh
+++ b/CI/circle_parallel.sh
@@ -41,14 +41,13 @@ elif [ "$NODE_INDEX" = "2" ]; then
  curl -sSL https://get.haskellstack.org/ | sh
  stack upgrade
  stack --version
-  # prepare r
+  # install r
  sudo sh -c 'echo "deb http://cran.rstudio.com/bin/linux/ubuntu trusty/" >> /etc/apt/sources.list'
  gpg --keyserver keyserver.ubuntu.com --recv-key E084DAB9
  gpg -a --export E084DAB9 | sudo apt-key add -
  sudo apt-get update
  sudo apt-get -y install r-base
  R --version
-
  # install curl
  sudo apt-get -y build-dep libcurl4-gnutls-dev
  sudo apt-get -y install libcurl4-gnutls-dev
--- a/CI/deno_install.sh
+++ b/CI/deno_install.sh
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Copyright 2019 the Deno authors. All rights reserved. MIT license.
-# TODO(everyone): Keep this script simple and easily auditable.
-
-set -e
-
-if ! command -v unzip >/dev/null; then
-	echo "Error: unzip is required to install Deno (see: https://github.com/denoland/deno_install#unzip-is-required)." 1>&2
-	exit 1
-fi
-
-if [ "$OS" = "Windows_NT" ]; then
-	target="x86_64-pc-windows-msvc"
-else
-	case $(uname -s) in
-	Darwin) target="x86_64-apple-darwin" ;;
-	*) target="x86_64-unknown-linux-gnu" ;;
-	esac
-fi
-
-if [ $# -eq 0 ]; then
-	deno_uri="https://github.com/denoland/deno/releases/latest/download/deno-${target}.zip"
-else
-	deno_uri="https://github.com/denoland/deno/releases/download/${1}/deno-${target}.zip"
-fi
-
-deno_install="${DENO_INSTALL:-$HOME/.deno}"
-bin_dir="$deno_install/bin"
-exe="$bin_dir/deno"
-
-if [ ! -d "$bin_dir" ]; then
-	mkdir -p "$bin_dir"
-fi
-
-curl --fail --location --progress-bar --output "$exe.zip" "$deno_uri"
-unzip -d "$bin_dir" -o "$exe.zip"
-chmod +x "$exe"
-rm "$exe.zip"
-
-echo "Deno was installed successfully to $exe"
-if command -v deno >/dev/null; then
-	echo "Run 'deno --help' to get started"
-else
-	case $SHELL in
-	/bin/zsh) shell_profile=".zshrc" ;;
-	*) shell_profile=".bash_profile" ;;
-	esac
-	echo "Manually add the directory to your \$HOME/$shell_profile (or similar)"
-	echo "  export DENO_INSTALL=\"$deno_install\""
-	echo "  export PATH=\"\$DENO_INSTALL/bin:\$PATH\""
-	echo "Run '$exe --help' to get started"
-fi
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,7 +49,6 @@ Code change should conform to the programming style guide of the respective lang
 - C++: https://google.github.io/styleguide/cppguide.html
 - C++ (Tizen): https://wiki.tizen.org/Native_Platform_Coding_Idiom_and_Style_Guide#C.2B.2B_Coding_Style
 - Clojure: https://github.com/bbatsov/clojure-style-guide
- Crystal: https://crystal-lang.org/reference/conventions/coding_style.html
 - Dart: https://www.dartlang.org/guides/language/effective-dart/style
 - Elixir: https://github.com/christopheradams/elixir_style_guide
 - Eiffel: https://www.eiffel.org/doc/eiffel/Coding%20Standards
@@ -88,7 +87,9 @@ To add test cases (optional) covering the change in the code generator, please r
 To test the templates, please perform the following:

 - Update the Petstore sample by running the shell scripts under the `bin` folder. For example, run `./bin/generate-samples.sh .
-/bin/configs/python*` to update the Python-related samples under [`samples`](https://github.com/openapitools/openapi-generator/tree/master/samples). For Windows, please install [GIT bash](https://gitforwindows.org/). (If you find that there are new files generated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI spec from time to time. If you've questions or concerns, please open a ticket to start a discussion)
+/bin/configs/python*` to update the Python-related samples under [`samples`](https://github.com/openapitools/openapi-generator/tree/master/samples). For Windows, please install [GIT bash](https://gitforwindows.org/). (If you find that there are new files g
+enerated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI spec fro
+m time to time. If you've questions or concerns, please open a ticket to start a discussion)
 - During development it can be helpful to quickly regenerate the samples without recompiling all of openapi-generator, e.g. when you have only updated the mustache templates. This can be done by passing the `-t` parameter: `-t modules/openapi-generator/src/main/resources/python`.
 - Run the tests in the sample folder using maven `mvn integration-test -f /path/to/pom.xml`, e.g. `mvn integration-test -f samples/client/petstore/python/pom.xml`. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests)
 - Finally, git commit the updated samples files: `git commit -a`
--- 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) [![Join the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/enQtNzAyNDMyOTU0OTE1LTY5ZDBiNDI5NzI5ZjQ1Y2E5OWVjMjZkYzY1ZGM2MWQ4YWFjMzcyNDY5MGI4NjQxNDBiMTlmZTc5NjY2ZTQ5MGM) [![Follow OpenAPI Generator Twitter account to get the latest update](https://img.shields.io/twitter/follow/oas_generator.svg?style=social&label=Follow)](https://twitter.com/oas_generator)  

 </div>

 <div align="center">

-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`5.0.1`):
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`5.0.0`):  
 [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
@@ -18,22 +18,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.1.x](https://github.com/OpenAPITools/openapi-generator/tree/5.1.x) (`5.1.x`):
-[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/5.1.x.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
-[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/5.1.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
-[![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=5.1.x)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
-[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=5.1.x&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
-[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/5.1.x)](https://cloud.drone.io/OpenAPITools/openapi-generator)
-[![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/5.1.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.org/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)
-[![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=6.0.x)](https://app.shippable.com/github/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-wh2wu)
-[![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">
@@ -46,7 +30,7 @@

 :notebook_with_decorative_cover: The eBook [A Beginner's Guide to Code Generation for REST APIs](https://gum.co/openapi_generator_ebook) is a good starting point for beginners :notebook_with_decorative_cover:

-:warning: If the OpenAPI spec, templates or any input (e.g. options, environment variables) is obtained from an untrusted source or environment, please make sure you've reviewed these inputs before using OpenAPI Generator to generate the API client, server stub or documentation to avoid potential security issues (e.g. [code injection](https://en.wikipedia.org/wiki/Code_injection)). For security vulnerabilities, please contact [team@openapitools.org](mailto:team@openapitools.org). :warning:
+:warning: If the OpenAPI spec, templates or any input (e.g. options, environment variables) is obtained from an untrusted source or environment, please make sure you've reviewed these inputs before using OpenAPI Generator to generate the API client, server stub or documentation to avoid potential security issues (e.g. [code injection](https://en.wikipedia.org/wiki/Code_injection)) :warning:

 :bangbang: Both "OpenAPI Tools" (https://OpenAPITools.org - the parent organization of OpenAPI Generator) and "OpenAPI Generator" are not affiliated with OpenAPI Initiative (OAI) :bangbang:

@@ -63,7 +47,6 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [<img src="https://openapi-generator.tech/img/companies/docspring.png" width="128" height="128">](https://docspring.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/datadog.png" width="128" height="128">](https://datadoghq.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/thales.jpg" width="128" height="128">](https://cpl.thalesgroup.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/apideck.jpg" width="128" height="128">](https://www.apideck.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)

 #### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS and Checkly for sponsoring the API monitoring

@@ -77,11 +60,11 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se

 |                                  | Languages/Frameworks                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 | -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.0, .NET Core 2.0, .NET 5.0), **C++** (cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client), **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 11.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) |
+| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.0, .NET Core 2.0), **C++** (cpp-restsdk, Qt5, Tizen), **Clojure**, **Dart (1.x, 2.x)**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client), **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (rust, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 8.x), Aurelia, Axios, Fetch, Inversify, jQuery, Node, Rxjs) |
 | **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, Slim, Silex, [Symfony](https://symfony.com/), [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                         |
-| **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| **Others**                       | **GraphQL**, **JMeter**, **MySQL Schema**, **Protocol Buffer**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |

 ## Table of contents

@@ -119,11 +102,11 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20

 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 6.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/) | Nov/Dec 2021   | Minor release with breaking changes (no fallback) |
-| 5.1.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.1.0-SNAPSHOT/) | Mar/Apr 2021   | Minor release with breaking changes (with fallback) |
-| 5.0.1 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.1-SNAPSHOT/) | Jan/Feb 2021   | Patch release with enhancements, bug fixes, etc |
-| [5.0.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0) (latest stable release)                                                    | 21.12.2020   | Major release with breaking changes (no fallback) |
-| [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |
+| 5.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/) | TBD   | Major release with breaking changes (no fallback) |
+| 5.0.0-beta3 (upcoming beta release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/) | 01.11.2020 | Major beta release with breaking changes (no fallback) |
+| [5.0.0-beta2](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0-beta2) (latest beta release) | 04.09.2020   | Major beta release with breaking changes (no fallback) |
+| [5.0.0-beta](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0-beta) (latest beta release) | 30.06.2020   | Major beta release with breaking changes (no fallback) |
+| [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1) (latest stable release)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |

 OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0

@@ -179,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.0.0/openapi-generator-cli-5.0.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta2/openapi-generator-cli-5.0.0-beta2.jar`

 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0/openapi-generator-cli-5.0.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta2/openapi-generator-cli-5.0.0-beta2.jar -O openapi-generator-cli.jar
 ```

 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 ```
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0/openapi-generator-cli-5.0.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta2/openapi-generator-cli-5.0.0-beta2.jar
 ```

 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -272,7 +255,7 @@ To install, run `brew install openapi-generator`

 Here is an example usage to generate a Ruby client:
 ```sh
-openapi-generator generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g ruby -o /tmp/test/
+openapi-generator generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g ruby -o /tmp/test/
 ```

 To reinstall with the latest master, run `brew uninstall openapi-generator && brew install --HEAD openapi-generator`
@@ -307,7 +290,7 @@ Example:

 ```sh
 docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli generate \
-    -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+    -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
    -g go \
    -o /local/out/go
 ```
@@ -332,12 +315,12 @@ GEN_IP=$(docker inspect --format '{{.NetworkSettings.IPAddress}}'  $CID)

 # Execute an HTTP request to generate a Ruby client
 > curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' \
-d '{"openAPIUrl": "https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"}' \
+-d '{"openAPIUrl": "https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml"}' \
 'http://localhost:8888/api/gen/clients/ruby'

 {"code":"c2d483.3.4672-40e9-91df-b9ffd18d22b8","link":"http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8"}

-# Download the generated zip file
+# Download the generated zip file  
 > wget http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8

 # Unzip the file
@@ -368,7 +351,7 @@ Once built, `run-in-docker.sh` will act as an executable for openapi-generator-c
 ./run-in-docker.sh help # Executes 'help' command for openapi-generator-cli
 ./run-in-docker.sh list # Executes 'list' command for openapi-generator-cli
 ./run-in-docker.sh /gen/bin/go-petstore.sh  # Builds the Go client
-./run-in-docker.sh generate -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+./run-in-docker.sh generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
    -g go -o /gen/out/go-petstore --package-name=petstore # generates go client, outputs locally to ./out/go-petstore
 ```

@@ -406,14 +389,14 @@ Install it globally to get the CLI available on the command line:

 ```sh
 npm install @openapitools/openapi-generator-cli -g
-openapi-generator-cli version
+openapi-generator version
 ```

 <!-- RELEASE_VERSION -->
-To use a specific version of "openapi-generator-cli"
+Or install a particular OpenAPI Generator version (e.g. v5.0.0-beta2):

 ```sh
-openapi-generator-cli version-manager set 5.0.0
+npm install @openapitools/openapi-generator-cli@cli-5.0.0-beta2 -g
 ```

 Or install it as dev-dependency:
@@ -424,20 +407,20 @@ npm install @openapitools/openapi-generator-cli -D
 <!-- /RELEASE_VERSION -->
 ## [2 - Getting Started](#table-of-contents)

-To generate a PHP client for [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml), please run the following
+To generate a PHP client for [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml), please run the following
 ```sh
 git clone https://github.com/openapitools/openapi-generator
 cd openapi-generator
 mvn clean package
 java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
-   -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+   -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
   -g php \
   -o /var/tmp/php_api_client
 ```
-(if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`)
+(if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g php -o c:\temp\php_api_client`)

 <!-- RELEASE_VERSION -->
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0/openapi-generator-cli-5.0.0.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta2/openapi-generator-cli-5.0.0-beta2.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`
@@ -447,22 +430,20 @@ To get a list of PHP specified options (which can be passed to the generator wit
 ## [3 - Usage](#table-of-contents)

 ### To generate a sample client library
-You can build a client against the [Petstore API](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) as follows:
+You can build a client against the [Petstore API](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml) as follows:

 ```sh
-./bin/generate-samples.sh ./bin/configs/java-okhttp-gson.yaml
+./bin/java-petstore-okhttp-gson.sh
 ```

-(On Windows, please install [GIT Bash for Windows](https://gitforwindows.org/) to run the command above)
+(On Windows, run `.\bin\windows\java-petstore-okhttp-gson.bat` instead)

 This script uses the default library, which is `okhttp-gson`. It will run the generator with this command:

 ```sh
 java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
-  -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+  -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
  -g java \
-  -t modules/openapi-generator/src/main/resources/Java \
-  --additional-properties artifactId=petstore-okhttp-gson,hideGenerationTimestamp:true \
  -o samples/client/petstore/java/okhttp-gson
 ```

@@ -528,7 +509,13 @@ cd samples/client/petstore/java/okhttp-gson
 mvn package
 ```

-Other generators have [samples](https://github.com/OpenAPITools/openapi-generator/tree/master/samples) too.
+Other languages have petstore samples, too:
+
+- [Swift5](https://github.com/OpenAPITools/openapi-generator/tree/master/samples/client/petstore/swift5)
+- [Ruby](https://github.com/OpenAPITools/openapi-generator/tree/master/samples/client/petstore/ruby)
+- [Kotlin](https://github.com/OpenAPITools/openapi-generator/tree/master/samples/client/petstore/kotlin)
+
+... and more.

 ### [3.1 - Customization](#table-of-contents)

@@ -576,7 +563,6 @@ Here is a list of community-conitributed IDE plug-ins that integrate with OpenAP
 Here are some companies/projects (alphabetical order) using OpenAPI Generator in production. To add your company/project to the list, please visit [README.md](README.md) and click on the icon to edit the page.

 - [Adaptant Solutions AG](https://www.adaptant.io/)
- [adesso SE](https://www.adesso.de/)
 - [Agoda](https://www.agoda.com/)
 - [Allianz](https://www.allianz.com)
 - [Angular.Schule](https://angular.schule/)
@@ -625,7 +611,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Kubernetes](https://kubernetes.io)
 - [Linode](https://www.linode.com/)
 - [Logicdrop](https://www.logicdrop.com)
- [LVM Versicherungen](https://www.lvm.de)
 - [MailSlurp](https://www.mailslurp.com)
 - [Médiavision](https://www.mediavision.fr/)
 - [Metaswitch](https://www.metaswitch.com/)
@@ -638,7 +623,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [openVALIDATION](https://openvalidation.io/)
 - [Oracle](https://www.oracle.com/)
 - [Paxos](https://www.paxos.com)
- [PLAID, Inc.](https://plaid.co.jp/)
 - [Ponicode](https://ponicode.dev/)
 - [Pricefx](https://www.pricefx.com/)
 - [Prometheus/Alertmanager](https://github.com/prometheus/alertmanager)
@@ -650,16 +634,13 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [RepreZen API Studio](https://www.reprezen.com/swagger-openapi-code-generation-api-first-microservices-enterprise-development)
 - [REST United](https://restunited.com)
 - [Robotinfra](https://www.robotinfra.com)
- [SmartHR](https://smarthr.co.jp/)
 - [Sony Interactive Entertainment](https://www.sie.com/en/index.html)
 - [Splitit](https://www.splitit.com/)
 - [Stingray](http://www.stingray.com)
 - [Suva](https://www.suva.ch/)
 - [Telstra](https://dev.telstra.com)
 - [TravelTime platform](https://www.traveltimeplatform.com/)
- [TribalScale](https://www.tribalscale.com)
 - [TUI InfoTec GmbH](http://www.tui-infotec.com/)
- [Twitter](https://twitter.com)
 - [unblu inc.](https://www.unblu.com/)
 - [Veamly](https://www.veamly.com/)
 - [wbt-solutions](https://www.wbt-solutions.de/)
@@ -668,7 +649,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Vouchery.io](https://vouchery.io)
 - [Xero](https://www.xero.com/)
 - [Yahoo Japan](https://www.yahoo.co.jp/)
- [viadee](https://www.viadee.de/)
 - [Vonage](https://vonage.com)
 - [YITU Technology](https://www.yitutech.com/)
 - [Yelp](https://www.yelp.com/)
@@ -695,7 +675,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2019/01/03 - [Calling a Swagger service from Apex using openapi-generator](https://lekkimworld.com/2019/01/03/calling-a-swagger-service-from-apex-using-openapi-generator/) by [Mikkel Flindt Heisterberg](https://lekkimworld.com)
 - 2019/01/13 - [OpenAPI GeneratorでRESTful APIの定義書から色々自動生成する](https://ky-yk-d.hatenablog.com/entry/2019/01/13/234108) by [@ky_yk_d](https://twitter.com/ky_yk_d)
 - 2019/01/20 - [Contract-First API Development with OpenAPI Generator and Connexion](https://medium.com/commencis/contract-first-api-development-with-openapi-generator-and-connexion-b21bbf2f9244) by [Anil Can Aydin](https://github.com/anlcnydn)
- 2019/01/30 - [Rapid Application Development With API First Approach Using Open-API Generator](https://dzone.com/articles/rapid-api-development-using-open-api-generator) by [Milan Sonkar](https://dzone.com/users/828329/milan_sonkar.html)
+- 2019/01/30 - [Rapid Application Development With API First Approach Using Open-API Generator](https://dzone.com/articles/rapid-api-development-using-open-api-generator) by [Milan Sonkar](https://dzone.com/users/828329/milan_sonkar.html)  
 - 2019/02/02 - [平静を保ち、コードを生成せよ 〜 OpenAPI Generator誕生の背景と軌跡 〜](https://speakerdeck.com/akihito_nakano/gunmaweb34) by [中野暁人](https://github.com/ackintosh) at [Gunma.web #34 スキーマ駆動開発](https://gunmaweb.connpass.com/event/113974/)
 - 2019/02/20 - [An adventure in OpenAPI V3 code generation](https://mux.com/blog/an-adventure-in-openapi-v3-api-code-generation/) by [Phil Cluff](https://mux.com/blog/author/philc/)
 - 2019/02/26 - [Building API Services: A Beginner’s Guide](https://medium.com/google-cloud/building-api-services-a-beginners-guide-7274ae4c547f) by [Ratros Y.](https://medium.com/@ratrosy) in [Google Cloud Platofrm Blog](https://medium.com/google-cloud)
@@ -784,7 +764,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2020-05-22 - [TypeScript REST API Client](https://dev.to/unhurried/typescript-rest-api-client-4in3) by ["unhurried"](https://dev.to/unhurried)
 - 2020-05-28 - [【使用 lotify + Swagger 建置可共用的 LINE Notify bot】 - #NiJia @ Chatbot Developer Taiwan 第 #19 小聚](https://www.youtube.com/watch?v=agYVz6dzh1I) by [Chatbot Developer Taiwan](https://www.youtube.com/channel/UCxeYUyZNnHmpX23YNF-ewvw)
 - 2020-05-28 - [Building APIs with Laravel using OpenAPI](https://www.youtube.com/watch?v=xexLvQqAhiA) by [Chris Tankersley](https://github.com/dragonmantank) at [Laracon EU](https://laracon.eu/)
- 2020-06-12 - [Interoperability by construction: code generation for Arrowhead Clients](https://ieeexplore.ieee.org/document/9274746) by Michele Albano, Brian Nielsen at [2020 IEEE Conference on Industrial Cyberphysical Systems (ICPS)](https://ieeexplore.ieee.org/xpl/conhome/9274544/proceeding)
 - 2020-06-23 - [新規サーバーアプリケーションにTypeScriptを採用してみた](https://www.cam-inc.co.jp/news/20200623) at [CAM Tech Blog](https://www.cam-inc.co.jp/news/tech-blog/)
 - 2020-06-29 - [Artifact Abstract: Deployment of APIs on Android Mobile Devices and Microcontrollers](https://ieeexplore.ieee.org/document/9127353) by [Sergio Laso ; Marino Linaje ; Jose Garcia-Alonso ; Juan M. Murillo ; Javier Berrocal](https://ieeexplore.ieee.org/document/9127353/authors#authors) at [2020 IEEE International Conference on Pervasive Computing and Communications (PerCom)](https://ieeexplore.ieee.org/xpl/conhome/9125449/proceeding)
 - 2020-07-07 - [5 Best API Documentation Tools](https://blog.dreamfactory.com/5-best-api-documentation-tools/) by Susanna Bouse at [DreamFactory Blog](https://blog.dreamfactory.com/)
@@ -799,16 +778,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2020-09-10 - [Introduction to OpenAPI with Instana](https://www.instana.com/blog/introduction-to-openapi-with-instana/) by [Cedric Ziel](https://www.instana.com/blog/author/cedricziel/) at [Instana Blog](https://www.instana.com/blog/)
 - 2020-09-17 - [Generate PowerShellSDK using openapi-generator](https://medium.com/@ghufz.learn/generate-powershellsdk-using-openapi-generator-33b700891e33) by [Ghufran Zahidi](https://medium.com/@ghufz.learn)
 - 2020-09-24 - [How to automate API code generation (OpenAPI/Swagger) and boost productivity - Tutorial with React Native featuring TypeScript](https://medium.com/@sceleski/how-to-automate-api-code-generation-openapi-swagger-and-boost-productivity-1176a0056d8a) by [Sanjin Celeski](https://medium.com/@sceleski)
- 2020-09-25 - [Generate OpenAPI Angular Client](https://medium.com/@pguso/generate-openapi-angular-client-8c9288e8bbd4) by [Patric](https://medium.com/@pguso)
- 2020-10-24 - [Working with Microsoft Identity - React Native Client](https://www.josephguadagno.net/2020/10/24/working-with-microsoft-identity-react-native-client) by [Joseph Guadagno](https://www.josephguadagno.net/)
- 2020-10-31 - [[B2] OpenAPI Specification으로 타입-세이프하게 API 개발하기: 희망편 VS 절망편](https://www.youtube.com/watch?v=J4JHLESAiFk) by 최태건 at [FEConf 2020](https://2020.feconf.kr/)
- 2020-11-05 - [Automated REST-Api Code Generation: Wie IT-Systeme miteinander sprechen](https://www.massiveart.com/blog/automated-rest-api-code-generation-wie-it-systeme-miteinander-sprechen) by Stefan Rottensteiner at [MASSIVE ART Blog](https://www.massiveart.com/blog)
- 2020-12-01 - [OpenAPI GeneratorでGoのAPIサーバー/クライアントコードを自動生成する](https://qiita.com/saki-engineering/items/b20d8b6074c4da9664a5) by [@saki-engineering](https://qiita.com/saki-engineering)
- 2020-12-04 - [Scaling the Test Coverage of OpenAPI Generator for 30+ Programming Languages](https://www.youtube.com/watch?v=7Lke9dHRqT0) by [William Cheng](https://github.com/wing328) at [Open Source Summit Japan + Automotive Linux Summit 2020](https://events.linuxfoundation.org/archive/2020/open-source-summit-japan/) ([Slides](https://speakerdeck.com/wing328/scaling-the-test-coverage-of-openapi-generator-for-30-plus-programming-languages))
- 2020-12-09 - [プロジェクトにOpenAPI Generatorで自動生成された型付きAPI Clientを導入した話](https://qiita.com/yoshifujiT/items/905c18700ede23f40840) by [@yoshifujiT](https://github.com/yoshifujiT)
- 2020-12-15 - [Next.js + NestJS + GraphQLで変化に追従するフロントエンドへ 〜 ショッピングクーポンの事例紹介](https://techblog.yahoo.co.jp/entry/2020121530052952/) by [小倉 陸](https://github.com/ogugu9) at [Yahoo! JAPAN Tech Blog](https://techblog.yahoo.co.jp/)
- 2021-01-08 - [Hello, New API – Part 1](https://www.nginx.com/blog/hello-new-api-part-1/) by [Jeremy Schulman](https://www.nginx.com/people/jeremy-schulman/) at [Major League Baseball](https://www.mlb.com)
- 2021-01-18 - [「アプリ開発あるある」を疑うことから始まった、API Clientコードの自動生成【デブスト2020】](https://codezine.jp/article/detail/13406?p=2) by [CodeZine編集部](https://codezine.jp/author/1)

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

@@ -843,12 +812,11 @@ Here is a list of template creators:
   * C# (.NET Standard 1.3 ): @Gronsak
   * C# (.NET 4.5 refactored): @jimschubert [:heart:](https://www.patreon.com/jimschubert)
   * Clojure: @xhh
-   * Crystal: @wing328
   * Dart: @yissachar
   * Dart (refactor): @joernahrens
   * Dart 2: @swipesight
   * Dart (Jaguar): @jaumard
-   * Dart (Dio): @josh-burton
+   * Dart (Dio): @athornz
   * Elixir: @niku
   * Elm: @eriktim
   * Eiffel: @jvelilla
@@ -884,7 +852,7 @@ Here is a list of template creators:
   * PHP (Guzzle): @baartosz
   * PowerShell: @beatcracker
   * PowerShell (refactored in 5.0.0): @wing328
-   * Python: @spacether
+   * Python-experimental: @spacether
   * R: @ramnov
   * Ruby (Faraday): @meganemura @dkliban
   * Rust: @farcaller
@@ -902,11 +870,10 @@ Here is a list of template creators:
   * TypeScript (Angular7): @topce
   * TypeScript (Axios): @nicokoenig
   * TypeScript (Fetch): @leonyu
-   * TypeScript (Inversify): @gualtierim
   * TypeScript (jQuery): @bherila
-   * TypeScript (Nestjs): @vfrank66
   * TypeScript (Node):  @mhardorf
   * TypeScript (Rxjs): @denyo
+   * TypeScript (Inversify): @gualtierim
   * TypeScript (redux-query): @petejohansonxo
 * Server Stubs
   * Ada: @stcarrez
@@ -960,7 +927,6 @@ Here is a list of template creators:
 * Schema
   * Avro: @sgadouar
   * GraphQL: @wing328 [:heart:](https://www.patreon.com/wing328)
-   * Ktorm: @Luiz-Monad
   * MySQL: @ybelenko
   * Protocol Buffer: @wing328

@@ -995,7 +961,7 @@ If you want to join the committee, please kindly apply by sending an email to te

 #### Members of Technical Committee

-| Languages/Generators         | Member (join date)                                                                                                                                                                                                                |
+| Languages         | Member (join date)                                                                                                                                                                                                                |
 | :---------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | ActionScript      |                                                                                                                                                                                                                                   |
 | Ada               | @stcarrez (2018/02) @michelealbano (2018/02)                                                                                                                                                                                        |
@@ -1006,18 +972,17 @@ 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)                                                                                             |
 | Clojure           |                                                                                                                                                                                                                                   |
-| Dart              | @swipesight (2018/09) @jaumard (2018/09) @josh-burton (2019/12) @amondnet (2019/12) @sbu-WBT (2020/12) @kuhnroyal (2020/12) @agilob (2020/12)                                                                                                      |
+| Dart              | @ircecho (2017/07) @swipesight (2018/09) @jaumard (2018/09) @athornz (2019/12) @amondnet (2019/12)                                                                                                        |
 | Eiffel            | @jvelilla (2017/09)                                                                                                                                                                                                               |
 | Elixir            | @mrmstn (2018/12)                                                                                                                                                                                                                 |
 | Elm               | @eriktim (2018/09)                                                                                                                                                                                                                |
 | Erlang            | @tsloughter (2017/11) @jfacorro (2018/10) @robertoaloi (2018/10)                                                                                                                                                                  |
 | F#                | @nmfisher (2019/05)                                                                                                                                                                                                               |
-| Go                | @antihax (2017/11) @grokify (2018/07) @kemokemo (2018/09) @jirikuncar (2021/01)                                                                                                                                   |
+| Go                | @antihax (2017/11) @grokify (2018/07) @kemokemo (2018/09) @bkabrda (2019/07)                                                                                                                                   |
 | GraphQL           | @renepardon (2018/12)                                                                                                                                                                                                             |
 | Groovy            |                                                                                                                                                                                                                                   |
 | Haskell           |                                                                                                                                                                                                                                   |
-| Java              | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @nmuesch (2021/01)                          |
-| JMeter               | @kannkyo (2021/01)                                                                                                                                                                                                            |
+| Java              | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @bkabrda (2020/01)                          |
 | Kotlin            | @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)                                                        |
 | Lua               | @daurnimator (2017/08)                                                                                                                                                                                                            |
 | Nim               |                                                                                                                                                                                                                                   |
@@ -1055,7 +1020,7 @@ OpenAPI Generator is a fork of [Swagger Codegen](https://github.com/swagger-api/
 - [Daniel](https://github.com/Danielku15)
 - [Emiliano Bonassi](https://github.com/emilianobonassi)
 - [Erik Timmers](https://github.com/eriktim)
- [Esteban Gehring](https://github.com/macjohnny)
+- [Esteban Marin](https://github.com/macjohnny)
 - [Gustavo Paz](https://github.com/gustavoapaz)
 - [Javier Velilla](https://github.com/jvelilla)
 - [Jean-François Côté](https://github.com/JFCote)
@@ -1098,7 +1063,7 @@ OpenAPI Generator is a fork of [Swagger Codegen](https://github.com/swagger-api/
 ## [7 - License](#table-of-contents)
 -------

-Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)  
 Copyright 2018 SmartBear Software

 Licensed under the Apache License, Version 2.0 (the "License");
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,19 +35,9 @@ install:
  - ps: Install-Module Pester -Force -Scope CurrentUser
 build_script:
  - dotnet --info
-  # build C# aspnetcore 3.1 server
-  - dotnet build samples\server\petstore\aspnetcore-3.1\Org.OpenAPITools.sln
-  # build C# aspnetcore 3.0 server
-  - dotnet build samples\server\petstore\aspnetcore-3.0\Org.OpenAPITools.sln
-  # build C# aspnetcore 2.2 server
-  - dotnet build samples\server\petstore\aspnetcore\Org.OpenAPITools.sln
  # build C# API client (netcore)
  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient\Org.OpenAPITools.sln
  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCore\Org.OpenAPITools.sln
-  # build C# API client (.net framework 4.7)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net47\Org.OpenAPITools.sln
-  # build C# API client (.net 5.0)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\Org.OpenAPITools.sln
  # build C# API client
  - nuget restore samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln
  - msbuild samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -55,8 +45,8 @@ build_script:
  - nuget restore samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\Org.OpenAPITools.sln
  - msbuild samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
  # build C# .net standard 1.3+ API client
-  #- nuget restore samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln
-  #- msbuild samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - nuget restore samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln
+  - msbuild samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
  # install openapi-generator locally
  - mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
  # run the locally installed openapi-generator-gradle-plugin
@@ -65,10 +55,6 @@ test_script:
  # test c# API client (netcore)
  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  # test C# API client (.net framework 4.7)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  # test C# API client (.net 5.0)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  # test c# API client
  - nunit3-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
  # test c# API client (with PropertyChanged)
--- a/bin/configs/aspnetcore-2.2.yaml
+++ b/bin/configs/aspnetcore-2.2.yaml
@@ -1,7 +0,0 @@
-generatorName: aspnetcore
-outputDir: samples/server/petstore/aspnetcore
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/aspnetcore/2.1
-additionalProperties:
-  packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
-  aspnetCoreVersion: "2.2"
--- a/bin/configs/aspnetcore-3.1.yaml
+++ b/bin/configs/aspnetcore-3.1.yaml
@@ -1,9 +0,0 @@
-generatorName: aspnetcore
-outputDir: samples/server/petstore/aspnetcore-3.1
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
-additionalProperties:
-  packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
-  # comment out below as 3.1 the default
-  #aspnetCoreVersion: "3.1"
-  userSecretsGuid: "76e9e993-9159-441c-9c5b-fe95e7f4f020"
--- a/bin/configs/crystal.yaml
+++ b/bin/configs/crystal.yaml
@@ -1,9 +0,0 @@
-generatorName: crystal
-outputDir: samples/client/petstore/crystal
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/crystal
-additionalProperties:
-  shardVersion: 1.0.0
-  moduleName: Petstore
-  shardName: petstore
-strictSpecBehavior: false
--- a/bin/configs/csharp-netcore-OpenAPIClient-net47.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-net47.yaml
@@ -1,11 +0,0 @@
-# for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net47
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
-  targetFramework: net47
--- a/bin/configs/csharp-netcore-OpenAPIClient-net50.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-net50.yaml
@@ -1,13 +0,0 @@
-# for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0
-# TODO switch to http signature spec after fixing compilation issues
-#inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
-  targetFramework: net5.0
--- a/bin/configs/csharp-netcore-OpenAPIClient.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient.yaml
@@ -7,4 +7,3 @@ additionalProperties:
  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
  useCompareNetObjects: true 
  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
--- a/bin/configs/dart-dio-petstore-client-lib-fake.yaml
+++ b/bin/configs/dart-dio-petstore-client-lib-fake.yaml
@@ -1,6 +0,0 @@
-generatorName: dart-dio
-outputDir: samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart-dio
-additionalProperties:
-  hideGenerationTimestamp: "true"
--- a/bin/configs/dart-dio-petstore-client-lib-oas2.yaml
+++ b/bin/configs/dart-dio-petstore-client-lib-oas2.yaml
@@ -1,6 +0,0 @@
-generatorName: dart-dio
-outputDir: samples/client/petstore/dart-dio/petstore_client_lib
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart-dio
-additionalProperties:
-  hideGenerationTimestamp: "true"
--- a/bin/configs/dart-dio-petstore-client-lib.yaml
+++ b/bin/configs/dart-dio-petstore-client-lib.yaml
@@ -1,6 +0,0 @@
-generatorName: dart-dio
-outputDir: samples/openapi3/client/petstore/dart-dio/petstore_client_lib
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart-dio
-additionalProperties:
-  hideGenerationTimestamp: "true"
--- a/bin/configs/dart-openapi-browser-client.yaml
+++ b/bin/configs/dart-openapi-browser-client.yaml
@@ -0,0 +1,8 @@
+generatorName: dart
+outputDir: samples/client/petstore/dart/openapi-browser-client
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/dart
+additionalProperties:
+  supportDart2: "false"
+  hideGenerationTimestamp: "true"
+  browserClient: "true"
--- a/bin/configs/dart-openapi-flutter.yaml
+++ b/bin/configs/dart-openapi-flutter.yaml
@@ -0,0 +1,8 @@
+generatorName: dart
+outputDir: samples/client/petstore/dart/flutter_petstore/openapi
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/dart
+additionalProperties:
+  supportDart2: "false"
+  hideGenerationTimestamp: "true"
+  browserClient: "false"
--- a/bin/configs/dart-openapi.yaml
+++ b/bin/configs/dart-openapi.yaml
@@ -0,0 +1,8 @@
+generatorName: dart
+outputDir: samples/client/petstore/dart/openapi
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/dart
+additionalProperties:
+  supportDart2: "false"
+  hideGenerationTimestamp: "true"
+  browserClient: "false"
--- a/bin/configs/dart-petstore-client-lib-fake.yaml
+++ b/bin/configs/dart-petstore-client-lib-fake.yaml
@@ -1,6 +0,0 @@
-generatorName: dart
-outputDir: samples/openapi3/client/petstore/dart2/petstore_client_lib_fake
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart2
-additionalProperties:
-  hideGenerationTimestamp: "true"
--- a/bin/configs/dart-petstore-client-lib.yaml
+++ b/bin/configs/dart-petstore-client-lib.yaml
@@ -1,6 +0,0 @@
-generatorName: dart
-outputDir: samples/openapi3/client/petstore/dart2/petstore_client_lib
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart2
-additionalProperties:
-  hideGenerationTimestamp: "true"
--- a/bin/configs/dart-petstore-client-lib-oas2.yaml
+++ b/bin/configs/dart-petstore-client-lib-oas2.yaml
--- a/bin/configs/elixir.yaml
+++ b/bin/configs/elixir.yaml
@@ -1,6 +1,6 @@
 generatorName: elixir
 outputDir: samples/client/petstore/elixir
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/elixir
 additionalProperties:
  invokerPackage: OpenapiPetstore
--- a/bin/configs/java-jersey2-java8-localdatetime.yaml
+++ b/bin/configs/java-jersey2-java8-localdatetime.yaml
@@ -1,11 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/jersey2-java8-localdatetime
-library: jersey2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-jersey2-java8-localdatetime
-  hideGenerationTimestamp: "true"
-  dateLibrary: java8-localdatetime
-  java8: true
-  delegatePattern: true
--- a/bin/configs/java-native-openapi3.yaml
+++ b/bin/configs/java-native-openapi3.yaml
@@ -1,11 +0,0 @@
-generatorName: java
-outputDir: samples/openapi3/client/petstore/java/native
-library: native
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-openapi3-native
-  hideGenerationTimestamp: true
-  serverPort: "8082"
-  useOneOfDiscriminatorLookup: true
-  disallowAdditionalPropertiesIfNotPresent: false
--- a/bin/configs/java-okhttp-gson-dynamicOperations.yaml
+++ b/bin/configs/java-okhttp-gson-dynamicOperations.yaml
@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/okhttp-gson-dynamicOperations
-library: okhttp-gson
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-okhttp-gson-dynamicoperations
-  hideGenerationTimestamp: "true"
-  dynamicOperations: "true"
--- a/bin/configs/kotlin-spring-boot-delegate.yaml
+++ b/bin/configs/kotlin-spring-boot-delegate.yaml
@@ -1,9 +0,0 @@
-generatorName: kotlin-spring
-outputDir: samples/server/petstore/kotlin-springboot-delegate
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
-additionalProperties:
-  library: spring-boot
-  delegatePattern: "true"
-  swaggerAnnotations: "true"
-  beanValidations: "true"
--- a/bin/configs/ktorm-schema.yaml
+++ b/bin/configs/ktorm-schema.yaml
@@ -1,7 +0,0 @@
-generatorName: ktorm-schema
-outputDir: samples/schema/petstore/ktorm
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/ktorm-schema
-additionalProperties:
-  hideGenerationTimestamp: true
-  importModelPackageName: org.openapitools.client.models
--- a/bin/configs/other/aspnetcore-3.0.yaml
+++ b/bin/configs/other/aspnetcore-3.0.yaml
--- a/bin/configs/other/aspnetcore-3.1.yaml
+++ b/bin/configs/other/aspnetcore-3.1.yaml
@@ -0,0 +1,7 @@
+generatorName: aspnetcore
+outputDir: samples/server/petstore/aspnetcore-3.1
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
+additionalProperties:
+  packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
+  aspnetCoreVersion: "3.1"
--- a/bin/configs/other/aspnetcore.yaml
+++ b/bin/configs/other/aspnetcore.yaml
@@ -0,0 +1,6 @@
+generatorName: aspnetcore
+outputDir: samples/server/petstore/aspnetcore
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/aspnetcore/2.1
+additionalProperties:
+  packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
--- a/bin/configs/other/cpp-qt5-client.yaml
+++ b/bin/configs/other/cpp-qt5-client.yaml
--- a/bin/configs/other/dart-dio.yaml
+++ b/bin/configs/other/dart-dio.yaml
@@ -0,0 +1,6 @@
+generatorName: dart-dio
+outputDir: samples/client/petstore/dart-dio
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/dart-dio
+additionalProperties:
+  hideGenerationTimestamp: "true"
--- a/bin/configs/other/java-undertow-server-java-undertow.yaml
+++ b/bin/configs/other/java-undertow-server-java-undertow.yaml
--- a/bin/configs/java-vertx-web-server.yaml
+++ b/bin/configs/java-vertx-web-server.yaml
--- a/bin/configs/other/jaxrs-cxf-client-jackson.yaml
+++ b/bin/configs/other/jaxrs-cxf-client-jackson.yaml
@@ -1,7 +0,0 @@
-generatorName: jaxrs-cxf-client
-outputDir: samples/client/petstore/jaxrs-cxf-client-jackson
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf
-additionalProperties:
-  artifactId: jaxrs-cxf-jackson-petstore-client
-  jackson: "true"
--- a/bin/configs/other/protobuf-schema.yaml
+++ b/bin/configs/other/protobuf-schema.yaml
--- a/bin/configs/other/swift5-alamofireLibrary.yaml
+++ b/bin/configs/other/swift5-alamofireLibrary.yaml
--- a/bin/configs/other/swift5-combineLibrary.yaml
+++ b/bin/configs/other/swift5-combineLibrary.yaml
--- a/bin/configs/other/swift5-default.yaml
+++ b/bin/configs/other/swift5-default.yaml
--- a/bin/configs/other/swift5-deprecated.yaml
+++ b/bin/configs/other/swift5-deprecated.yaml
--- a/bin/configs/other/swift5-nonPublicApi.yaml
+++ b/bin/configs/other/swift5-nonPublicApi.yaml
--- a/bin/configs/other/swift5-objcCompatible.yaml
+++ b/bin/configs/other/swift5-objcCompatible.yaml
--- a/bin/configs/other/swift5-promisekitLibrary.yaml
+++ b/bin/configs/other/swift5-promisekitLibrary.yaml
--- a/bin/configs/other/swift5-readonlyProperties.yaml
+++ b/bin/configs/other/swift5-readonlyProperties.yaml
--- a/bin/configs/other/swift5-resultLibrary.yaml
+++ b/bin/configs/other/swift5-resultLibrary.yaml
--- a/bin/configs/other/swift5-rxswiftLibrary.yaml
+++ b/bin/configs/other/swift5-rxswiftLibrary.yaml
--- a/bin/configs/other/swift5-urlsessionLibrary.yaml
+++ b/bin/configs/other/swift5-urlsessionLibrary.yaml
--- a/bin/configs/php-mezzio-ph.yaml
+++ b/bin/configs/php-mezzio-ph.yaml
@@ -1,4 +0,0 @@
-generatorName: php-mezzio-ph
-outputDir: samples/server/petstore/php-mezzio-ph
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-mezzio-ph
--- a/bin/configs/php-ze-ph.yaml
+++ b/bin/configs/php-ze-ph.yaml
@@ -0,0 +1,4 @@
+generatorName: php-ze-ph
+outputDir: samples/server/petstore/php-ze-ph
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/php-ze-ph
--- a/bin/configs/powershell.yaml
+++ b/bin/configs/powershell.yaml
@@ -10,7 +10,3 @@ additionalProperties:
  powershellGalleryUrl: https://www.powershellgallery.com/packages/PSPetstore
  apiNamePrefix: PS
  powershellVersion: "5.0"
-  licenseUri: https://www.apache.org/licenses/LICENSE-2.0.txt
-  projectUri: https://github.com/OpenAPITools/openapi-generator
-  releaseNotes: 'This is a sample project'
-  tags: 'PetStore,powershell,sdk'
--- a/bin/configs/python-asyncio.yaml
+++ b/bin/configs/python-asyncio.yaml
@@ -1,7 +1,7 @@
-generatorName: python-legacy
+generatorName: python-experimental
 outputDir: samples/client/petstore/python-asyncio
 library: asyncio
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-legacy
+templateDir: modules/openapi-generator/src/main/resources/python
 additionalProperties:
  packageName: petstore_api
--- a/bin/configs/python-experimental-extensions-x-auth-id-alias.yaml
+++ b/bin/configs/python-experimental-extensions-x-auth-id-alias.yaml
@@ -0,0 +1,6 @@
+generatorName: python-experimental
+outputDir: samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/
+inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
+templateDir: modules/openapi-generator/src/main/resources/python
+additionalProperties:
+  packageName: x_auth_id_alias
--- a/bin/configs/python-experimental-features-dynamic-servers.yaml
+++ b/bin/configs/python-experimental-features-dynamic-servers.yaml
@@ -0,0 +1,6 @@
+generatorName: python-experimental
+outputDir: samples/openapi3/client/features/dynamic-servers/python-experimental/
+inputSpec: modules/openapi-generator/src/test/resources/3_0/features/dynamic-servers.yaml
+templateDir: modules/openapi-generator/src/main/resources/python
+additionalProperties:
+  packageName: dynamic_servers
--- a/bin/configs/python-experimental-oas2.yaml
+++ b/bin/configs/python-experimental-oas2.yaml
@@ -0,0 +1,7 @@
+generatorName: python-experimental
+outputDir: samples/client/petstore/python-experimental
+inputSpec: modules/openapi-generator/src/test/resources/2_0/python-client-experimental/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/python
+additionalProperties:
+  disallowAdditionalPropertiesIfNotPresent: "true"
+  packageName: petstore_api
--- 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
+additionalProperties:
+  packageName: petstore_api
+  recursionLimit: "1234"
--- a/bin/configs/python-extensions-x-auth-id-alias.yaml
+++ b/bin/configs/python-extensions-x-auth-id-alias.yaml
@@ -1,6 +0,0 @@
-generatorName: python
-outputDir: samples/openapi3/client/extensions/x-auth-id-alias/python/
-inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
-templateDir: modules/openapi-generator/src/main/resources/python
-additionalProperties:
-  packageName: x_auth_id_alias
--- a/bin/configs/python-features-dynamic-servers.yaml
+++ b/bin/configs/python-features-dynamic-servers.yaml
@@ -1,6 +0,0 @@
-generatorName: python
-outputDir: samples/openapi3/client/features/dynamic-servers/python/
-inputSpec: modules/openapi-generator/src/test/resources/3_0/features/dynamic-servers.yaml
-templateDir: modules/openapi-generator/src/main/resources/python
-additionalProperties:
-  packageName: dynamic_servers
--- a/bin/configs/python-legacy-oas2.yaml
+++ b/bin/configs/python-legacy-oas2.yaml
@@ -1,6 +0,0 @@
-generatorName: python-legacy
-outputDir: samples/client/petstore/python-legacy
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-legacy
-additionalProperties:
-  packageName: petstore_api
--- a/bin/configs/python-legacy.yaml
+++ b/bin/configs/python-legacy.yaml
@@ -1,6 +0,0 @@
-generatorName: python-legacy
-outputDir: samples/openapi3/client/petstore/python-legacy
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-legacy
-additionalProperties:
-  packageName: petstore_api
--- a/bin/configs/python-oas2.yaml
+++ b/bin/configs/python-oas2.yaml
@@ -1,7 +1,6 @@
 generatorName: python
 outputDir: samples/client/petstore/python
-inputSpec: modules/openapi-generator/src/test/resources/2_0/python-client-experimental/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/python
 additionalProperties:
-  disallowAdditionalPropertiesIfNotPresent: "true"
  packageName: petstore_api
--- a/bin/configs/python-tornado.yaml
+++ b/bin/configs/python-tornado.yaml
@@ -1,7 +1,7 @@
-generatorName: python-legacy
+generatorName: python-experimental
 outputDir: samples/client/petstore/python-tornado
 library: tornado
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-legacy
+templateDir: modules/openapi-generator/src/main/resources/python
 additionalProperties:
  packageName: petstore_api
--- a/bin/configs/python.yaml
+++ b/bin/configs/python.yaml
@@ -1,7 +1,6 @@
 generatorName: python
 outputDir: samples/openapi3/client/petstore/python
-inputSpec: modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/python
 additionalProperties:
  packageName: petstore_api
-  recursionLimit: "1234"
--- a/bin/configs/ruby-extensions-x-auth-id-alias.yaml
+++ b/bin/configs/ruby-extensions-x-auth-id-alias.yaml
@@ -1,8 +0,0 @@
-generatorName: ruby
-outputDir: samples/openapi3/client/extensions/x-auth-id-alias/ruby-client
-inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
-additionalProperties:
-  gemName: x_auth_id_alias
-  gemVersion: 1.0.0
-  moduleName: XAuthIDAlias
--- a/bin/configs/rust-server-petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/bin/configs/rust-server-petstore-with-fake-endpoints-models-for-testing.yaml
@@ -6,4 +6,3 @@ generateAliasAsModel: true
 additionalProperties:
  hideGenerationTimestamp: "true"
  packageName: petstore-with-fake-endpoints-models-for-testing
-  publishRustRegistry: crates-io
--- a/bin/configs/rust-server-ping-bearer-auth-v3.yaml
+++ b/bin/configs/rust-server-ping-bearer-auth-v3.yaml
@@ -1,8 +0,0 @@
-generatorName: rust-server
-outputDir: samples/server/petstore/rust-server/output/ping-bearer-auth
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-server/ping-bearer-auth.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust-server
-generateAliasAsModel: true
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  packageName: ping-bearer-auth
--- a/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml
+++ b/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml
@@ -1,8 +0,0 @@
-generatorName: spring
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
-outputDir: samples/client/petstore/spring-cloud-spring-pageable
-artifactId: spring-cloud-spring-pageable
-library: spring-cloud
-additionalProperties:
-  hideGenerationTimestamp: 'true'
--- 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
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-outputDir: samples/server/petstore/spring-mvc-spring-pageable
-artifactId: spring-mvc-spring-pageable
-library: spring-mvc
-additionalProperties:
-  hideGenerationTimestamp: 'true'
--- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml
@@ -1,10 +0,0 @@
-generatorName: spring
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8
-artifactId: springboot-spring-pageable-delegatePattern-without-j8
-library: spring-boot
-delegatePattern: true
-java8: false
-additionalProperties:
-  hideGenerationTimestamp: 'true'
--- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml
@@ -1,9 +0,0 @@
-generatorName: spring
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern
-artifactId: springboot-spring-pageable-delegatePattern
-library: spring-boot
-delegatePattern: true
-additionalProperties:
-  hideGenerationTimestamp: 'true'
--- a/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml
@@ -1,9 +0,0 @@
-generatorName: spring
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-outputDir: samples/server/petstore/springboot-spring-pageable-without-j8
-artifactId: springboot-spring-pageable-withoutj8
-library: spring-boot
-java8: false
-additionalProperties:
-  hideGenerationTimestamp: 'true'
--- a/bin/configs/springboot-petstore-server-spring-pageable.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable.yaml
@@ -1,8 +0,0 @@
-generatorName: spring
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-outputDir: samples/server/petstore/springboot-spring-pageable
-artifactId: springboot-spring-pageable
-library: spring-boot
-additionalProperties:
-  hideGenerationTimestamp: 'true'
--- a/bin/configs/typescript-angular-v11-provided-in-root-with-npm.yaml
+++ b/bin/configs/typescript-angular-v11-provided-in-root-with-npm.yaml
@@ -1,9 +0,0 @@
-generatorName: typescript-angular
-outputDir: samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-additionalProperties:
-  ngVersion: 11.0.0
-  npmVersion: 1.0.0
-  npmName: '@openapitools/typescript-angular-petstore'
-  npmRepository: https://skimdb.npmjs.com/registry
-  snapshot: false
--- a/bin/configs/typescript-angular-v11-provided-in-root.yaml
+++ b/bin/configs/typescript-angular-v11-provided-in-root.yaml
@@ -1,5 +0,0 @@
-generatorName: typescript-angular
-outputDir: samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-additionalProperties:
-  ngVersion: 11.0.0
--- a/bin/configs/typescript-angular-v9-provided-in-any.yaml
+++ b/bin/configs/typescript-angular-v9-provided-in-any.yaml
@@ -1,6 +0,0 @@
-generatorName: typescript-angular
-outputDir: samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-additionalProperties:
-  ngVersion: 9.0.0
-  providedIn: any
--- a/bin/configs/typescript-angular-with-prefixed-module-name-v8.yaml
+++ b/bin/configs/typescript-angular-with-prefixed-module-name-v8.yaml
@@ -8,4 +8,3 @@ additionalProperties:
  npmRepository: https://skimdb.npmjs.com/registry
  snapshot: false
  apiModulePrefix: PetStore
-  configurationPrefix: PetStore
--- a/bin/configs/typescript-fetch-default-v3.0.yaml
+++ b/bin/configs/typescript-fetch-default-v3.0.yaml
@@ -1,3 +0,0 @@
-generatorName: typescript-fetch
-outputDir: samples/client/petstore/typescript-fetch/builds/default-v3.0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
--- a/bin/configs/typescript-fetch-enum.yaml
+++ b/bin/configs/typescript-fetch-enum.yaml
@@ -1,3 +0,0 @@
-generatorName: typescript-fetch
-outputDir: samples/client/petstore/typescript-fetch/builds/enum
-inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-fetch/enum.yaml
--- a/bin/configs/typescript-fetch-without-runtime-checks.yaml
+++ b/bin/configs/typescript-fetch-without-runtime-checks.yaml
@@ -1,9 +0,0 @@
-generatorName: typescript-fetch
-outputDir: samples/client/petstore/typescript-fetch/builds/without-runtime-checks
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-additionalProperties:
-  npmVersion: 1.0.0
-  npmName: '@openapitools/typescript-fetch-petstore'
-  npmRepository: https://skimdb.npmjs.com/registry
-  withoutRuntimeChecks: true
-  snapshot: false
--- a/bin/configs/typescript-nestjs-v6-provided-in-root.yaml
+++ b/bin/configs/typescript-nestjs-v6-provided-in-root.yaml
@@ -1,10 +0,0 @@
-generatorName: typescript-nestjs
-outputDir: samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-nestjs
-additionalProperties:
-  nestVersion: 6.0.0
-  "npmName": "@openapitools/typescript-nestjs-petstore"
-  "npmVersion": "1.0.0"
-  "npmRepository" : "https://skimdb.npmjs.com/registry"
-  "snapshot" : false
--- a/bin/utils/detect_test_file_changes.rb
+++ b/bin/utils/detect_test_file_changes.rb
@@ -1,57 +0,0 @@
-#!/usr/bin/env ruby
-# ruby script to detect changes in test-related files
-require 'yaml'
-require 'digest'
-
-hash   = Digest::SHA256.hexdigest("xyz")
-
-filename= ARGV[0]
-
-if !filename
-  puts "Usage: #{$0} filename"
-  exit 1
-end
-
-if !File.file? filename
-  warn "Error. #{filename} doesn't exist." 
-  exit 1
-end
-
-mismatch = 0
-count = 0
-
-test_files = YAML.load_file(filename)
-test_files.each do |test_file|
-  count = count + 1
-  # file still exists?
-  if !File.file? test_file['filename']
-    warn "Error. Provided test file `#{test_file['filename']}` doesn't exist."
-    mismatch = mismatch + 1
-  end
-
-  # check sha256 hash
-  sha256 = Digest::SHA256.hexdigest(File.read(test_file['filename']))
-  if test_file['sha256'] != sha256
-    warn "Looks like #{test_file['filename']} has been modified as its SHA256 `#{sha256}` is not the same as the one in the record: #{test_file['sha256']}"
-    mismatch = mismatch + 1
-  else
-    # no change to the test file
-  end
-end
-
-if mismatch > 0
-  warn "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  warn "There are #{mismatch} mismatch. Please review the test files to ensure it has not been deleted/regenerated."
-  warn "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  exit 1
-else
-  puts "OK. All matched!"
-end
-
-if count == 0
-  warn "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  warn "Looks like the test file list in #{filename} is empty! Please check!"
-  warn "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  exit 1
-end
-
--- a/bin/utils/ensure-up-to-date
+++ b/bin/utils/ensure-up-to-date
@@ -53,9 +53,6 @@ if [ -n "$(git status --porcelain)" ]; then
    git --no-pager diff
    echo "Perform git status"
    git status
-    echo -e "\nThis script runs in pull requests against the anticipated merge commit (as if the PR was merged now)."
-    echo "When you see unexpected files here, it likely means that there are newer commits in master that you need to "
-    echo -e "rebase or merge into your branch.\n"
    echo "Please run 'bin/utils/ensure-up-to-date' locally and commit changes (UNCOMMITTED CHANGES ERROR)"
    exit 1
 else
--- a/bin/utils/export_docs_generators.sh
+++ b/bin/utils/export_docs_generators.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 SCRIPT="$0"
 echo "# START SCRIPT: ${SCRIPT}"
@@ -10,11 +10,7 @@ if [[ "true" == "${SKIP_EXPORT_DOCS}" ]]; then
  exit 0
 fi

-N=4
-(
 for GENERATOR in $(java -jar ${executable} list --short --include all | sed -e 's/,/\'$'\n''/g')
 do
-    ((i=i%N)); ((i++==0)) && wait
-    ./bin/utils/export_generator.sh ${GENERATOR} &
+    ./bin/utils/export_generator.sh ${GENERATOR}
 done
-)
--- a/bin/utils/export_generator.sh
+++ b/bin/utils/export_generator.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 SCRIPT="$0"

--- a/bin/utils/test_file_list.yaml
+++ b/bin/utils/test_file_list.yaml
@@ -1,6 +0,0 @@
---
-# csharp-netcore test files and image for upload
- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs"
-  sha256: aceebba316148a2a803a15ef4e13bbd0b0a1b8d15006cd88adb9b39a620ee451
- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png"
-  sha256: 0a67c32728197e942b13bdda064b73793f12f5c795f1e5cf35a3adf69c973230
--- a/bin/windows/typescript.bat
+++ b/bin/windows/typescript.bat
@@ -0,0 +1,22 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+
+set args=generate -i modules\openapi-generator\src\test\resources\3_0\petstore.yaml -g typescript -o samples\openapi3\client\petstore\typescript\builds\default --additional-properties=platform=node,npmName=ts-petstore-client
+java %JAVA_OPTS% -jar %executable% %args%
+
+args=generate -i modules\openapi-generator\src\test\resources\3_0\petstore.yaml  -g typescript -o samples\openapi3\client\petstore\typescript\builds\jquery --additional-properties=framework=jquery,npmName=ts-petstore-client
+java %JAVA_OPTS% -jar %executable% %args%
+
+set args=generate -i modules\openapi-generator\src\test\resources\3_0\petstore.yaml -g typescript -o samples\openapi3\client\petstore\typescript\builds\object_params --additional-properties=platform=node,npmName=ts-petstore-client,useObjectParameters
+java %JAVA_OPTS% -jar %executable% %args%
+
+set args=generate -i modules\openapi-generator\src\test\resources\3_0\petstore.yaml -g typescript -o samples\openapi3\client\petstore\typescript\builds\inversify --additional-properties=platform=node,npmName=ts-petstore-client,useInversify
+java %JAVA_OPTS% -jar %executable% %args%
+
+set args=generate -i modules\openapi-generator\src\test\resources\3_0\petstore.yaml -g typescript -o samples\openapi3\client\petstore\typescript\builds\deno --additional-properties=platform=deno
+java %JAVA_OPTS% -jar %executable% %args%
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -1,42 +0,0 @@
---
-format_version: '8'
-default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
-project_type: other
-trigger_map:
- push_branch: "*"
-  workflow: primary
- pull_request_source_branch: "*"
-  workflow: primary
-workflows:
-  primary:
-    steps:
-    - git-clone@4.0.17: {}
-    - brew-install@0.11.0:
-        inputs:
-        - packages: maven
-    - script@1.1.6:
-        title: Install Cocoapods
-        inputs:
-        - content: |
-            #!/usr/bin/env bash
-
-            sudo gem install cocoapods
-    - script@1.1.6:
-        inputs:
-        - content: |
-            #!/usr/bin/env bash
-
-            set -e
-
-            mvn --no-snapshot-updates package -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-        title: Build openapi-generator
-    - script@1.1.6:
-        title: Run Swift5 tests
-        inputs:
-        - content: |
-            #!/usr/bin/env bash
-
-            set -e
-
-            ./samples/client/petstore/swift5/swift5_test_all.sh
-
--- a/circle.yml
+++ b/circle.yml
@@ -0,0 +1,99 @@
+version: 2
+jobs:
+  build:
+    #    docker:
+    #      #- image: openapitools/openapi-generator
+    #      - image: swaggerapi/petstore
+    #        environment:
+    #          SWAGGER_HOST=http://petstore.swagger.io
+    #          SWAGGER_BASE_PATH=/v2
+    machine:
+      image: circleci/classic:latest
+    working_directory: ~/OpenAPITools/openapi-generator
+    parallelism: 3
+    shell: /bin/bash --login
+    environment:
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
+      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
+    steps:
+    # Restore the dependency cache
+    - restore_cache:
+        keys:
+        # Default branch if not
+        - source-v2-{{ .Branch }}-{{ .Revision }}
+        - source-v2-{{ .Branch }}-
+        - source-v2-
+    # Machine Setup
+    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
+    # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
+    - checkout
+    # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
+    # In many cases you can simplify this from what is generated here.
+    # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
+    - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
+    # This is based on your 1.0 configuration file or project settings
+    - run:
+        command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
+    - run:
+        command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; '
+    - run:
+       command: |-
+         printf '127.0.0.1       petstore.swagger.io
+         ' | sudo tee -a /etc/hosts
+    # Dependencies
+    # Install latest stable node for angular 6
+    - run:
+        name: Install node@stable (for angular 6)
+        command: |
+          set +e
+          curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
+          export NVM_DIR="/opt/circleci/.nvm"
+          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+          nvm install stable
+          nvm alias default stable
+
+          # Each step uses the same `$BASH_ENV`, so need to modify it
+          echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
+          echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
+    - run: node --version
+#    - run: docker pull openapitools/openapi-petstore
+#    - run: docker run -d -e OPENAPI_BASE_PATH=/v3 -e DISABLE_API_KEY=1 -e DISABLE_OAUTH=1 -p 80:8080 openapitools/openapi-petstore
+    - run: docker pull swaggerapi/petstore
+    - run: docker run --name petstore.swagger -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
+    - run: docker ps -a
+    - run: sleep 30
+    - run: cat /etc/hosts
+    # Test
+    - run: mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+    - run: ./CI/circle_parallel.sh 
+    # Save dependency cache
+    - save_cache:
+        key: source-v2-{{ .Branch }}-{{ .Revision }}
+        paths:
+        # This is a broad list of cache paths to include many possible development environments
+        # You can probably delete some of these entries
+        - vendor/bundle
+        - ~/virtualenvs
+        - ~/.m2
+        - ~/.ivy2
+        - ~/.sbt
+        - ~/.bundle
+        - ~/.go_workspace
+        - ~/.gradle
+        - ~/.cache/bower
+        - ".git"
+        - ~/.stack
+        - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
+        - ~/R
+    # 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
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -12,7 +12,7 @@ codegen="${cli}/target/openapi-generator-cli.jar"
 # We code in a list of commands here as source processing is potentially buggy (requires undocumented conventional use of annotations).
 # A list of known commands helps us determine if we should compile CLI. There's an edge-case where a new command not added to this
 # list won't be considered a "real" command. We can get around that a bit by checking CLI completions beforehand if it exists.
-commands="config-help,generate,batch,help,list,meta,validate,version"
+commands="config-help,generate,help,list,meta,validate,version"

 if [ $# == 0 ]; then
 	echo "No command specified. Available commands:"
--- a/docs/building.md
+++ b/docs/building.md
@@ -44,7 +44,7 @@ Once built, `run-in-docker.sh` will act as an executable for openapi-generator-c
 ./run-in-docker.sh help # Executes 'help' command for openapi-generator-cli
 ./run-in-docker.sh list # Executes 'list' command for openapi-generator-cli
 ./run-in-docker.sh /gen/bin/generate-samples.sh /gen/bin/configs/go-petstore.yaml  # Builds the Go client
-./run-in-docker.sh generate -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+./run-in-docker.sh generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
    -g go -o /gen/out/go-petstore --packageName=petstore # generates go client, outputs locally to ./out/go-petstore
 ```

--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1,118 +0,0 @@
---
-id: configuration
-title: Configuration Options
---
-
-Our tooling supports the following types of configuration:
-
-* [global properties](./global-properties.md)
-  - properties with cross-cutting concerns which control generation, but  _don't_ belong to individual generators
-  - Example: `debugSupportingFiles` prints the contents of template data bound to supporting files
-* config options
-  - configuration specific to each individual [generator](./generators/README.md)
-  - these options are susceptible to validation within the defining generator; a config option of the same name across multiple generators may be validated differently in each
-  - NOTE: The CLI accepts config options as "additional properties"
-* additional properties
-  - these are the properties which will be passed to templates
-  - generally used to pass user-defined properties to custom templates
-  - many config options may also be passed as additional properties, however generators will read/modify/rewrite config options
-  - users may pass custom additional properties and use these within templates (e.g. a custom `generatedBy` key with a value of `Jim Schubert` for inclusion in a custom CVS-like header)
-* top-level properties specific to individual tools/plugins used to bootstrap our tooling
-
-## Tool-specific Declarations
-
-The READMEs for the [CLI](https://openapi-generator.tech/docs/usage#generate), [Gradle Plugin](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-gradle-plugin), [Maven Plugin](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin), and [SBT Plugin](https://github.com/OpenAPITools/sbt-openapi-generator/blob/master/README.md) may have top-level or tooling specific options which appear to duplicate 'config options' or 'global properties'. Each may also expose user-facing properties slightly differently from the other tools. This may occur due to:
-
-* Conventions used by the underlying tooling
-* Limitations in underlying frameworks which define how properties must be declared
-* Continuation of support for "legacy" invocation patterns
-* Mistakes in documentation and/or contributions (please do [file a bug](https://github.com/OpenAPITools/openapi-generator/issues/new?assignees=&labels=Issue%3A+Bug&template=bug_report.md&title=%5BBUG%5D+Issue+with+options))
-
-Take, for example, the CLI option of `--skip-validate-spec`. This flag sets the value to true with no option to set it to false (the default internally). The maven and gradle plugins allow for the top-level option `skipValidateSpec` to have a value of true or false. The SBT plugin, on the other hand, follows community convention and this property is `openApiSkipValidateSpec`.
-
-_How_ you provide values to options also depends on the tool. OpenAPI Generator supports global properties for [selective generation](https://openapi-generator.tech/docs/customization/#selective-generation) -- such as `apis` -- to have either a blank value or a comma-separated list of selected values. We would define this in CLI as `--global-property apis` or `--global-property apis=Equipment`. In the Gradle Plugin, these properties are set directly as strings:
-
-```
-openApiGenerate {
-    globalProperties = [
-        apis: "",
-        models: "User,Pet"
-    ]
-}
-```
-
-In the Maven plugin, we're limited by XML syntax where `<apis/>` and `<apis></apis>` are treated the same as if the `apis` node was undefined; there's no way to provide an empty string as a default. Instead, we have to extract the global property into its own properties which maintain the two states supported elsewhere (i.e. "all apis" or "select apis"). We have `generateApis` which accepts a boolean and `apisToGenerate` which accepts a comma-separated selection list.
-
-## Discovering Options
-
-Refer to [global properties](./global-properties.md) for a list of available global properties and their usage.
-
-Top-level tooling options are defined in [CLI usage](https://openapi-generator.tech/docs/usage/#generate). Many of these options directly map to camel case options in other tools, but do refer to [plugin documentation](https://openapi-generator.tech/docs/plugins) for full details or plugin-specific differences.
-
-Config options for generators are available in [documentation online](https://openapi-generator.tech/docs/generators). You may also use the CLI to query config options for a target generator using `openapi-generator config-help -g <generator-name>`. For example:
-
-```
-$ openapi-generator config-help -g mysql-schema
-
-CONFIG OPTIONS
-
-	defaultDatabaseName
-	    Default database name for all MySQL queries (Default: )
-
-	identifierNamingConvention
-	    Naming convention of MySQL identifiers(table names and column names). This is not related to database name which is defined by defaultDatabaseName option (Default: original)
-	        original - Do not transform original names
-	        snake_case - Use snake_case names
-
-	jsonDataTypeEnabled
-	    Use special JSON MySQL data type for complex model properties. Requires MySQL version 5.7.8. Generates TEXT data type when disabled (Default: true)
-
-	namedParametersEnabled
-	    Generates model prepared SQLs with named parameters, eg. :petName. Question mark placeholder used when option disabled. (Default: false)
-```
-
-This output provides the name of the configuration option. A set of acceptable values for any constrained values will print as an indented list (e.g. `identifierNamingConvention` above).
-
-Suppose you want to apply snake case naming to mysql schema outputs. Your configuration might resemble the following examples.
-
-**CLI**
-
-```
-openapi-generator -g mysql-schema -o out -i spec.yaml --additional-properties=identifierNamingConvention=snake_case
-```
-
-It may seem like a typo but there are two `=` signs in the above example.
-
-**Maven Plugin**
-
-```
-<execution>
-	<id>mysql-schema</id>
-	<phase>generate-sources</phase>
-	<goals>
-		<goal>generate</goal>
-	</goals>
-	<configuration>
-		<inputSpec>spec.yaml</inputSpec>
-		<generatorName>mysql-schema</generatorName>
-		<configOptions>
-			<identifierNamingConvention>snake_case</identifierNamingConvention>
-		</configOptions>
-		<output>${project.build.directory}/generated-sources/mysql</output>
-	</configuration>
-</execution>
-```
-
-**Gradle Plugin**
-
-```
-openApiGenerate {
-    generatorName = "mysql-schema"
-    inputSpec = "$rootDir/spec.yaml".toString()
-    outputDir = "$buildDir/mysql".toString()
-    configOptions = [
-            identifierNamingConvention: "snake_case"
-    ]
-}
-```
-
--- a/Show More
+++ b/Show More