update travis config

4.0.0-beta release
2025-12-03 17:00:43 +00:00 · 2018-12-31 17:10:47 +08:00 · 2018-12-31 17:09:25 +08:00
18145 changed files with 282669 additions and 946402 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +0,0 @@
-**/*.mustache linguist-vendored=true
--- a/.github/.test/samples.json
+++ b/.github/.test/samples.json
@@ -134,7 +134,7 @@
      ]
    },
    {
-      "input": "csharp-netcore-petstore.sh",
+      "input": "csharp-refactor-petstore.sh",
      "matches": [
        "Client: C-Sharp"
      ]
@@ -146,13 +146,13 @@
      ]
    },
    {
-      "input": "dart-jaguar-petstore.sh",
+      "input": "dart-flutter-petstore.sh",
      "matches": [
        "Client: Dart"
      ]
    },
    {
-      "input": "dart-dio-petstore.sh",
+      "input": "dart-jaguar-petstore.sh",
      "matches": [
        "Client: Dart"
      ]
@@ -218,7 +218,7 @@
      ]
    },
    {
-      "input": "scala-finch-petstore-server.sh",
+      "input": "finch-petstore-server.sh",
      "matches": [
        "Server: Scala"
      ]
@@ -260,7 +260,7 @@
      ]
    },
    {
-      "input": "graphql-nodejs-express-server.sh",
+      "input": "graphql-server-petstore.sh",
      "matches": [
        "Server: GraphQL"
      ]
@@ -825,13 +825,13 @@
      ]
    },
    {
-      "input": "python-server-flask-petstore-python2.sh",
+      "input": "python-flask-petstore-python2.sh",
      "matches": [
        "Server: Python"
      ]
    },
    {
-      "input": "python-server-flask-petstore.sh",
+      "input": "python-flask-petstore.sh",
      "matches": [
        "Server: Python"
      ]
@@ -878,6 +878,12 @@
        "Client: Rust"
      ]
    },
+    {
+      "input": "rust-reqwest-petstore.sh",
+      "matches": [
+        "Client: Rust"
+      ]
+    },
    {
      "input": "rust-server-petstore.sh",
      "matches": [
@@ -921,7 +927,7 @@
      ]
    },
    {
-      "input": "spring-all-petstore.sh",
+      "input": "spring-all-pestore.sh",
      "matches": [
        "Server: Spring"
      ]
@@ -1255,30 +1261,6 @@
      "matches": [
        "Client: TypeScript"
      ]
-    },
-    {
-      "input": "typescript-rxjs-petstore-interfaces.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "typescript-rxjs-petstore-target-es6.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "typescript-rxjs-petstore-with-npm-version.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "typescript-rxjs-petstore.sh",
-      "matches": [
-        "Client: TypeScript"
-      ]
    }
  ],
  "text": [
@@ -1305,76 +1287,6 @@
      "matches": [
        "Announcement"
      ]
-    },
-    {
-      "input": "[typescript] Generic typescript text",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "[typescript] Generic typescript text",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "[typescript-angular] Generic typescript text",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "[typescript-angularjs] Generic typescript text",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "[typescript-aurelia] Generic typescript text",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "[typescript-axios] Generic typescript text",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "[typescript-fetch] Generic typescript text",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "[typescript-inversify] Generic typescript text",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "[typescript-jquery] Generic typescript text",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "[typescript-node] Generic typescript text",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "[typescript-rxjs] Generic typescript text",
-      "matches": [
-        "Client: TypeScript"
-      ]
-    },
-    {
-      "input": "Should not auto-label for typescript outside of brackets.",
-      "matches": []
    }
  ]
 }
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +0,0 @@
-open_collective: openapi_generator
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,15 +7,6 @@ assignees: ''

 ---

-#### Bug Report Checklist
-
- [ ] Have you provided a full/minimal spec to reproduce the issue?
- [ ] Have you validated the input using an OpenAPI validator ([example](https://apidevtools.org/swagger-parser/online/))?
- [ ] What's the version of OpenAPI Generator used?
- [ ] Have you search for related issues/PRs?
- [ ] What's the actual output vs expected output?
- [ ] [Optional] Bounty to sponsor the fix ([example](https://www.bountysource.com/issues/66123212-javascript-client-produces-a-wrong-object-for-a-string-enum-type-that-is-used-with-ref))
-
 <!--
 Please follow the issue template below for bug reports.
 Also please indicate in the issue title which language/library is concerned. Eg:  [BUG][JAVA] Bug generating foo with bar 
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,11 @@
-<!-- Enter details of the change here. Include additional tests that have been done, reference to the issue for tracking, etc. -->
-
-<!-- Please check the completed items below -->
 ### PR checklist

 - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md).
- [ ] 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) before.
- [ ] Run the shell script(s) under `./bin/` (or Windows batch scripts under`.\bin\windows`) to update Petstore samples related to your fix. This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run `./bin/{LANG}-petstore.sh`, `./bin/openapi3/{LANG}-petstore.sh` if updating the code or mustache templates for a language (`{LANG}`) (e.g. php, ruby, python, etc).
- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `4.3.x`, `5.0.x`. Default: `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.
+- [ ] Ran the shell script under `./bin/` to update Petstore sample so that CIs can verify the change. (For instance, only need to run `./bin/{LANG}-petstore.sh` and `./bin/security/{LANG}-petstore.sh` if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in `.\bin\windows\`.
+- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`~~, `3.4.x`, `4.0.x`~~. Default: `master`.
+- [ ] Copied 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.
+
+### Description of the PR
+
+(details of the change, additional tests that have been done, reference to the issue for tracking, etc)
+
--- a/.github/auto-labeler.yml
+++ b/.github/auto-labeler.yml
@@ -138,7 +138,6 @@ labels:
      - '\s*?-[gl] swift[34]+\s*?'
      - '\s*?-[gl] swift2-deprecated\s*?'
    'Client: TypeScript':
-      - '\s*?\[typescript\]\s*?'
      - '\s*?\[typescript-[\-a-z]+\]\s*?'
      - '\s*?-[gl] typescript-[\-a-z]+\s*?'
    # 'Client: VB/VB.net': # NOTE: Not yet implemented
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,6 @@ packages/
 .packages
 .vagrant/
 .vscode/
-**/.vs

 .settings

@@ -39,13 +38,7 @@ packages/

 /target
 /generated-files
-test-output/
 nbactions.xml
-test-output/
-
-# website
-website/build/
-website/package-lock.json

 # scalatra
 samples/server-generator/scalatra/output
@@ -88,9 +81,6 @@ samples/client/petstore/java/jersey2/build/
 samples/client/petstore/java/okhttp-gson/.gradle/
 samples/client/petstore/java/okhttp-gson/build/
 samples/client/petstore/java/feign/build/
-samples/client/petstore/java/feign10x/build/
-samples/client/petstore/java/feign/project/
-samples/client/petstore/java/feign10x/project/
 samples/client/petstore/java/retrofit/build/
 samples/client/petstore/java/retrofit2/build/
 samples/client/petstore/java/retrofit2/hello.txt
@@ -138,6 +128,7 @@ samples/client/petstore/swift3/**/SwaggerClientTests/Podfile.lock
 # C#
 *.csproj.user
 samples/client/petstore/csharp/SwaggerClient/IO.Swagger.userprefs
+samples/client/petstore/csharp/SwaggerClientTest/.vs
 samples/client/petstore/csharp/SwaggerClientTest/obj
 samples/client/petstore/csharp/SwaggerClientTest/bin
 samples/client/petstore/csharp/SwaggerClientTest/packages
@@ -171,24 +162,25 @@ samples/client/petstore/python-asyncio/.pytest_cache/
 samples/client/petstore/python-tornado/.venv/

 # ts
+samples/client/petstore/typescript-node/npm/node_modules
+samples/client/petstore/typescript-node/**/typings
+samples/client/petstore/typescript-angular/**/typings
+samples/client/petstore/typescript-fetch/**/dist/
+samples/client/petstore/typescript-fetch/**/typings
 samples/client/petstore/typescript-angular2/npm/npm-debug.log
 samples/client/petstore/typescript-node/npm/npm-debug.log
+samples/client/petstore/typescript-aurelia/**/dist/
 samples/client/petstore/typescript-angular/tsd-debug.log
-samples/client/petstore/typescript-fetch/tests/**/dist/

 # aspnetcore
 samples/server/petstore/aspnetcore/.vs/
 effective.pom
-
 # kotlin
 samples/client/petstore/kotlin/src/main/kotlin/test/
 samples/client/petstore/kotlin-threetenbp/build
 samples/client/petstore/kotlin-string/build
-samples/openapi3/client/petstore/kotlin/build
 samples/server/petstore/kotlin-server/ktor/build
-samples/server/petstore/kotlin-springboot/build
-samples/client/petstore/kotlin-multiplatform/build/
-samples/client/petstore/kotlin-okhttp3/build/
+samples/openapi3/client/petstore/kotlin/build
 \?

 # haskell
@@ -201,8 +193,6 @@ samples/client/petstore/haskell-http-client/docs/quick-jump.css

 # R
 .Rproj.user
-samples/client/petstore/R/**/petstore.Rcheck/
-samples/client/petstore/R/**/*.tar.gz

 # elixir
 samples/client/petstore/elixir/_build/
@@ -224,7 +214,6 @@ samples/server/petstore/erlang-server/rebar.lock
 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/package-lock.json
@@ -235,7 +224,3 @@ samples/client/petstore/elm/index.html
 # C
 samples/client/petstore/c/build
 samples/client/petstore/c/*.so
-
-# Ruby
-samples/openapi3/client/petstore/ruby/Gemfile.lock
-samples/openapi3/client/petstore/ruby-faraday/Gemfile.lock
--- a/.hub.online.dockerfile
+++ b/.hub.online.dockerfile
@@ -28,7 +28,7 @@ WORKDIR ${TARGET_DIR}

 COPY --from=builder ${GEN_DIR}/modules/openapi-generator-online/target/openapi-generator-online.jar ${TARGET_DIR}/openapi-generator-online.jar

-ENV GENERATOR_HOST=""
+ENV GENERATOR_HOST=http://localhost

 EXPOSE 8080

--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-1.8
+oracle64-1.8.0.152
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,6 @@ language: java
 jdk:
  - openjdk8

-# See https://docs.travis-ci.com/user/languages/java/#caching
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-  # Avoid caching our built dependencies between runs.
-  - rm -fr $HOME/.m2/repository/org/openapitools/

 cache:
  directories:
@@ -35,11 +29,11 @@ cache:
  - $HOME/samples/server/petstore/rust-server/target
  - $HOME/perl5
  - $HOME/.cargo
+  - $HOME/.stack
  - $HOME/.pub-cache
  - $HOME/samples/server/petstore/cpp-pistache/pistache
  - $HOME/.npm  
  - $HOME/.rvm/gems/ruby-2.4.1
-  - $HOME/website/node_modules/

 services:
  - docker
@@ -56,6 +50,10 @@ addons:
    - petstore.swagger.io

 before_install:
+  # install haskell
+  - curl -sSL https://get.haskellstack.org/ | sh
+  - stack upgrade
+  - stack --version
  # install rust
  - curl https://sh.rustup.rs -sSf | sh -s -- -y -v
  # required when sudo: required for the Ruby petstore tests
@@ -94,21 +92,16 @@ before_install:
  # - Rely on `kerl` for [pre-compiled versions available](https://docs.travis-ci.com/user/languages/erlang#Choosing-OTP-releases-to-test-against). Rely on installation path chosen by [`travis-erlang-builder`](https://github.com/travis-ci/travis-erlang-builder/blob/e6d016b1a91ca7ecac5a5a46395bde917ea13d36/bin/compile#L18).
  # - . ~/otp/18.2.1/activate && erl -version
  #- curl -f -L -o ./rebar3 https://s3.amazonaws.com/rebar3/rebar3 && chmod +x ./rebar3 && ./rebar3 version && export PATH="${TRAVIS_BUILD_DIR}:$PATH"
-  # install C++ tools 
-  - sudo apt install -y --no-install-recommends valgrind cmake build-essential 
-  # install Qt5
-  - sudo apt install -y --no-install-recommends qt5-default 
-  - cmake --version
+
  # show host table to confirm petstore.swagger.io is mapped to localhost
  - cat /etc/hosts
  # show java version
  - java -version
-  - if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+  - if [ "$TRAVIS_BRANCH" = "4.0.0-beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
      openssl aes-256-cbc -K $encrypted_6e2c8bba47c6_key -iv $encrypted_6e2c8bba47c6_iv -in sec.gpg.enc -out sec.gpg -d ;
      gpg --keyserver keyserver.ubuntu.com --recv-key $SIGNING_KEY ;
      gpg --check-trustdb ;
    fi;
-  - pushd .; cd website; npm install; popd

 install:
  # Add Godeps dependencies to GOPATH and PATH
@@ -132,61 +125,33 @@ script:
  # fail if generators contain tab '\t'
  - /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 --quiet --batch-mode --show-version clean install
-  - mvn --quiet --batch-mode --show-version verify -Psamples
-  # test maven plugin
-  - mvn clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml
-  - mvn clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml
-  - mvn clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml
-  # test gradle plugin
-  - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk)
-  - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
+  - ./run-in-docker.sh mvn --quiet --batch-mode clean install
+  - mvn --quiet --batch-mode verify -Psamples
 after_success:
  # push to maven repo
-  - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-      if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ]; then
-        echo "Publishing from branch $TRAVIS_BRANCH";
+  - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+      if [ "$TRAVIS_BRANCH" = "4.0.0-beta" ]; then
        mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml;
        echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
        pushd .;
        cd modules/openapi-generator-gradle-plugin;
-        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishMavenJavaPublicationToNexusRepository closeAndReleaseRepository --no-daemon;
-        echo "Finished ./gradlew publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository";
+        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" uploadArchives --no-daemon;
+        echo "Finished ./gradlew uploadArchives";
        popd;
-      elif [ -z $TRAVIS_TAG ] && [[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]; then
-        echo "Publishing from branch $TRAVIS_BRANCH";
+      elif ([[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]) ; then
        mvn clean deploy --settings CI/settings.xml;
        echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
        pushd .;
        cd modules/openapi-generator-gradle-plugin;
-        ./gradlew -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository --no-daemon;
-        echo "Finished ./gradlew publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository";
-        popd;
-      fi;
-      if [ -n $TRAVIS_TAG ] && [[ "$TRAVIS_TAG" =~ ^[v][0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-        echo "Publishing the gradle plugin to Gradle Portal on tag $TRAVIS_TAG (only)";
-        pushd .;
-        cd modules/openapi-generator-gradle-plugin;
-        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" publishPlugins -Dgradle.publish.key=$GRADLE_PUBLISH_KEY -Dgradle.publish.secret=$GRADLE_PUBLISH_SECRET --no-daemon;
-        echo "Finished ./gradlew publishPlugins (plugin portal)";
+        ./gradlew -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" uploadArchives --no-daemon;
+        echo "Finished ./gradlew uploadArchives";
        popd;
      fi;
    fi;
  ## docker: build and push openapi-generator-online to DockerHub
-  - if [ $DOCKER_HUB_USERNAME ]; then echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && docker build -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME && echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME"; fi; fi
+  - if [ $DOCKER_HUB_USERNAME ]; then echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && docker build -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "4.0.0-beta" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME && echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME"; fi; fi
  ## docker: build cli image and push to Docker Hub
-  - if [ $DOCKER_HUB_USERNAME ]; then echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && cp docker-entrypoint.sh ./modules/openapi-generator-cli && docker build -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME && echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME"; fi; fi
-  ## publish latest website, variables below are secure environment variables which are unavailable to PRs from forks.
-  - if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-      cd website;
-      git config --global user.name "${GH_NAME}";
-      git config --global user.email "${GH_EMAIL}";
-      echo "machine github.com login ${GH_NAME} password ${GH_TOKEN}" > ~/.netrc;
-      npm install;
-      GIT_USER="${GH_NAME}" npm run-script publish-gh-pages;
-    fi;
+  - if [ $DOCKER_HUB_USERNAME ]; then echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && cp docker-entrypoint.sh ./modules/openapi-generator-cli && docker build -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "4.0.0-beta" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME && echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME"; fi; fi

 env:
  - DOCKER_GENERATOR_IMAGE_NAME=openapitools/openapi-generator-online DOCKER_CODEGEN_CLI_IMAGE_NAME=openapitools/openapi-generator-cli NODE_ENV=test CC=gcc-5 CXX=g++-5
-
--- a/CI/.drone.yml
+++ b/CI/.drone.yml
@@ -1,40 +0,0 @@
-kind: pipeline
-name: default
-
-steps:
-# test haskell client
- name: haskell-client-test
-  image: haskell:8.6.5
-  commands:
-  - (cd samples/client/petstore/haskell-http-client/ && stack --install-ghc --no-haddock-deps haddock --fast && stack test --fast)
-# test Dart 2.x petstore client
- name: dart2x-test
-  image: google/dart
-  commands:
-  - (cd samples/client/petstore/dart-jaguar/openapi && pub get && pub run build_runner build --delete-conflicting-outputs)
-  - (cd samples/client/petstore/dart-jaguar/flutter_petstore/openapi && pub get && pub run build_runner build --delete-conflicting-outputs)
-  - (cd samples/client/petstore/dart2/petstore && pub get && pub run test)
-# test Java 11 HTTP client
- name: java11-test
-  image: openjdk:11.0
-  commands:
-  - ./mvnw clean install
-  - ./mvnw --quiet verify -Psamples.droneio
-  # test all generators with fake petstore spec (2.0, 3.0)
-  - /bin/bash bin/utils/test-fake-petstore-for-all.sh
-  # generate test scripts
-  - /bin/bash bin/tests/run-all-test
-  # generate all petstore samples (client, servers, doc)
-  - /bin/bash bin/run-all-petstore
-  # generate all petstore samples (openapi3)
-  - /bin/bash bin/openapi3/run-all-petstore
-# test ocaml petstore client
- name: ocaml-test
-  image: ocaml/opam2:4.07
-  commands:
-  - sudo apt-get -y install m4
-  - cd samples/client/petstore/ocaml
-  - opam install ppx_deriving_yojson cohttp ppx_deriving cohttp-lwt-unix
-  - eval $(opam env)
-  - sudo chmod -R 777 .
-  - dune build --build-dir=./_build
--- a/CI/circle_parallel.sh
+++ b/CI/circle_parallel.sh
@@ -5,49 +5,17 @@

 NODE_INDEX=${CIRCLE_NODE_INDEX:-0}

-set -e
-
 if [ "$NODE_INDEX" = "1" ]; then
  echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..."
  #cp CI/pom.xml.circleci pom.xml
  java -version
  mvn --quiet verify -Psamples.circleci
-  mvn --quiet javadoc:javadoc -Psamples.circleci
-
 elif [ "$NODE_INDEX" = "2" ]; then
-  # run ensure-up-to-date sample script on SNAPSHOT version only
-  project_version=`mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout`
-  if [[ $project_version == *"-SNAPSHOT" ]]; then
-    echo "Running node $NODE_INDEX to test ensure-up-to-date"
-    java -version
-
-    # install elm-format
-    npm install -g elm-format
-
-    # clear any changes to the samples
-    git checkout -- .
-
-    # look for outdated samples
-    ./bin/utils/ensure-up-to-date --batch
-  fi
-#elif [ "$NODE_INDEX" = "3" ]; then
-  echo "Running node $NODE_INDEX to test haskell"
-  # install haskell
-  curl -sSL https://get.haskellstack.org/ | sh
-  stack upgrade
-  stack --version
-  # 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
-  # run integration tests
-  mvn --quiet verify -Psamples.misc
+  echo "Running node $NODE_INDEX to test ensure-up-to-date"
+  java -version
+  #export GO_POST_PROCESS_FILE="/usr/local/bin/gofmt -w"
+  # not formatting the code as different go versions may format the code a bit different
+  #./bin/utils/ensure-up-to-date
 else
  echo "Running node $NODE_INDEX to test 'samples.circleci.jdk7' defined in pom.xml ..."
  sudo update-java-alternatives -s java-1.7.0-openjdk-amd64
--- a/CI/run-in-docker-settings.xml
+++ b/CI/run-in-docker-settings.xml
@@ -1,7 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <!-- This directory matches what is defined in run-in-docker.sh -->
-    <localRepository>/var/maven/.m2/repository</localRepository>
-</settings>
--- a/CI/samples.ci/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/CI/samples.ci/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-      <ProjectReference Include="..\Org.OpenAPITools\Org.OpenAPITools.csproj">
-          <Name>Org.OpenAPITools</Name>
-      </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="linux-logo.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="CompareNETObjects" Version="4.57.0" />
-    <PackageReference Include="JsonSubTypes" Version="1.5.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="RestSharp" Version="106.6.7" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
-  </ItemGroup>
-</Project>
--- a/CI/samples.ci/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/CI/samples.ci/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-      <ProjectReference Include="..\Org.OpenAPITools\Org.OpenAPITools.csproj">
-          <Name>Org.OpenAPITools</Name>
-      </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="linux-logo.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="CompareNETObjects" Version="4.57.0" />
-    <PackageReference Include="JsonSubTypes" Version="1.5.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="RestSharp" Version="106.6.7" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
-  </ItemGroup>
-</Project>
--- a/CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+OpenAPI spec version: 1.0.0
+
+-->
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{19F1DEBC-DE5E-4517-8062-F000CD499087}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Org.OpenAPITools.Test</RootNamespace>
+    <AssemblyName>Org.OpenAPITools.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Newtonsoft.Json">
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="JsonSubTypes">
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp">
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="**\*.cs" Exclude="obj\**" />
+  </ItemGroup>
+  <ItemGroup>
+      <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+      <ProjectReference Include="..\Org.OpenAPITools\Org.OpenAPITools.csproj">
+          <Project>{321C8C3F-0156-40C1-AE42-D59761FB9B6C}</Project>
+          <Name>Org.OpenAPITools</Name>
+      </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="linux-logo.png" />
+  </ItemGroup>
+</Project>
+
--- a/CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -47,16 +47,16 @@ OpenAPI spec version: 1.0.0
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.Xml" />
    <Reference Include="Newtonsoft.Json">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="JsonSubTypes">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
    </Reference>
    <Reference Include="RestSharp">
        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
@@ -65,10 +65,10 @@ OpenAPI spec version: 1.0.0
        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
    </Reference>
    <Reference Include="nunit.framework">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
--- a/CI/samples.ci/client/petstore/java/jersey2-java6/build.gradle
+++ b/CI/samples.ci/client/petstore/java/jersey2-java6/build.gradle
@@ -7,7 +7,7 @@ version = '1.0.0'
 buildscript {
    repositories {
        jcenter {
-            url "https://jcenter.bintray.com/"
+            url "http://jcenter.bintray.com/"
        }
    }
    dependencies {
--- a/CI/samples.ci/client/petstore/java/test-manual/jersey1/auth/ApiKeyAuthTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/jersey1/auth/ApiKeyAuthTest.java
@@ -15,57 +15,33 @@ public class ApiKeyAuthTest {
    public void testApplyToParamsInQuery() {
        List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();

        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
        auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

        assertEquals(1, queryParams.size());
        for (Pair queryParam : queryParams) {
            assertEquals("my-api-key", queryParam.getValue());
        }

-        // no changes to header or cookie parameters
+        // no changes to header parameters
        assertEquals(0, headerParams.size());
-        assertEquals(0, cookieParams.size());
    }

    @Test
    public void testApplyToParamsInHeaderWithPrefix() {
            List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();

        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
        auth.setApiKey("my-api-token");
        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

-        // no changes to query or cookie parameters
+        // no changes to query parameters
        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
-
        assertEquals(1, headerParams.size());
        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
    }
-
-    @Test
-    public void testApplyToParamsInCookieWithPrefix() {
-            List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
-        auth.setApiKey("my-api-token");
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
-
-        // no changes to query or header parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, headerParams.size());
-
-        assertEquals(1, cookieParams.size());
-        assertEquals("Token my-api-token", cookieParams.get("X-API-TOKEN"));
-    }
 }
--- a/CI/samples.ci/client/petstore/java/test-manual/jersey1/auth/HttpBasicAuthTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/jersey1/auth/HttpBasicAuthTest.java
@@ -22,15 +22,13 @@ public class HttpBasicAuthTest {
    public void testApplyToParams() {
        List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();

        auth.setUsername("my-username");
        auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

-        // no changes to query or cookie parameters
+        // no changes to query parameters
        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
        assertEquals(1, headerParams.size());
        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
@@ -38,7 +36,7 @@ public class HttpBasicAuthTest {

        // null username should be treated as empty string
        auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);
        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
        expected = "Basic Om15LXBhc3N3b3Jk";
        assertEquals(expected, headerParams.get("Authorization"));
@@ -46,7 +44,7 @@ public class HttpBasicAuthTest {
        // null password should be treated as empty string
        auth.setUsername("my-username");
        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);
        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
        expected = "Basic bXktdXNlcm5hbWU6";
        assertEquals(expected, headerParams.get("Authorization"));
--- a/CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/ApiKeyAuthTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/ApiKeyAuthTest.java
@@ -15,55 +15,33 @@ public class ApiKeyAuthTest {
    public void testApplyToParamsInQuery() {
        List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();

        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
        auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

        assertEquals(1, queryParams.size());
        for (Pair queryParam : queryParams) {
            assertEquals("my-api-key", queryParam.getValue());
        }

-        // no changes to header or cookie parameters
+        // no changes to header parameters
        assertEquals(0, headerParams.size());
-        assertEquals(0, cookieParams.size());
    }

    @Test
    public void testApplyToParamsInHeaderWithPrefix() {
            List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();

        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
        auth.setApiKey("my-api-token");
        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

        // no changes to query parameters
        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
        assertEquals(1, headerParams.size());
        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
    }
-
-    @Test
-    public void testApplyToParamsInCookieWithPrefix() {
-            List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
-        auth.setApiKey("my-api-token");
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
-
-        // no changes to query or header parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, headerParams.size());
-        assertEquals(1, cookieParams.size());
-        assertEquals("Token my-api-token", cookieParams.get("X-API-TOKEN"));
-    }
 }
--- a/CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/HttpBasicAuthTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/HttpBasicAuthTest.java
@@ -22,11 +22,10 @@ public class HttpBasicAuthTest {
    public void testApplyToParams() {
        List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();

        auth.setUsername("my-username");
        auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

        // no changes to query parameters
        assertEquals(0, queryParams.size());
@@ -37,7 +36,7 @@ public class HttpBasicAuthTest {

        // null username should be treated as empty string
        auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);
        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
        expected = "Basic Om15LXBhc3N3b3Jk";
        assertEquals(expected, headerParams.get("Authorization"));
@@ -45,7 +44,7 @@ public class HttpBasicAuthTest {
        // null password should be treated as empty string
        auth.setUsername("my-username");
        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);
        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
        expected = "Basic bXktdXNlcm5hbWU6";
        assertEquals(expected, headerParams.get("Authorization"));
--- a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/ApiClientTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/ApiClientTest.java
@@ -1,6 +1,5 @@
 package org.openapitools.client;

-import okhttp3.OkHttpClient;
 import org.openapitools.client.auth.*;

 import java.text.DateFormat;
@@ -10,7 +9,6 @@ import java.util.TimeZone;

 import org.junit.*;
 import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;


 public class ApiClientTest {
@@ -159,41 +157,41 @@ public class ApiClientTest {
    public void testGetAndSetConnectTimeout() {
        // connect timeout defaults to 10 seconds
        assertEquals(10000, apiClient.getConnectTimeout());
-        assertEquals(10000, apiClient.getHttpClient().connectTimeoutMillis());
+        assertEquals(10000, apiClient.getHttpClient().getConnectTimeout());

        apiClient.setConnectTimeout(0);
        assertEquals(0, apiClient.getConnectTimeout());
-        assertEquals(0, apiClient.getHttpClient().connectTimeoutMillis());
+        assertEquals(0, apiClient.getHttpClient().getConnectTimeout());

        apiClient.setConnectTimeout(10000);
    }
-
+    
    @Test
    public void testGetAndSetReadTimeout() {
        // read timeout defaults to 10 seconds
        assertEquals(10000, apiClient.getReadTimeout());
-        assertEquals(10000, apiClient.getHttpClient().readTimeoutMillis());
+        assertEquals(10000, apiClient.getHttpClient().getReadTimeout());

        apiClient.setReadTimeout(0);
        assertEquals(0, apiClient.getReadTimeout());
-        assertEquals(0, apiClient.getHttpClient().readTimeoutMillis());
+        assertEquals(0, apiClient.getHttpClient().getReadTimeout());

        apiClient.setReadTimeout(10000);
    }
-
+    
    @Test
    public void testGetAndSetWriteTimeout() {
        // write timeout defaults to 10 seconds
        assertEquals(10000, apiClient.getWriteTimeout());
-        assertEquals(10000, apiClient.getHttpClient().writeTimeoutMillis());
+        assertEquals(10000, apiClient.getHttpClient().getWriteTimeout());

        apiClient.setWriteTimeout(0);
        assertEquals(0, apiClient.getWriteTimeout());
-        assertEquals(0, apiClient.getHttpClient().writeTimeoutMillis());
+        assertEquals(0, apiClient.getHttpClient().getWriteTimeout());

        apiClient.setWriteTimeout(10000);
    }
-
+    
    @Test
    public void testParameterToPairWhenNameIsInvalid() throws Exception {
        List<Pair> pairs_a = apiClient.parameterToPair(null, new Integer(1));
@@ -329,19 +327,4 @@ public class ApiClientTest {
        assertEquals("sun.gif", apiClient.sanitizeFilename("c:\\var\\tmp\\sun.gif"));
        assertEquals("sun.gif", apiClient.sanitizeFilename(".\\sun.gif"));
    }
-
-    @Test
-    public void testNewHttpClient() {
-        OkHttpClient oldClient = apiClient.getHttpClient();
-        apiClient.setHttpClient(oldClient.newBuilder().build());
-        assertThat(apiClient.getHttpClient(), is(not(oldClient)));
-    }
-
-    /**
-     * Tests the invariant that the HttpClient for the ApiClient must never be null
-     */
-    @Test(expected = NullPointerException.class)
-    public void testNullHttpClient() {
-        apiClient.setHttpClient(null);
-    }
 }
--- a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java
@@ -1,543 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- *
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiException;
-import org.openapitools.client.model.Pet;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.model.*;
-import org.openapitools.client.*;
-
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-
-import org.junit.*;
-
-import static org.junit.Assert.*;
-
-/**
- * API tests for PetApi
- */
-public class PetApiTest {
-
-    private PetApi api = new PetApi();
-
-    @Before
-    public void setup() {
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-    }
-
-    @Test
-    public void testApiClient() {
-        // the default api client is used
-        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
-        assertNotNull(api.getApiClient());
-        assertEquals("http://petstore.swagger.io:80/v2", api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-
-        ApiClient oldClient = api.getApiClient();
-
-        ApiClient newClient = new ApiClient();
-        newClient.setVerifyingSsl(true);
-        newClient.setBasePath("http://example.com");
-        newClient.setDebugging(true);
-
-        // set api client via constructor
-        api = new PetApi(newClient);
-        assertNotNull(api.getApiClient());
-        assertEquals("http://example.com", api.getApiClient().getBasePath());
-        assertTrue(api.getApiClient().isDebugging());
-
-        // set api client via setter method
-        api.setApiClient(oldClient);
-        assertNotNull(api.getApiClient());
-        assertEquals("http://petstore.swagger.io:80/v2", api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-    }
-
-    @Test
-    public void testCreateAndGetPet() throws Exception {
-        Pet pet = createPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertPetMatches(pet, fetched);
-    }
-
-    @Test
-    public void testCreateAndGetPetWithHttpInfo() throws Exception {
-        Pet pet = createPet();
-        api.addPetWithHttpInfo(pet);
-
-        ApiResponse<Pet> resp = api.getPetByIdWithHttpInfo(pet.getId());
-        assertEquals(200, resp.getStatusCode());
-        assertEquals("application/json", resp.getHeaders().get("Content-Type").get(0));
-        Pet fetched = resp.getData();
-
-        assertPetMatches(pet, fetched);
-    }
-
-    @Test
-    public void testCreateAndGetPetAsync() throws Exception {
-        Pet pet = createPet();
-        api.addPet(pet);
-        // to store returned Pet or error message/exception
-        final Map<String, Object> result = new HashMap<String, Object>();
-
-        api.getPetByIdAsync(pet.getId(), new ApiCallback<Pet>() {
-            @Override
-            public void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
-                result.put("error", e.getMessage());
-            }
-
-            @Override
-            public void onSuccess(Pet pet, int statusCode, Map<String, List<String>> responseHeaders) {
-                result.put("pet", pet);
-            }
-
-            @Override
-            public void onUploadProgress(long bytesWritten, long contentLength, boolean done) {
-                //empty
-            }
-
-            @Override
-            public void onDownloadProgress(long bytesRead, long contentLength, boolean done) {
-                //empty
-            }
-        });
-
-        // wait for the asynchronous call to finish (at most 10 seconds)
-        final int maxTry = 10;
-        int tryCount = 1;
-        Pet fetched = null;
-        do {
-            if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
-            Thread.sleep(1000);
-            tryCount += 1;
-            if (result.get("error") != null) fail((String) result.get("error"));
-            if (result.get("pet") != null) {
-                fetched = (Pet) result.get("pet");
-                break;
-            }
-        } while (result.isEmpty());
-        assertPetMatches(pet, fetched);
-    }
-
-    @Test
-    public void testCreateAndGetPetAsyncInvalidID() throws Exception {
-        Pet pet = createPet();
-        api.addPet(pet);
-        // to store returned Pet or error message/exception
-        final Map<String, Object> result = new HashMap<String, Object>();
-
-        // test getting a nonexistent pet
-        result.clear();
-        api.getPetByIdAsync(-10000L, new ApiCallback<Pet>() {
-            @Override
-            public void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
-                result.put("exception", e);
-            }
-
-            @Override
-            public void onSuccess(Pet pet, int statusCode, Map<String, List<String>> responseHeaders) {
-                result.put("pet", pet);
-            }
-
-            @Override
-            public void onUploadProgress(long bytesWritten, long contentLength, boolean done) {
-                //empty
-            }
-
-            @Override
-            public void onDownloadProgress(long bytesRead, long contentLength, boolean done) {
-                //empty
-            }
-        });
-
-        // wait for the asynchronous call to finish (at most 10 seconds)
-        final int maxTry = 10;
-        int tryCount = 1;
-        Pet fetched = null;
-        ApiException exception = null;
-
-        do {
-            if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
-            Thread.sleep(1000);
-            tryCount += 1;
-            if (result.get("pet") != null) fail("expected an error");
-            if (result.get("exception") != null) {
-                exception = (ApiException) result.get("exception");
-                break;
-            }
-        } while (result.isEmpty());
-        assertNotNull(exception);
-        assertEquals(404, exception.getCode());
-        assertEquals("Not Found", exception.getMessage());
-        assertEquals("application/json", exception.getResponseHeaders().get("Content-Type").get(0));
-    }
-
-    @Test
-    public void testCreateAndGetMultiplePetsAsync() throws Exception {
-        Pet pet1 = createPet();
-        Pet pet2 = createPet();
-
-        final CountDownLatch addLatch = new CountDownLatch(2);
-        final TestApiCallback<Void> addCallback1 = new TestApiCallback<Void>(addLatch);
-        final TestApiCallback<Void> addCallback2 = new TestApiCallback<Void>(addLatch);
-
-        // Make 2 simultaneous calls
-        api.addPetAsync(pet1, addCallback1);
-        api.addPetAsync(pet2, addCallback2);
-
-        // wait for both asynchronous calls to finish (at most 10 seconds)
-        assertTrue(addLatch.await(10, TimeUnit.SECONDS));
-
-        assertTrue(addCallback1.isDone());
-        assertTrue(addCallback2.isDone());
-
-        if (!addCallback1.isSuccess()) throw addCallback1.getException();
-        if (!addCallback2.isSuccess()) throw addCallback2.getException();
-
-        assertValidProgress(addCallback1.getUploadProgress());
-        assertValidProgress(addCallback2.getUploadProgress());
-
-        final CountDownLatch getLatch = new CountDownLatch(3);
-        final TestApiCallback<Pet> getCallback1 = new TestApiCallback<Pet>(getLatch);
-        final TestApiCallback<Pet> getCallback2 = new TestApiCallback<Pet>(getLatch);
-        final TestApiCallback<Pet> getCallback3 = new TestApiCallback<Pet>(getLatch);
-
-        api.getPetByIdAsync(pet1.getId(), getCallback1);
-        api.getPetByIdAsync(pet2.getId(), getCallback2);
-        // Get nonexistent pet
-        api.getPetByIdAsync(-10000L, getCallback3);
-
-        // wait for all asynchronous calls to finish (at most 10 seconds)
-        assertTrue(getLatch.await(10, TimeUnit.SECONDS));
-
-        assertTrue(getCallback1.isDone());
-        assertTrue(getCallback2.isDone());
-        assertTrue(getCallback3.isDone());
-
-        if (!getCallback1.isSuccess()) throw getCallback1.getException();
-        if (!getCallback2.isSuccess()) throw getCallback2.getException();
-
-        assertPetMatches(pet1, getCallback1.getResult());
-        assertPetMatches(pet2, getCallback2.getResult());
-
-        assertValidProgress(getCallback1.getDownloadProgress());
-        assertValidProgress(getCallback2.getDownloadProgress());
-
-        // Last callback should fail with ApiException
-        assertFalse(getCallback3.isSuccess());
-        final ApiException exception = getCallback3.getException();
-        assertNotNull(exception);
-        assertEquals(404, exception.getCode());
-    }
-
-
-    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createPet();
-        pet.setName("programmer");
-
-        api.updatePet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertPetMatches(pet, fetched);
-    }
-
-    @Test
-    public void testFindPetsByStatus() throws Exception {
-        Pet pet = createPet();
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.PENDING);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByStatus(Arrays.asList("pending"));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    @Ignore
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<Tag> tags = new ArrayList<Tag>();
-        Tag tag1 = new Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByTags(Arrays.asList("friendly"));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createPet();
-        pet.setName("frank");
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-
-        api.updatePetWithForm(fetched.getId(), "furt", null);
-        Pet updated = api.getPetById(fetched.getId());
-
-        assertEquals(updated.getName(), "furt");
-    }
-
-    @Test
-    public void testDeletePet() throws Exception {
-        Pet pet = createPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(fetched.getId(), null);
-
-        try {
-            fetched = api.getPetById(fetched.getId());
-            fail("expected an error");
-        } catch (ApiException e) {
-            assertEquals(404, e.getCode());
-        }
-    }
-
-    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createPet();
-        api.addPet(pet);
-
-        File file = new File("hello.txt");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-        writer.write("Hello world!");
-        writer.close();
-
-        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-
-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-    }
-
-
-    private Pet createPet() {
-        Pet pet = new Pet();
-        pet.setId(1234567L);
-        pet.setName("gorilla");
-
-        Category category = new Category();
-        category.setName("really-happy");
-
-        pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-        List<String> photos = Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2");
-        pet.setPhotoUrls(photos);
-
-        return pet;
-    }
-
-    private String serializeJson(Object o, ApiClient apiClient) {
-        return apiClient.getJSON().serialize(o);
-    }
-
-    private <T> T deserializeJson(String json, Type type, ApiClient apiClient) {
-        return (T) apiClient.getJSON().deserialize(json, type);
-    }
-
-    private void assertPetMatches(Pet expected, Pet actual) {
-        assertNotNull(actual);
-        assertEquals(expected.getId(), actual.getId());
-        assertNotNull(actual.getCategory());
-        assertEquals(expected.getCategory().getName(),
-                actual.getCategory().getName());
-    }
-
-    /**
-     * Assert that the given upload/download progress list satisfies the
-     * following constraints:
-     * <p>
-     * - List is not empty
-     * - Byte count should be nondecreasing
-     * - The last element, and only the last element, should have done=true
-     */
-    private void assertValidProgress(List<Progress> progressList) {
-        assertFalse(progressList.isEmpty());
-
-        Progress prev = null;
-        int index = 0;
-        for (Progress progress : progressList) {
-            if (prev != null) {
-                if (prev.done || prev.bytes > progress.bytes) {
-                    fail("Progress list out of order at index " + index
-                            + ": " + progressList);
-                }
-            }
-            prev = progress;
-            index += 1;
-        }
-
-        if (!prev.done) {
-            fail("Last progress item should have done=true: " + progressList);
-        }
-    }
-
-    private static class TestApiCallback<T> implements ApiCallback<T> {
-
-        private final CountDownLatch latch;
-        private final ConcurrentLinkedQueue<Progress> uploadProgress =
-                new ConcurrentLinkedQueue<Progress>();
-        private final ConcurrentLinkedQueue<Progress> downloadProgress =
-                new ConcurrentLinkedQueue<Progress>();
-
-        private boolean done;
-        private boolean success;
-        private ApiException exception;
-        private T result;
-
-        public TestApiCallback(CountDownLatch latch) {
-            this.latch = latch;
-            this.done = false;
-        }
-
-        @Override
-        public void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
-            exception = e;
-            this.done = true;
-            this.success = false;
-            latch.countDown();
-        }
-
-        @Override
-        public void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders) {
-            this.result = result;
-            this.done = true;
-            this.success = true;
-            latch.countDown();
-        }
-
-        @Override
-        public void onUploadProgress(long bytesWritten, long contentLength, boolean done) {
-            uploadProgress.add(new Progress(bytesWritten, contentLength, done));
-        }
-
-        @Override
-        public void onDownloadProgress(long bytesRead, long contentLength, boolean done) {
-            downloadProgress.add(new Progress(bytesRead, contentLength, done));
-        }
-
-        public boolean isDone() {
-            return done;
-        }
-
-        public boolean isSuccess() {
-            return success;
-        }
-
-        public ApiException getException() {
-            return exception;
-        }
-
-        public T getResult() {
-            return result;
-        }
-
-        public List<Progress> getUploadProgress() {
-            return new ArrayList<Progress>(uploadProgress);
-        }
-
-        public List<Progress> getDownloadProgress() {
-            return new ArrayList<Progress>(downloadProgress);
-        }
-    }
-
-    private static class Progress {
-        public final long bytes;
-        public final long contentLength;
-        public final boolean done;
-
-        public Progress(long bytes, long contentLength, boolean done) {
-            this.bytes = bytes;
-            this.contentLength = contentLength;
-            this.done = done;
-        }
-
-        @Override
-        public String toString() {
-            return "<Progress " + bytes + " " + contentLength + " " + done + ">";
-        }
-    }
-}
--- a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/auth/ApiKeyAuthTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/auth/ApiKeyAuthTest.java
@@ -15,52 +15,46 @@ public class ApiKeyAuthTest {
    public void testApplyToParamsInQuery() {
        List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();

        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
        auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

        assertEquals(1, queryParams.size());
        for (Pair queryParam : queryParams) {
            assertEquals("my-api-key", queryParam.getValue());
        }

-        // no changes to header or cookie parameters
+        // no changes to header parameters
        assertEquals(0, headerParams.size());
-        assertEquals(0, cookieParams.size());
    }

    @Test
    public void testApplyToParamsInQueryWithNullValue() {
        List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();

        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
        auth.setApiKey(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

        // no changes to parameters
        assertEquals(0, queryParams.size());
        assertEquals(0, headerParams.size());
-        assertEquals(0, cookieParams.size());
    }

    @Test
    public void testApplyToParamsInHeaderWithPrefix() {
        List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();

        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
        auth.setApiKey("my-api-token");
        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

-        // no changes to query or cookie parameters
+        // no changes to query parameters
        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
        assertEquals(1, headerParams.size());
        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
    }
@@ -69,51 +63,14 @@ public class ApiKeyAuthTest {
    public void testApplyToParamsInHeaderWithNullValue() {
        List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();

        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
        auth.setApiKey(null);
        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

        // no changes to parameters
        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
-        assertEquals(0, headerParams.size());
-    }
-
-    @Test
-    public void testApplyToParamsInCookieWithPrefix() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
-        auth.setApiKey("my-api-token");
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
-
-        // no changes to query or header parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, headerParams.size());
-        assertEquals(1, cookieParams.size());
-        assertEquals("Token my-api-token", cookieParams.get("X-API-TOKEN"));
-    }
-
-    @Test
-    public void testApplyToParamsInCookieWithNullValue() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
-
-        // no changes to parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
        assertEquals(0, headerParams.size());
    }
 }
--- a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/auth/HttpBasicAuthTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/auth/HttpBasicAuthTest.java
@@ -22,15 +22,13 @@ public class HttpBasicAuthTest {
    public void testApplyToParams() {
        List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();

        auth.setUsername("my-username");
        auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

-        // no changes to query or cookie parameters
+        // no changes to query parameters
        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
        assertEquals(1, headerParams.size());
        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
@@ -38,7 +36,7 @@ public class HttpBasicAuthTest {

        // null username should be treated as empty string
        auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);
        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
        expected = "Basic Om15LXBhc3N3b3Jk";
        assertEquals(expected, headerParams.get("Authorization"));
@@ -46,7 +44,7 @@ public class HttpBasicAuthTest {
        // null password should be treated as empty string
        auth.setUsername("my-username");
        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);
        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
        expected = "Basic bXktdXNlcm5hbWU6";
        assertEquals(expected, headerParams.get("Authorization"));
@@ -56,7 +54,7 @@ public class HttpBasicAuthTest {
        headerParams = new HashMap<String, String>();
        auth.setUsername(null);
        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);
        // no changes to parameters
        assertEquals(0, queryParams.size());
        assertEquals(0, headerParams.size());
--- a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/model/ArrayOfArrayOfNumberOnlyTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/model/ArrayOfArrayOfNumberOnlyTest.java
@@ -53,7 +53,6 @@ public class ArrayOfArrayOfNumberOnlyTest {
        List<BigDecimal> arrayArrayNumber = new ArrayList<BigDecimal>();
        arrayArrayNumber.add(b1);
        arrayArrayNumber.add(b2);
-        model.setArrayArrayNumber(new ArrayList<List<BigDecimal>>());
        model.getArrayArrayNumber().add(arrayArrayNumber);

        // create another instance for comparison
@@ -63,7 +62,6 @@ public class ArrayOfArrayOfNumberOnlyTest {
        List<BigDecimal> arrayArrayNumber2 = new ArrayList<BigDecimal>();
        arrayArrayNumber2.add(b1);
        arrayArrayNumber2.add(b2);
-        model2.setArrayArrayNumber(new ArrayList<List<BigDecimal>>());
        model2.getArrayArrayNumber().add(arrayArrayNumber2);

        Assert.assertTrue(model2.equals(model));
--- a/CI/samples.ci/client/petstore/java/test-manual/resttemplate/auth/ApiKeyAuthTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/resttemplate/auth/ApiKeyAuthTest.java
@@ -17,53 +17,31 @@ public class ApiKeyAuthTest {
    public void testApplyToParamsInQuery() {
        MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
        HttpHeaders headerParams = new HttpHeaders();
-        MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();

        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
        auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

        assertEquals(1, queryParams.size());
        assertEquals("my-api-key", queryParams.get("api_key").get(0));

-        // no changes to header or cookie parameters
+        // no changes to header parameters
        assertEquals(0, headerParams.size());
-        assertEquals(0, cookieParams.size());
    }

    @Test
    public void testApplyToParamsInHeaderWithPrefix() {
        MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
        HttpHeaders headerParams = new HttpHeaders();
-        MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();

        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
        auth.setApiKey("my-api-token");
        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

-        // no changes to query or cookie parameters
+        // no changes to query parameters
        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
        assertEquals(1, headerParams.size());
        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN").get(0));
    }
-
-    @Test
-    public void testApplyToParamsInCookieWithPrefix() {
-        MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
-        HttpHeaders headerParams = new HttpHeaders();
-        MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
-        auth.setApiKey("my-api-token");
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
-
-        // no changes to query or cookie parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, headerParams.size());
-        assertEquals(1, cookieParams.size());
-        assertEquals("Token my-api-token", cookieParams.get("X-API-TOKEN").get(0));
-    }
 }
--- a/CI/samples.ci/client/petstore/java/test-manual/resttemplate/auth/HttpBasicAuthTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/resttemplate/auth/HttpBasicAuthTest.java
@@ -24,15 +24,13 @@ public class HttpBasicAuthTest {
    public void testApplyToParams() {
        MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
        HttpHeaders headerParams = new HttpHeaders();
-        MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();

        auth.setUsername("my-username");
        auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);

-        // no changes to query or cookie parameters
+        // no changes to query parameters
        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
        assertEquals(1, headerParams.size());
        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
@@ -40,7 +38,7 @@ public class HttpBasicAuthTest {

        // null username should be treated as empty string
        auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);
        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
        expected = "Basic Om15LXBhc3N3b3Jk";
        assertEquals(expected, headerParams.get("Authorization").get(1));
@@ -48,7 +46,7 @@ public class HttpBasicAuthTest {
        // null password should be treated as empty string
        auth.setUsername("my-username");
        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams);
        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
        expected = "Basic bXktdXNlcm5hbWU6";
        assertEquals(expected, headerParams.get("Authorization").get(2));
--- a/CI/samples.ci/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
+++ b/CI/samples.ci/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
@@ -1,26 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>TypeScriptAngularBuildPestoreClientTests</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>TS Fetch Multiple Parameters Petstore Client</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
--- a/CI/samples.ci/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/pom.xml
+++ b/CI/samples.ci/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/pom.xml
@@ -1,73 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>TypeScriptFetchBuildPrefixParameterInterfacesPestoreClientTests</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>TS Fetch Petstore Client (with namespacing for parameter interfaces)</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>npm-install</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>npm</executable>
-                            <arguments>
-                                <argument>install</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>npm-build</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>npm</executable>
-                            <arguments>
-                                <argument>run</argument>
-                                <argument>build</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>npm-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>npm</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,8 +31,6 @@ Please file the pull request against the correct branch, e.g. `master` for non-b

 All the code generators can be found in [modules/openapi-generator/src/main/java/org/openapitools/codegen/languages](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages)

-If you want to add a new generator, follow the [new-generator](https://openapi-generator.tech/docs/new-generator) guide. 
-
 ### Templates

 All the templates ([mustache](https://mustache.github.io/)) can be found in [modules/openapi-generator/src/main/resources](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/resources).
@@ -85,8 +83,8 @@ For [Vendor Extensions](https://github.com/OAI/OpenAPI-Specification/blob/master
 To add test cases (optional) covering the change in the code generator, please refer to [modules/openapi-generator/src/test/java/org/openapitools/codegen](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/test/java/org/openapitools/codegen)

 To test the templates, please perform the following:
- Update the Petstore sample by running the shell scripts under `bin` and `bin/openapi3` folder. For example, run `./bin/python-petstore.sh` and `./bin/openapi3/python-petstore.sh` to update the Python PetStore API client under [`samples/client/petstore/python`](https://github.com/openapitools/openapi-generator/tree/master/samples/client/petstore/python) and [`samples/openapi3/client/petstore/python`](https://github.com/openapitools/openapi-generator/tree/master/samples/openapi3/client/petstore/python). For Windows, the batch files can be found under `bin\windows` folder. (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)
- Run the tests in the sample folder using maven `mvn integration-test -rf :<artifactId>`, e.g. open a shell in `samples/client/petstore/python`, run `mvn integration-test -rf :PythonPetstoreClientTests`. The artifactId of the project can be found in the pom.xml file. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests)
+- Update the Petstore sample by running the shell script under `bin` folder. For example, run `./bin/ruby-petstore.sh` to update the Ruby PetStore API client under [`samples/client/petstore/ruby`](https://github.com/openapitools/openapi-generator/tree/master/samples/client/petstore/ruby) For Windows, the batch files can be found under `bin\windows` folder. (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)
+- Run the tests in the sample folder, e.g. in `samples/client/petstore/ruby`, run `mvn integration-test -rf :RubyPetstoreClientTests`. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests)
 - Finally, git commit the updated samples files: `git commit -a`
  (`git add -A` if added files with new test cases)
 - For new test cases, please add to the [Fake Petstore spec](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml)
--- a/1
+++ b/1
@@ -18,7 +18,6 @@ COPY ./modules/openapi-generator-gradle-plugin ${GEN_DIR}/modules/openapi-genera
 COPY ./modules/openapi-generator-maven-plugin ${GEN_DIR}/modules/openapi-generator-maven-plugin
 COPY ./modules/openapi-generator-online ${GEN_DIR}/modules/openapi-generator-online
 COPY ./modules/openapi-generator-cli ${GEN_DIR}/modules/openapi-generator-cli
-COPY ./modules/openapi-generator-core ${GEN_DIR}/modules/openapi-generator-core
 COPY ./modules/openapi-generator ${GEN_DIR}/modules/openapi-generator
 COPY ./pom.xml ${GEN_DIR}

--- a/README.md
+++ b/README.md
@@ -2,28 +2,16 @@

 <div align="center">

-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`4.2.1`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`4.0.0`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
 [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
-[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/master)](https://cloud.drone.io/OpenAPITools/openapi-generator)

-[`4.3.x`](https://github.com/OpenAPITools/openapi-generator/tree/4.3.x) branch: [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/4.3.x.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
-[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/4.3.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
-[![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=4.3.x)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
-[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=4.3.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/4.3.x)](https://cloud.drone.io/OpenAPITools/openapi-generator)
-
-[`5.0.x`](https://github.com/OpenAPITools/openapi-generator/tree/5.0.x) branch: [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/5.0.x.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
-[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/5.0.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
-[![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=5.0.x)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
-[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=5.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/5.0.x)](https://cloud.drone.io/OpenAPITools/openapi-generator)
 </div>

 <div align="center">

-[![Jion the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/enQtNzAyNDMyOTU0OTE1LTY5ZDBiNDI5NzI5ZjQ1Y2E5OWVjMjZkYzY1ZGM2MWQ4YWFjMzcyNDY5MGI4NjQxNDBiMTlmZTc5NjY2ZTQ5MGM)
+[![Join the chat at https://gitter.im/OpenAPITools/openapi-generator](https://badges.gitter.im/OpenAPITools/openapi-generator.svg)](https://gitter.im/OpenAPITools/openapi-generator?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Stable releaases in the Maven store](https://img.shields.io/maven-metadata/v/http/central.maven.org/maven2/org/openapitools/openapi-generator/maven-metadata.xml.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.openapitools%22%20AND%20a%3A%22openapi-generator%22)
 [![Follow OpenAPI Generator Twitter account to get the latest update](https://img.shields.io/twitter/follow/oas_generator.svg?style=social&label=Follow)](https://twitter.com/oas_generator)

@@ -37,7 +25,7 @@

 :notebook_with_decorative_cover: For more information, please refer to the [Wiki page](https://github.com/openapitools/openapi-generator/wiki) and [FAQ](https://github.com/openapitools/openapi-generator/wiki/FAQ) :notebook_with_decorative_cover:

-: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:
+:notebook_with_decorative_cover: The eBook [A Beginner's Guide to Code Generation for REST APIs](https://gumroad.com/l/swagger_codegen_beginner) 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)) :warning:

@@ -45,31 +33,16 @@

 </div>

-## Sponsors
-
-If you find OpenAPI Generator useful for work, please consider asking your company to support this Open Source project by [becoming a sponsor](https://opencollective.com/openapi_generator). You can also individually sponsor the project by [becoming a backer](https://opencollective.com/openapi_generator).
-
-#### Thank you to our bronze sponsors!
-
-[![NamSor](https://openapi-generator.tech/img/companies/namsor.png)](https://www.namsor.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[![LightBow](https://openapi-generator.tech/img/companies/lightbow.png)](https://www.lightbow.net/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-
-#### Thank you GoDaddy for sponsoring the domain names and Linode for sponsoring the VPS
-
-[<img src="https://openapi-generator.tech/img/companies/godaddy.png" width="150">](https://www.godaddy.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[![Linode](https://www.linode.com/media/images/logos/standard/light/linode-logo_standard_light_small.png)](https://www.linode.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-
-
 ## Overview
 OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs,  documentation and configuration automatically given an [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification) (both 2.0 and 3.0 are supported). Currently, the following languages/frameworks are supported:

 |                                | Languages/Frameworks |
 |-|-|
-**API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.0, .NET Core 2.0), **C++** (cpp-restsdk, Qt5, Tizen), **Clojure**, **Dart (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), **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (rust, rust-server), **Scala** (akka, http4s, scalaz, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.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** ([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**
+**API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later), **C++** (cpprest, 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), **Kotlin**, **Lua**, **Node.js** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types) **Objective-C**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (rust, rust-server), **Scala** (akka, http4s, scalaz, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x), **Typescript** (AngularJS, Angular (2.x - 7.x), Aurelia, Axios, Fetch, Inversify, jQuery, Node)
+**Server stubs**                 | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed), **Erlang**, **Go** (net/http, Gin), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples)), **Kotlin** (Spring Boot), **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** ([Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), Scalatra)
+**API documentation generators** | **HTML**, **Confluence Wiki**
 **Configuration files**          | [**Apache2**](https://httpd.apache.org/)
-**Others**                       | **GraphQL**, **JMeter**, **MySQL Schema**, **Protocol Buffer**
+**Others**                       | **GraphQL**, **JMeter**, **MySQL Schema**

 ## Table of contents

@@ -90,7 +63,6 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
    - [3.2 - Workflow Integration](#32---workflow-integration-maven-gradle-github-cicd)
    - [3.3 - Online Generators](#33---online-openapi-generator)
    - [3.4 - License Information on Generated Code](#34---license-information-on-generated-code)
-    - [3.5 - IDE Integration](#35---ide-integration)
  - [4 - Companies/Projects using OpenAPI Generator](#4---companiesprojects-using-openapi-generator)
  - [5 - Presentations/Videos/Tutorials/Books](#5---presentationsvideostutorialsbooks)
  - [6 - About Us](#6---about-us)
@@ -107,10 +79,8 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20

 OpenAPI Generator Version    | Release Date | Notes
 ---------------------------- | ------------ | -----
-5.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/)| 13.05.2020 | Major release with breaking changes (no fallback)
-4.3.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.3.0-SNAPSHOT/)| 29.02.2020 | Minor release (breaking changes with fallbacks)
-4.2.1 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.2.1/)| 15.11.2019 | Patch release
-[4.2.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.2.0) (latest stable release) | 31.10.2019 | Minor release (bug fixes, enhancements, breaking chanages with fallbacks)
+4.0.0 (upcoming release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.0-SNAPSHOT/)| 20.12.2018 | Major release with breaking changes (with or without fallback)
+[3.3.4](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.3.4) (latest stable release) | 30.11.2018 | Bugfix release

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

@@ -118,7 +88,7 @@ For old releases, please refer to the [**Release**](https://github.com/OpenAPITo

 ## [1.2 - Artifacts on Maven Central](#table-of-contents)

-You can find our released artifacts on maven central:
+You can find our released artefacts on maven central:

 **Core:**
 ```xml
@@ -163,19 +133,19 @@ See the different versions of the [openapi-generator-cli](https://mvnrepository.
 * [Readme](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-gradle-plugin/README.adoc)

 ### [1.3 - Download JAR](#table-of-contents)
-<!-- 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: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.0/openapi-generator-cli-4.2.0.jar`
+JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.3.4/openapi-generator-cli-3.3.4.jar`

 For **Mac/Linux** users:
 ```sh
-wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.0/openapi-generator-cli-4.2.0.jar -O openapi-generator-cli.jar
+wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.3.4/openapi-generator-cli-3.3.4.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 http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.0/openapi-generator-cli-4.2.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.3.4/openapi-generator-cli-3.3.4.jar
 ```

 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -185,7 +155,7 @@ For Mac users, please make sure Java 8 is installed (Tips: run `java -version` t
 export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
 export PATH=${JAVA_HOME}/bin:$PATH
 ```
-<!-- /RELEASE_VERSION -->
+
 ### Launcher Script

 One downside to manual jar downloads is that you don't keep up-to-date with the latest released version. We have a Bash launcher script at [bin/utils/openapi-generator.cli.sh](./bin/utils/openapi-generator-cli.sh) which resolves this issue.
@@ -233,9 +203,9 @@ openapi-generator-cli version # is always 3.0.2, unless any of the above overrid

 To build from source, you need the following installed and available in your `$PATH:`

-* [Java 8](https://www.oracle.com/technetwork/java/index.html)
+* [Java 8](http://java.oracle.com)

-* [Apache Maven 3.3.4 or greater](https://maven.apache.org/)
+* [Apache maven 3.3.4 or greater](http://maven.apache.org/)

 After cloning the project, you can build it from source with this command:
 ```sh
@@ -256,18 +226,7 @@ Here is an example usage to generate a Ruby client:
 openapi-generator generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g ruby -o /tmp/test/
 ```

-To reinstall with the latest master, run `brew uninstall openapi-generator && brew install --HEAD openapi-generator`
-
-To install OpenJDK (pre-requisites), please run
-```sh
-brew cask install adoptopenjdk12
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-12.0.2.jdk/Contents/Home/
-```
-
-To install Maven, please run
-```sh
-brew install maven
-```
+To reinstall with the latest master, run `brew reinstall --HEAD openapi-generator`

 ### [1.6 - Docker](#table-of-contents)

@@ -302,7 +261,7 @@ Example usage:

 ```sh
 # Start container at port 8888 and save the container id
-> CID=$(docker run -d -p 8888:8080 openapitools/openapi-generator-online)
+> CID=$(docker run -d -p 8888:8080 -e GENERATOR_HOST=http://localhost:8888 openapitools/openapi-generator-online)

 # allow for startup
 > sleep 10
@@ -369,7 +328,7 @@ Right now: no solution for this one :|
 #### Run Docker in Vagrant
 Prerequisite: install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
 ```sh
-git clone https://github.com/openapitools/openapi-generator.git
+git clone http://github.com/openapitools/openapi-generator.git
 cd openapi-generator
 vagrant up
 vagrant ssh
@@ -389,11 +348,10 @@ npm install @openapitools/openapi-generator-cli -g
 openapi-generator version
 ```

-<!-- RELEASE_VERSION -->
-Or install a particular OpenAPI Generator version (e.g. v4.2.0):
+Or install a particualar OpenAPI Generator version (e.g. v3.3.4):

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

 Or install it as dev-dependency:
@@ -401,7 +359,7 @@ Or install it as dev-dependency:
 ```sh
 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/2_0/petstore.yaml), please run the following
@@ -416,9 +374,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
 ```
 (if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/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](http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.0/openapi-generator-cli-4.2.0.jar)
-<!-- /RELEASE_VERSION -->
+You can also download the JAR (latest release) directly from [maven.org](http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.0.0/openapi-generator-cli-3.0.0.jar)

 To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`

@@ -456,34 +412,28 @@ NAME
 SYNOPSIS
        openapi-generator-cli generate
                [(-a <authorization> | --auth <authorization>)]
-                [--api-name-suffix <api name suffix>]
+                [--additional-properties <additional properties>...]
                [--api-package <api package>] [--artifact-id <artifact id>]
                [--artifact-version <artifact version>]
                [(-c <configuration file> | --config <configuration file>)]
                [-D <system properties>...]
-                [(-e <templating engine> | --engine <templating engine>)]
-                [--enable-post-process-file]
                [(-g <generator name> | --generator-name <generator name>)]
-                [--generate-alias-as-model] [--git-repo-id <git repo id>]
-                [--git-user-id <git user id>] [--group-id <group id>]
-                [--http-user-agent <http user agent>]
+                [--git-repo-id <git repo id>] [--git-user-id <git user id>]
+                [--group-id <group id>] [--http-user-agent <http user agent>]
                (-i <spec file> | --input-spec <spec file>)
                [--ignore-file-override <ignore file override location>]
                [--import-mappings <import mappings>...]
                [--instantiation-types <instantiation types>...]
                [--invoker-package <invoker package>]
                [--language-specific-primitives <language specific primitives>...]
-                [--library <library>] [--log-to-stderr] [--minimal-update]
+                [--library <library>] [--log-to-stderr]
                [--model-name-prefix <model name prefix>]
                [--model-name-suffix <model name suffix>]
                [--model-package <model package>]
-                [(-o <output directory> | --output <output directory>)] 
-                [(-p <additional properties> | --additional-properties <additional properties>)...]
-                [--package-name <package name>] [--release-note <release note>]
-                [--remove-operation-id-prefix]
+                [(-o <output directory> | --output <output directory>)]
+                [--release-note <release note>] [--remove-operation-id-prefix]
                [--reserved-words-mappings <reserved word mappings>...]
-                [(-s | --skip-overwrite)] [--server-variables <server variables>...]
-                [--skip-validate-spec] [--strict-spec <true/false strict behavior>]
+                [(-s | --skip-overwrite)] [--skip-validate-spec]
                [(-t <template directory> | --template-dir <template directory>)]
                [--type-mappings <type mappings>...] [(-v | --verbose)]

@@ -522,20 +472,20 @@ Please refer to [customization.md](docs/customization.md) on how to customize th

 ### [3.2 - Workflow Integration (Maven, Gradle, Github, CI/CD)](#table-of-contents)

-Please refer to [integration.md](docs/integration.md) on how to integrate OpenAPI generator with Maven, Gradle, sbt, Bazel, Github and CI/CD.
+Please refer to [integration.md](docs/integration.md) on how to integrate OpenAPI generator with Maven, Gradle, Github and CI/CD.

 ### [3.3 - Online OpenAPI generator](#table-of-contents)

 Here are the public online services:

- latest stable version: https://api.openapi-generator.tech
- latest master: https://api-latest-master.openapi-generator.tech (updated with latest master every hour)
+- latest stable version: http://api.openapi-generator.tech
+- latest master: http://api-latest-master.openapi-generator.tech (updated with latest master every hour)

 The server is sponsored by [Linode](https://www.linode.com/) [![Linode Logo](https://www.linode.com/media/images/logos/standard/light/linode-logo_standard_light_small.png)](https://www.linode.com/)

 (These services are beta and do not have any guarantee on service level)

-Please refer to [online.md](docs/online.md) on how to run and use the `openapi-generator-online` - a web service for `openapi-generator`.
+Please refer to [online-openapi-generator.md](docs/online-openapi-generator.md) on how to run and use the `openapi-generator-online` - a web service for `openapi-generator`.

 ### [3.4 - License information on Generated Code](#table-of-contents)

@@ -545,82 +495,28 @@ The OpenAPI Generator project is intended as a benefit for users of the Open API
 * Generated code is intentionally _not_ subject to the parent project license

 When code is generated from this project, it shall be considered **AS IS** and owned by the user of the software.  There are no warranties--expressed or implied--for generated code.  You can do what you wish with it, and once generated, the code is your responsibility and subject to the licensing terms that you deem appropriate.
-
-### [3.5 - IDE Integration](#table-of-contents)
-
-Here is a list of community-conitributed IDE plug-ins that integrate with OpenAPI Generator:
-
- Eclipse: [Codewind OpenAPI Tools for Eclipse](https://www.eclipse.org/codewind/open-api-tools-for-eclipse.html) by [IBM](https://www.ibm.com)
- IntelliJ IDEA: [OpenAPI Generator](https://plugins.jetbrains.com/plugin/8433-openapi-generator) by [Jim Schubert](https://jimschubert.us/#/)
- IntelliJ IDEA: [Senya Editor](https://plugins.jetbrains.com/plugin/10690-senya-editor) by [senya.io](https://senya.io)
- [RepreZen API Studio](https://www.reprezen.com/)
- Visual Studio: [REST API Client Code Generator](https://marketplace.visualstudio.com/items?itemName=ChristianResmaHelle.ApiClientCodeGenerator) by [Christian Resma Helle](https://christian-helle.blogspot.com/)
- Visual Studio Code: [Codewind OpenAPI Tools](https://marketplace.visualstudio.com/items?itemName=IBM.codewind-openapi-tools) by [IBM](https://marketplace.visualstudio.com/publishers/IBM)
-
 
 ## [4 - Companies/Projects using OpenAPI Generator](#table-of-contents)
 Here are some companies/projects (alphabetical order) using OpenAPI Generator in production. To add your company/project to the list, please visit [README.md](README.md) and click on the icon to edit the page.

- [Adaptant Solutions AG](https://www.adaptant.io/)
 - [Angular.Schule](https://angular.schule/)
- [Australia and New Zealand Banking Group (ANZ)](http://www.anz.com/)
 - [ASKUL](https://www.askul.co.jp)
- [Arduino](https://www.arduino.cc/)
 - [b<>com](https://b-com.com/en)
- [Banzai Cloud](https://banzaicloud.com)
- [BIMData.io](https://bimdata.io)
 - [Bithost GmbH](https://www.bithost.ch)
- [Bosch Connected Industry](https://www.bosch-connected-industry.com)
 - [Boxever](https://www.boxever.com/)
- [California State University, Northridge](https://www.csun.edu)
- [CAM](https://www.cam-inc.co.jp/)
- [Camptocamp](https://www.camptocamp.com/en)
- [codecentric AG](https://www.codecentric.de/)
- [Commencis](https://www.commencis.com/)
- [Cupix](https://www.cupix.com/)
- [DB Systel](https://www.dbsystel.de)
- [dwango](https://dwango.co.jp/)
- [Edge Impulse](https://www.edgeimpulse.com/)
- [Element AI](https://www.elementai.com/)
- [Fenergo](https://www.fenergo.com/)
- [FormAPI](https://formapi.io/)
- [FreshCells](https://www.freshcells.de/)
- [Fuse](https://www.fuse.no/)
- [Gantner](https://www.gantner.com)
- [GenFlow](https://github.com/RepreZen/GenFlow)
 - [GMO Pepabo](https://pepabo.com/en/)
- [GoDaddy](https://godaddy.com)
- [Here](https://developer.here.com/)
- [IBM](https://www.ibm.com/)
 - [JustStar](https://www.juststarinfo.com)
 - [Klarna](https://www.klarna.com/)
- [Kronsoft Development](https://www.kronsoft.ro/home/)
- [Médiavision](https://www.mediavision.fr/)
 - [Metaswitch](https://www.metaswitch.com/)
 - [Myworkout](https://myworkout.com)
- [NamSor](https://www.namsor.com/)
- [Openet](https://www.openet.com/)
- [Paxos](https://www.paxos.com)
- [Ponicode](https://ponicode.dev/)
- [Pricefx](https://www.pricefx.com/)
- [Prometheus/Alertmanager](https://github.com/prometheus/alertmanager)
- [QEDIT](https://qed-it.com)
- [Qulix Systems](https://www.qulix.com)
 - [Raiffeisen Schweiz Genossenschaft](https://www.raiffeisen.ch)
- [RedHat](https://www.redhat.com)
 - [RepreZen API Studio](https://www.reprezen.com/swagger-openapi-code-generation-api-first-microservices-enterprise-development)
 - [REST United](https://restunited.com)
 - [Stingray](http://www.stingray.com)
 - [Suva](https://www.suva.ch/)
 - [Telstra](https://dev.telstra.com)
- [TravelTime platform](https://www.traveltimeplatform.com/)
 - [TUI InfoTec GmbH](http://www.tui-infotec.com/)
 - [unblu inc.](https://www.unblu.com/)
- [Veamly](https://www.veamly.com/)
- [WSO2](https://wso2.com/)
- [Vouchery.io](https://vouchery.io)
- [Xero](https://www.xero.com/)
- [Yelp](https://www.yelp.com/)
 - [Zalando](https://www.zalando.com)

 ## [5 - Presentations/Videos/Tutorials/Books](#table-of-contents)
@@ -633,64 +529,9 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2018/06/27 - [Lessons Learned from Leading an Open-Source Project Supporting 30+ Programming Languages](https://speakerdeck.com/wing328/lessons-learned-from-leading-an-open-source-project-supporting-30-plus-programming-languages) - [William Cheng](https://github.com/wing328) at [LinuxCon + ContainerCon + CloudOpen China 2018](http://bit.ly/2waDKKX)
 - 2018/07/19 - [OpenAPI Generator Contribution Quickstart - RingCentral Go SDK](https://medium.com/ringcentral-developers/openapi-generator-for-go-contribution-quickstart-8cc72bf37b53) by [John Wang](https://github.com/grokify)
 - 2018/08/22 - [OpenAPI Generatorのプロジェクト構成などのメモ](https://yinm.info/20180822/) by [Yusuke Iinuma](https://github.com/yinm)
- 2018/09/12 - [RepreZen and OpenAPI 3.0: Now is the Time](https://www.reprezen.com/blog/reprezen-openapi-3.0-upgrade-now-is-the-time) by [Miles Daffin](https://www.reprezen.com/blog/author/miles-daffin)
 - 2018/10/31 - [A node package wrapper for openapi-generator](https://github.com/HarmoWatch/openapi-generator-cli)
 - 2018/11/03 - [OpenAPI Generator + golang + Flutter でアプリ開発](http://ryuichi111std.hatenablog.com/entry/2018/11/03/214005) by [Ryuichi Daigo](https://github.com/ryuichi111)
- 2018/11/15 - [基于openapi3.0的yaml文件生成java代码的一次实践](https://blog.csdn.net/yzy199391/article/details/84023982) by [焱魔王](https://me.csdn.net/yzy199391)
 - 2018/11/19 - [OpenAPIs are everywhere](https://youtu.be/-lDot4Yn7Dg) by [Jeremie Bresson (Unblu)](https://github.com/jmini) at [EclipseCon Europe 2018](https://www.eclipsecon.org/europe2018)
- 2018/12/09 - [openapi-generator をカスタマイズする方法](https://qiita.com/watiko/items/0961287c02eac9211572) by [@watiko](https://qiita.com/watiko)
- 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/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)
- 2019/02/26 - [Building APIs with OpenAPI: Continued](https://medium.com/@ratrosy/building-apis-with-openapi-continued-5d0faaed32eb) by [Ratros Y.](https://medium.com/@ratrosy) in [Google Cloud Platofrm Blog](https://medium.com/google-cloud)
- 2019-03-07 - [OpenAPI Generator で Spring Boot と Angular をタイプセーフに繋ぐ](https://qiita.com/chibato/items/e4a748db12409b40c02f) by [Tomofumi Chiba](https://github.com/chibat)
- 2019-03-25 - [Access any REST service with the SAP S/4HANA Cloud SDK](https://blogs.sap.com/2019/03/25/integrate-sap-s4hana-cloud-sdk-with-open-api/) by [Alexander Duemont](https://people.sap.com/alexander.duemont)
- 2019-03-25 - [OpenAPI generatorを試してみる](https://qiita.com/amuyikam/items/e8a45daae59c68be0fc8) by [@amuyikam](https://twitter.com/amuyikam)
- 2019-03-27 - [OpenAPI3を使ってみよう！Go言語でクライアントとスタブの自動生成まで！](https://techblog.zozo.com/entry/openapi3/go) by [@gold_kou](https://twitter.com/gold_kou)
- 2019-04-17 - [OpenAPIによるスキーマファースト開発の実施サンプルとCloud Runについて](https://tech-blog.optim.co.jp/entry/2019/04/17/174000) by [@yukey1031](https://twitter.com/yukey1031)
- 2019-04-18 - [How to use OpenAPI3 for API developer (RubyKaigi 2019)](https://speakerdeck.com/ota42y/how-to-use-openapi3-for-api-developer) by [@ota42y](https://twitter.com/ota42y) at [RubyKaigi 2019](https://rubykaigi.org/2019)
- 2019-04-29 - [A Beginner's Guide to Code Generation for REST APIs (OpenAPI Generator)](https://gum.co/openapi_generator_ebook) by [William Cheng](https://twitter.com/wing328)
- 2019-05-01 - [Design and generate a REST API from Swagger / OpenAPI in Java, Python, C# and more](https://simply-how.com/design-and-generate-api-code-from-openapi) by [Simply How](https://simply-how.com/)
- 2019-05-17 - [Generate Spring Boot REST API using Swagger/OpenAPI](https://www.47northlabs.com/knowledge-base/generate-spring-boot-rest-api-using-swagger-openapi/) by [Antonie Zafirov](https://www.47northlabs.com/author/antonie-zafirov/)
- 2019-05-22 - [REST APIs代码生成指南(OpenAPI Generator)](https://gum.co/openapi_generator_ebook_gb) by [William Cheng](https://twitter.com/wing328), [Xin Meng](https://github.com/xmeng1)
- 2019-05-24 - [REST API 代碼生成指南 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328)
- 2019-06-24 - [Kubernetes Clients and OpenAPI Generator](https://speakerdeck.com/wing328/kubernetes-clients-and-openapi-generator) by [William Cheng](https://twitter.com/wing328) at [Kubernetes Contributor Summits Shanghai 2019](https://www.lfasiallc.com/events/contributors-summit-china-2019/)
- 2019-06-28 [Codewind OpenAPI Tools](https://marketplace.eclipse.org/content/codewind-openapi-tools) in [Eclipse Marketplace](https://marketplace.eclipse.org/) by IBM
- 2019-06-29 [Codewind OpenAPI Tools](https://marketplace.visualstudio.com/items?itemName=IBM.codewind-openapi-tools) in [Visual Studio Marketplace](https://marketplace.visualstudio.com/) by IBM
- 2019-07-04 - [REST API のためのコード生成入門 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh), [和田拓朗](https://github.com/taxpon)
- 2019-07-08 - [OpenAPI Generator にコントリビュートしたら社名が載った話。(CAM) - CAM TECH BLOG](https://tech.cam-inc.co.jp/entry/2019/07/08/140000) by [CAM, Inc.](https://www.cam-inc.co.jp/)
- 2019-07-14 - [OpenAPI GeneratorでPythonのクライアントライブラリを作成した](https://qiita.com/yuji38kwmt/items/dfb929316a1335a161c0) by [yuji38kwmt](https://qiita.com/yuji38kwmt)
- 2019-07-19 - [Developer Experience (DX) for Open-Source Projects: How to Engage Developers and Build a Growing Developer Community](https://speakerdeck.com/wing328/developer-experience-dx-for-open-source-projects-english-japanese) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh) at [Open Source Summit Japan 2019](https://events.linuxfoundation.org/events/open-source-summit-japan-2019/)
- 2019-08-14 - [Our OpenAPI journey with Standardizing SDKs](https://bitmovin.com/our-openapi-journey-with-standardizing-sdks/) by [Sebastian Burgstaller](https://bitmovin.com/author/sburgstaller/) at [Bitmovin](https://www.bitmovin.com)
- 2019-08-15 - [APIのコードを自動生成させたいだけならgRPCでなくてもよくない?](https://www.m3tech.blog/entry/2019/08/15/110000) by [M3, Inc.](https://corporate.m3.com/)
- 2019-08-22 - [マイクロサービスにおけるWeb APIスキーマの管理─ GraphQL、gRPC、OpenAPIの特徴と使いどころ](https://employment.en-japan.com/engineerhub/entry/2019/08/22/103000) by [@ota42y](https://twitter.com/ota42y)
- 2019-08-24 - [SwaggerドキュメントからOpenAPI Generatorを使ってモックサーバー作成](https://qiita.com/masayoshi0222/items/4845e4c715d04587c104) by [坂本正義](https://qiita.com/masayoshi0222)
- 2019-08-29 - [OpenAPI初探](https://cloud.tencent.com/developer/article/1495986) by [peakxie](https://cloud.tencent.com/developer/user/1113152) at [腾讯云社区](https://cloud.tencent.com/developer)
- 2019-08-29 - [全面进化：Kubernetes CRD 1.16 GA前瞻](https://www.servicemesher.com/blog/kubernetes-1.16-crd-ga-preview/) by [Min Kim](https://github.com/yue9944882) at [ServiceMesher Blog](https://www.servicemesher.com/blog/)
- 2019-09-01 - [Creating a PHP-Slim server using OpenAPI (Youtube video)](https://www.youtube.com/watch?v=5cJtbIrsYkg) by [Daniel Persson](https://www.youtube.com/channel/UCnG-TN23lswO6QbvWhMtxpA)
- 2019-09-06 - [Vert.x and OpenAPI](https://wissel.net/blog/2019/09/vertx-and-openapi.html) by [Stephan H Wissel](https://twitter.com/notessensei) at [wissel.net blog](https://wissel.net)
- 2019-09-09 - [Cloud-native development - Creating RESTful microservices](https://cloud.ibm.com/docs/cloud-native?topic=cloud-native-rest-api) in [IBM Cloud Docs](https://cloud.ibm.com/docs)
- 2019-09-14 - [Generating and Configuring a Mastercard API Client](https://developer.mastercard.com/platform/documentation/generating-and-configuring-a-mastercard-api-client/) at [Mastercard Developers Platform](https://developer.mastercard.com/platform/documentation/)
- 2019-09-15 - [OpenAPI(Swagger)導入下調べ](https://qiita.com/ShoichiKuraoka/items/f1f7a3c2376f7cd9c56a) by [Shoichi Kuraoka](https://qiita.com/ShoichiKuraoka)
- 2019-09-17 - [Tutorial: Documenting http4k APIs with OpenApi3](https://www.http4k.org/tutorials/documenting_apis_with_openapi/) by [http4k](https://www.http4k.org/)
- 2019-09-22 - [OpenAPI 3を完全に理解できる本](https://booth.pm/ja/items/1571902) by [@ota42y](https://twitter.com/ota42y)
- 2019-09-22 - [RESTful APIs: Tutorial of OpenAPI Specification](https://medium.com/@amirm.lavasani/restful-apis-tutorial-of-openapi-specification-eeada0e3901d) by [Amir Lavasani](https://medium.com/@amirm.lavasani)
- 2019-09-22 - [Redefining SDKs as software diversity kits](https://devrel.net/dev-rel/redefining-sdks-as-software-diversity-kits) by [Sid Maestre (Xero)](https://twitter.com/sidneyallen) at [DevRelCon San Francisco 2019](https://sf2019.devrel.net/)
- 2019-09-23 - [swaggerからOpenApi GeneratorでSpringのコードを自動生成](https://qiita.com/littleFeet/items/492df2ad68a0799a5e5e) by [@littleFeet](https://qiita.com/littleFeet) at [Qiita](https://qiita.com/)
- 2019-09-24 - [Eine Stunde was mit Api First!](https://www.slideshare.net/JanWeinschenker/eine-stunde-was-mit-api-first) by [@janweinschenker](https://twitter.com/janweinschenker) at [Java Forum Nord](https://javaforumnord.de/)
- 2019-10-09 - [openapi-generator で生成した Go クライアントで Bearer 認証をする](https://autopp-tech.hatenablog.com/entry/2019/10/09/222039) by [Akira Tanimura](https://github.com/autopp)
- 2019-10-10 - [Automatic Generation of REST Clients](https://www.meetup.com/fr-FR/Criteo-Labs-Tech-Talks/events/264775768/) by Thomas Peyrard, Senior Software Engineer at Criteo in [Full-Stack Tech Talks (Meetup)](https://www.meetup.com/fr-FR/Criteo-Labs-Tech-Talks/events/264775768/)
- 2019-10-12 - [OpenApi自动生成client](https://blog.csdn.net/wxid2798226/article/details/102527467) by [郑泽洲](https://me.csdn.net/wxid2798226)
- 2019-10-16 - [How to ship APIs faster?](https://medium.com/@accounts_76224/how-to-ship-apis-faster-cabef2f819e4) by [Simon Guilliams @ PoniCode](https://ponicode.dev)
- 2019-10-22 - [OpenAPI + Spring Boot(Kotlin)でファイルダウンロードAPIを作成する](https://qiita.com/boronngo/items/4b78b92526209daeaee9) by [Yuki Furukawa](https://twitter.com/yuki_furukawa5)
- 2019-10-24 - [Microprofile OpenAPI - Code First or Design First?](https://github.com/pe-st/apidocs/blob/master/MicroProfile-OpenAPI-all-slides.pdf) by [Peter [pɛʃə] Steiner](https://twitter.com/pesche) at [eclipsecon Europe 2019](https://www.eclipsecon.org/europe2019/sessions/microprofile-openapi-code-first-or-design-first)
- 2019-11-06 - [Generating API clients based on OpenAPI v3 specifications](https://98elements.com/blog/generating-api-clients-based-on-openapi-v3-specifications) by [Dominik Jastrzębski @ 98elements](https://98elements.com)
- 2019-11-06 - [OpenAPIを利用して自前のAPIサーバー(Sinatra)を移植した時のメモ](https://qiita.com/YasuhiroABE/items/c73920eab2d9d6e97fd9) by [Yasuhiro ABE](https://twitter.com/YasuhiroABE)
- 2019-11-11 - [TypeScript REST APIクライアント](https://qiita.com/unhurried/items/7b74f7d3c43545dadd2b) by [@unhurried](https://qiita.com/unhurried)

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

@@ -699,42 +540,38 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 OpenAPI Generator core team members are contributors who have been making significant contributions (review issues, fix bugs, make enhancements, etc) to the project on a regular basis.

 #### Core Team Members
-* [@wing328](https://github.com/wing328) (2015/07) [:heart:](https://www.patreon.com/wing328)
-* [@jimschubert](https://github.com/jimschubert) (2016/05) [:heart:](https://www.patreon.com/jimschubert)
+* [@wing328](https://github.com/wing328) (2015/07)
+* [@jimschubert](https://github.com/jimschubert) (2016/05)
 * [@cbornet](https://github.com/cbornet) (2016/05)
-* [@ackintosh](https://github.com/ackintosh) (2018/02) [:heart:](https://www.patreon.com/ackintosh/overview)
-* [@jmini](https://github.com/jmini) (2018/04)  [:heart:](https://www.patreon.com/jmini)
-* [@etherealjoy](https://github.com/etherealjoy) (2019/06)
-
-:heart: = Link to support the contributor directly 
+* [@jaz-ah](https://github.com/jaz-ah) (2016/05)
+* [@ackintosh](https://github.com/ackintosh) (2018/02)
+* [@JFCote](https://github.com/JFCote) (2018/03)
+* [@jmini](https://github.com/jmini) (2018/04)

 #### Template Creator
-
-**NOTE**: Embedded templates are only supported in _Mustache_ format. Support for all other formats is experimental and subject to change at any time.
-
 Here is a list of template creators:
 * API Clients:
   * Ada: @stcarrez
+   * Akka-Scala: @cchafer
   * Apex: @asnelling
   * Bash: @bkryza
-   * C: @PowerOfCreation @zhemant [:heart:](https://www.patreon.com/zhemant)
+   * C: @PowerOfCreation @zhemant
   * C++ REST: @Danielku15
   * C# (.NET 2.0): @who
   * C# (.NET Standard 1.3 ): @Gronsak
-   * C# (.NET 4.5 refactored): @jimschubert [:heart:](https://www.patreon.com/jimschubert)
+   * C# (.NET 4.5 refactored): @jimschubert
   * Clojure: @xhh
   * Dart: @yissachar
   * Dart (refactor): @joernahrens
   * Dart 2: @swipesight
   * Dart (Jaguar): @jaumard
-   * Dart (Dio): @athornz
   * Elixir: @niku
-   * Elm: @eriktim
+   * Elm: @trenneman
   * Eiffel: @jvelilla
   * Erlang: @tsloughter
   * Erlang (PropEr): @jfacorro @robertoaloi
   * Groovy: @victorgit
-   * Go: @wing328 [:heart:](https://www.patreon.com/wing328)
+   * Go: @wing328
   * Go (rewritten in 2.3.0): @antihax
   * Haskell (http-client): @jonschoning
   * Java (Feign): @davidkiss
@@ -748,25 +585,19 @@ Here is a list of template creators:
   * Java (Vertx): @lopesmcc
   * Java (Google APIs Client Library): @charlescapps
   * Java (Rest-assured): @viclovsky
-   * Java (Java 11 Native HTTP client): @bbdouglas
   * Javascript/NodeJS: @jfiala
   * Javascript (Closure-annotated Angular) @achew22
   * Javascript (Flow types) @jaypea
   * JMeter: @davidkiss
-   * Kotlin: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
-   * Kotlin (MultiPlatform): @andrewemery
+   * Kotlin: @jimschubert
   * Lua: @daurnimator
-   * Nim: @hokamoto
-   * OCaml: @cgensoul
-   * Perl: @wing328 [:heart:](https://www.patreon.com/wing328)
+   * Perl: @wing328
   * PHP (Guzzle): @baartosz
   * PowerShell: @beatcracker
   * R: @ramnov
-   * Ruby (Faraday): @meganemura @dkliban 
   * Rust: @farcaller
   * Rust (rust-server): @metaswitch
   * Scala (scalaz & http4s): @tbrown1979
-   * Scala (Akka): @cchafer
   * Swift: @tkqubo
   * Swift 3: @hexelon
   * Swift 4: @ehyche
@@ -778,18 +609,14 @@ Here is a list of template creators:
   * TypeScript (Fetch): @leonyu
   * TypeScript (jQuery): @bherila
   * TypeScript (Node):  @mhardorf
-   * TypeScript (Rxjs): @denyo
-   * TypeScript (Inversify): @gualtierim
 * Server Stubs
   * Ada: @stcarrez
-   * C# ASP.NET 5: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
-   * C# ASP.NET Core 3.0: @A-Joshi 
+   * C# ASP.NET5: @jimschubert
   * C# NancyFX: @mstefaniuk
   * C++ (Qt5 QHttpEngine): @etherealjoy
   * C++ Pistache: @sebymiano
   * C++ Restbed: @stkrwork
   * Erlang Server: @galaxie
-   * F# (Giraffe) Server: @nmfisher
   * Go Server: @guohuang
   * Go (Gin) Server: @kemokemo
   * GraphQL Express Server: @renepardon
@@ -799,39 +626,29 @@ Here is a list of template creators:
   * Java Undertow: @stevehu
   * Java Play Framework: @JFCote
   * Java PKMST: @anshu2185 @sanshuman @rkumar-pk @ninodpillai
-   * Java Vert.x: @lwlee2608
   * JAX-RS RestEasy: @chameleon82
   * JAX-RS CXF: @hiveship
   * JAX-RS CXF (CDI): @nickcmaynard
   * JAX-RS RestEasy (JBoss EAP): @jfiala
-   * Kotlin: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
+   * Kotlin: @jimschubert
   * Kotlin (Spring Boot): @dr4ke616
-   * Kotlin (Vertx): @Wooyme
-   * NodeJS Express: @YishTish
   * PHP Laravel: @renepardon
   * PHP Lumen: @abcsun
   * PHP Slim: @jfastnacht
   * PHP Symfony: @ksm2
   * PHP Zend Expressive (with Path Handler): @Articus
-   * Python AIOHTTP: @Jyhess
   * Ruby on Rails 5: @zlx
   * Rust (rust-server): @metaswitch
-   * Scala Finch: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
+   * Scala Finch: @jimschubert
   * Scala Lagom: @gmkumar2005
-   * Scala Play: @adigerber
 * Documentation
-   * AsciiDoc: @man-at-home
   * HTML Doc 2: @jhitchcock
   * Confluence Wiki: @jhitchcock
 * Configuration
   * Apache2: @stkrwork
 * Schema
-   * Avro: @sgadouar 
-   * GraphQL: @wing328 [:heart:](https://www.patreon.com/wing328)
+   * GraphQL: @wing328
   * MySQL: @ybelenko
-   * Protocol Buffer: @wing328
-
-:heart: = Link to support the contributor directly

 #### How to join the core team

@@ -870,38 +687,33 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Apex      |  |
 | Bash      | @frol (2017/07) @bkryza (2017/08) @kenjones-cisco (2017/09) |
 | C         | @zhemant (2018/11) |
-| C++       | @ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @martindelille (2018/03) @muttleyxd (2019/08) |
-| C#        | @mandrean (2017/08), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert) @frankyjuang (2019/09) |
+| C++       | @ravinikam (2017/07) @stkrwork (2017/07) @fvarose (2017/11) @etherealjoy (2018/02) @martindelille (2018/03) |
+| C#        | @mandrean (2017/08) @jimschubert (2017/09) |
 | Clojure   |  |
-| Dart      | @ircecho (2017/07) @swipesight (2018/09) @jaumard (2018/09) @nickmeinhold (2019/09)  |
+| Dart      | @ircecho (2017/07) @swipesight (2018/09) @jaumard (2018/09) |
 | Eiffel    | @jvelilla (2017/09) |
-| Elixir    | @mrmstn (2018/12) |
-| Elm       | @eriktim (2018/09) |
+| Elixir    |  |
+| Elm       | @trenneman (2018/09) |
 | Erlang    | @tsloughter (2017/11) @jfacorro (2018/10) @robertoaloi (2018/10) |
-| F#        | @nmfisher (2019/05) |
-| Go        | @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09) @bkabrda (2019/07) |
+| Go        | @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09 |
 | 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) |
-| Kotlin    | @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) |
+| Java      | @bbdouglas (2017/07) @JFCote (2017/08) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) |
+| Kotlin    | @jimschubert (2017/09) @dr4ke616 (2018/08) |
 | Lua       | @daurnimator (2017/08) |
-| Nim       |  |
 | NodeJS/Javascript | @CodeNinjai (2017/07) @frol (2017/07) @cliffano (2017/07) |
 | ObjC      |  |
-| OCaml     | @cgensoul (2019/08) |
-| Perl      | @wing328 (2017/07) [:heart:](https://www.patreon.com/wing328) @yue9944882 (2019/06) |
-| PHP       | @jebentier (2017/07), @dkarlovi (2017/07), @mandrean (2017/08), @jfastnacht (2017/09), @ackintosh (2017/09) [:heart:](https://www.patreon.com/ackintosh/overview), @ybelenko (2018/07), @renepardon (2018/12) |
+| Perl      | @wing328 (2017/07) |
+| PHP       | @jebentier (2017/07) @dkarlovi (2017/07) @mandrean (2017/08) @jfastnacht (2017/09) @ackintosh (2017/09) @ybelenko (2018/07) @renepardon (2018/12) |
 | PowerShell | |
-| Python    | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) @Jyhess (2019/01) @slash-arun (2019/11) |
-| R         | @Ramanth (2019/07) @saigiridhar21 (2019/07) |
-| Ruby      | @cliffano (2017/07) @zlx (2017/09) @autopp (2019/02) |
-| Rust      | @frol (2017/07) @farcaller (2017/08) @bjgill (2017/12) @richardwhiuk (2019/07) |
-| Scala     | @clasnake (2017/07), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @shijinkui  (2018/01), @ramzimaalej (2018/03) |
+| Python    | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) |
+| R         |  |
+| Ruby      | @cliffano (2017/07) @zlx (2017/09) |
+| Rust      | @frol (2017/07) @farcaller (2017/08) @bjgill (2017/12) |
+| Scala     | @clasnake (2017/07) @jimschubert (2017/09) @shijinkui  (2018/01) @ramzimaalej (2018/03) |
 | Swift     | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @d-date  (2018/03) |
-| TypeScript | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @nicokoenig (2018/09) @topce (2018/10) @akehir (2019/07) |
-
-:heart: = Link to support the contributor directly
+| TypeScript | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @nicokoenig (2018/09) @topce (2018/10) |

 ### [6.3 - History of OpenAPI Generator](#table-of-contents)

@@ -920,14 +732,14 @@ OpenAPI Generator is a fork of [Swagger Codegen](https://github.com/swagger-api/
 - [Daiki Matsudate](https://github.com/d-date)
 - [Daniel](https://github.com/Danielku15)
 - [Emiliano Bonassi](https://github.com/emilianobonassi)
- [Erik Timmers](https://github.com/eriktim)
+- [Erik Timmers](https://github.com/trenneman)
 - [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)
 - [Jim Schubert](https://github.com/jimschubert)
 - [Jon Schoning](https://github.com/jonschoning)
- [Jérémie Bresson](https://github.com/jmini) [:heart:](https://www.patreon.com/jmini)
+- [Jérémie Bresson](https://github.com/jmini)
 - [Jörn Ahrens](https://github.com/jayearn)
 - [Keni Steward](https://github.com/kenisteward)
 - [Marcin Stefaniuk](https://github.com/mstefaniuk)
@@ -950,7 +762,7 @@ OpenAPI Generator is a fork of [Swagger Codegen](https://github.com/swagger-api/
 - [Vlad Frolov](https://github.com/frol)
 - [Vladimir Pouzanov](https://github.com/farcaller)
 - [William Cheng](https://github.com/wing328)
- [Xin Meng](https://github.com/xmeng1) [:heart:](https://www.patreon.com/user/overview?u=16435385)
+- [Xin Meng](https://github.com/xmeng1)
 - [Xu Hui Hui](https://github.com/xhh)
 - [antihax](https://github.com/antihax)
 - [beatcracker](https://github.com/beatcracker)
@@ -959,7 +771,6 @@ OpenAPI Generator is a fork of [Swagger Codegen](https://github.com/swagger-api/
 - [jfiala](https://github.com/jfiala)
 - [lukoyanov](https://github.com/lukoyanov)

-:heart: = Link to support the contributor directly

 ## [7 - License](#table-of-contents)
 -------
@@ -969,7 +780,7 @@ Copyright 2018 SmartBear Software

 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 [apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
+You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](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,
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 # for CI with appveyor.yml
 # Ref: http://www.yegor256.com/2015/01/10/windows-appveyor-maven.html
 version: '{branch}-{build}'
-image: Visual Studio 2017
+os: Windows Server 2012
 hosts:
  petstore.swagger.io: 127.0.0.1
 install:
@@ -14,30 +14,18 @@ install:
        )
        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
      }
-  # install gradle
-  - ps: |
-      Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\gradle" )) {
-        (new-object System.Net.WebClient).DownloadFile(
-          'https://services.gradle.org/distributions/gradle-5.3.1-bin.zip',
-          'C:\gradle-bin.zip'
-        )
-        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\gradle-bin.zip", "C:\gradle")
-      }
-  - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;C:\gradle\gradle-5.3.1\bin;%JAVA_HOME%\bin;%PATH%
-  - cmd: SET MAVEN_OPTS=-Xmx4g
-  - cmd: SET JAVA_OPTS=-Xmx4g
+  - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH%
+  - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
+  - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
  - cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
  - cmd: java -version
-  - cmd: gradle -v
  - cmd: dir/w
  - git clone https://github.com/wing328/swagger-samples
  - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"
 build_script:
-  - dotnet --info
-  # 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 (refactor)
+  - nuget restore samples\client\petstore\csharp-refactor\OpenAPIClient\Org.OpenAPITools.sln
+  - msbuild samples\client\petstore\csharp-refactor\OpenAPIClient\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
  # 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"
@@ -49,18 +37,15 @@ build_script:
  - msbuild samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
  # install openapi-generator locally
  - mvn clean install --quiet
-  # run the locally installed openapi-generator-gradle-plugin
-  - gradle -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --info
 test_script:
  # restore test-related files
  - copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  # test c# API client (netcore)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  # test c# API client (refactor)
+  - nunit-console samples\client\petstore\csharp-refactor\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
  # 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
+  - nunit-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)
-  - nunit3-console samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
+  - nunit-console samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor

  # generate all petstore clients
  - .\bin\windows\run-all-petstore.cmd
@@ -70,5 +55,4 @@ test_script:

 cache:
  - C:\maven\
-  - C:\gradle\
  - C:\Users\appveyor\.m2
--- a/bin/ada-petstore.sh
+++ b/bin/ada-petstore.sh
@@ -26,11 +26,11 @@ then
 fi

 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 model="modules/openapi-generator/src/test/resources/2_0/petstore.yaml"
 ags="generate --template-dir modules/openapi-generator/src/main/resources/Ada -g ada $@"
 ags="$ags -i $model -t modules/openapi-generator/src/main/resources/Ada -o samples/client/petstore/ada"
-ags="$ags --additional-properties projectName=Petstore --model-package Samples.Petstore"
+ags="$ags -DprojectName=Petstore --model-package Samples.Petstore"

 java $JAVA_OPTS -jar $executable $ags
 rm -rf  samples/client/petstore/ada/src/server
--- a/bin/android-petstore-httpclient.sh
+++ b/bin/android-petstore-httpclient.sh
@@ -26,7 +26,7 @@ then
 fi

 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/android -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g android --additional-properties library=httpclient -o samples/client/petstore/android/httpclient $@"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t modules/openapi-generator/src/main/resources/android -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g android -Dlibrary=httpclient -o samples/client/petstore/android/httpclient $@"

 java $JAVA_OPTS -jar $executable $ags
--- a/bin/android-petstore-volley.sh
+++ b/bin/android-petstore-volley.sh
@@ -26,7 +26,7 @@ then
 fi

 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g android -c bin/android-petstore-volley.json -o samples/client/petstore/android/volley $@"

 java $JAVA_OPTS -jar $executable $ags
--- a/bin/apache2-petstore-config.sh
+++ b/bin/apache2-petstore-config.sh
@@ -26,7 +26,7 @@ then
 fi

 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="generate -g apache2 -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -o samples/config/petstore/apache2 $@"

 java $JAVA_OPTS -jar $executable $ags
--- a/bin/apex-petstore.sh
+++ b/bin/apex-petstore.sh
@@ -26,7 +26,7 @@ then
 fi

 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="generate -t modules/openapi-generator/src/main/resources/apex -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g apex -o samples/client/petstore/apex $@"

 java $JAVA_OPTS -jar $executable $ags
--- a/bin/asciidoc-documentation-petstore.sh
+++ b/bin/asciidoc-documentation-petstore.sh
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=$(ls -ld "$SCRIPT")
-  link=$(expr "$ls" : '.*-> \(.*\)$')
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=$(dirname "$SCRIPT")/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=$(dirname "$SCRIPT")/..
-  APP_DIR=$(cd "${APP_DIR}"; pwd)
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn clean package
-fi
-
-# if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/openapi-generator/src/main/resources/asciidoc-documentation  --additional-properties=specDir=modules/openapi-generator/src/main/resources/asciidoc-documentation,snippetDir=. -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g asciidoc -o samples/documentation/asciidoc"
-
-java ${JAVA_OPTS} -jar ${executable} ${ags}
--- a/bin/aspnetcore-petstore-server.sh
+++ b/bin/aspnetcore-petstore-server.sh
@@ -26,7 +26,7 @@ then
 fi

 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -g aspnetcore -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -t modules/openapi-generator/src/main/resources/aspnetcore/2.1/ -o samples/server/petstore/aspnetcore --additional-properties packageGuid={3C799344-F285-4669-8FD5-7ED9B795D5C5} $@"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -g aspnetcore -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/aspnetcore --additional-properties packageGuid={3C799344-F285-4669-8FD5-7ED9B795D5C5} $@"

 java $JAVA_OPTS -jar $executable $ags
--- a/bin/bash-petstore.sh
+++ b/bin/bash-petstore.sh
@@ -26,7 +26,7 @@ then
 fi

 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 args="generate -t modules/openapi-generator/src/main/resources/bash -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g bash -o samples/client/petstore/bash -c modules/openapi-generator/src/test/resources/2_0/bash-config.json --additional-properties hideGenerationTimestamp=true $@"

 java $JAVA_OPTS -jar $executable $args
--- a/bin/ci/apex-petstore.json
+++ b/bin/ci/apex-petstore.json
@@ -1,6 +0,0 @@
-{
-  "generatorName": "apex",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/client/petstore/apex",
-  "templateDir": "modules/openapi-generator/src/main/resources/apex"
-}
--- a/bin/ci/csharp-netcore-petstore-1.json
+++ b/bin/ci/csharp-netcore-petstore-1.json
@@ -1,11 +0,0 @@
-{
-  "generatorName": "csharp-netcore",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/csharp-netcore/OpenAPIClientCore",
-  "templateDir": "modules/openapi-generator/src/main/resources/csharp-netcore/",
-  "additionalProperties": {
-    "packageGuid": "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}",
-    "useCompareNetObjects": true,
-    "targetFramework": "netcoreapp2.0"
-  }
-}
--- a/bin/ci/csharp-netcore-petstore.json
+++ b/bin/ci/csharp-netcore-petstore.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "csharp-netcore",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/csharp-netcore/OpenAPIClient",
-  "templateDir": "modules/openapi-generator/src/main/resources/csharp-netcore/",
-  "additionalProperties": {
-    "packageGuid": "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}",
-    "useCompareNetObjects": true
-  }
-}
--- a/bin/ci/csharp-petstore.json
+++ b/bin/ci/csharp-petstore.json
@@ -1,8 +0,0 @@
-{
-  "generatorName": "csharp",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/csharp/OpenAPIClient",
-  "additionalProperties": {
-    "packageGuid": "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}"
-  }
-}
--- a/bin/ci/dart-flutter-petstore.json
+++ b/bin/ci/dart-flutter-petstore.json
@@ -1,11 +0,0 @@
-{
-  "generatorName": "dart",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/client/petstore/dart/flutter_petstore/openapi",
-  "templateDir": "modules/openapi-generator/src/main/resources/dart",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "browserClient": false,
-    "supportDart2": false
-  }
-}
--- a/bin/ci/dart-jaguar-petstore-1.json
+++ b/bin/ci/dart-jaguar-petstore-1.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "dart-jaguar",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/client/petstore/dart-jaguar/flutter_petstore/openapi",
-  "templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "pubName": "openapi"
-  }
-}
--- a/bin/ci/dart-jaguar-petstore-2.json
+++ b/bin/ci/dart-jaguar-petstore-2.json
@@ -1,11 +0,0 @@
-{
-  "generatorName": "dart-jaguar",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-proto.yaml",
-  "outputDir": "samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi",
-  "templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
-  "additionalProperties": {
-    "serialization": "proto",
-    "hideGenerationTimestamp": true,
-    "pubName": "openapi"
-  }
-}
--- a/bin/ci/dart-jaguar-petstore-3.json
+++ b/bin/ci/dart-jaguar-petstore-3.json
@@ -1,11 +0,0 @@
-{
-  "generatorName": "dart-jaguar",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-proto.yaml",
-  "outputDir": "samples/client/petstore/dart-jaguar/openapi_proto",
-  "templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
-  "additionalProperties": {
-    "serialization": "proto",
-    "hideGenerationTimestamp": true,
-    "pubName": "openapi"
-  }
-}
--- a/bin/ci/dart-jaguar-petstore.json
+++ b/bin/ci/dart-jaguar-petstore.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "dart-jaguar",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/client/petstore/dart-jaguar/openapi",
-  "templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "pubName": "openapi"
-  }
-}
--- a/bin/ci/dart-petstore-flutter.json
+++ b/bin/ci/dart-petstore-flutter.json
@@ -1,11 +0,0 @@
-{
-  "generatorName": "dart",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/client/petstore/dart/flutter_petstore/openapi",
-  "templateDir": "modules/openapi-generator/src/main/resources/dart",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "browserClient": false,
-    "supportDart2": false
-  }
-}
--- a/bin/ci/dart-petstore-openapi-browser-client.json
+++ b/bin/ci/dart-petstore-openapi-browser-client.json
@@ -1,11 +0,0 @@
-{
-  "generatorName": "dart",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/client/petstore/dart/openapi-browser-client",
-  "templateDir": "modules/openapi-generator/src/main/resources/dart",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "browserClient": true,
-    "supportDart2": false
-  }
-}
--- a/bin/ci/dart-petstore.json
+++ b/bin/ci/dart-petstore.json
@@ -1,11 +0,0 @@
-{
-  "generatorName": "dart",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/client/petstore/dart/openapi",
-  "templateDir": "modules/openapi-generator/src/main/resources/dart",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "browserClient": false,
-    "supportDart2": false
-  }
-}
--- a/bin/ci/dart2-petstore.json
+++ b/bin/ci/dart2-petstore.json
@@ -1,9 +0,0 @@
-{
-  "generatorName": "dart",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/client/petstore/dart2/openapi",
-  "templateDir": "modules/openapi-generator/src/main/resources/dart2",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/elixir-petstore.json
+++ b/bin/ci/elixir-petstore.json
@@ -1,9 +0,0 @@
-{
-  "generatorName": "elixir",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/elixir/",
-  "templateDir": "modules/openapi-generator/src/main/resources/elixir",
-  "additionalProperties": {
-    "invokerPackage": "OpenapiPetstore"
-  }
-}
--- a/bin/ci/go-gin-petstore-server.json
+++ b/bin/ci/go-gin-petstore-server.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "go-gin-server",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/go-gin-api-server",
-  "templateDir": "modules/openapi-generator/src/main/resources/go-gin-server",
-  "additionalProperties": {
-    "packageName": "petstoreserver",
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/go-petstore-withxml.json
+++ b/bin/ci/go-petstore-withxml.json
@@ -1,11 +0,0 @@
-{
-  "generatorName": "go",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/go/go-petstore-withXml",
-  "templateDir": "modules/openapi-generator/src/main/resources/go",
-  "additionalProperties": {
-    "packageName": "petstore",
-    "withXml": true,
-    "withGoCodegenComment": true
-  }
-}
--- a/bin/ci/go-petstore.json
+++ b/bin/ci/go-petstore.json
@@ -1,9 +0,0 @@
-{
-  "generatorName": "go",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/go/go-petstore",
-  "templateDir": "modules/openapi-generator/src/main/resources/go",
-  "additionalProperties": {
-    "packageName": "petstore"
-  }
-}
--- a/bin/ci/groovy-petstore.json
+++ b/bin/ci/groovy-petstore.json
@@ -1,9 +0,0 @@
-{
-  "generatorName": "groovy",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/client/petstore/groovy",
-  "templateDir": "modules/openapi-generator/src/main/resources/Groovy/",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/haskell-http-client-petstore.json
+++ b/bin/ci/haskell-http-client-petstore.json
@@ -1,6 +0,0 @@
-{
-  "generatorName": "haskell-http-client",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/haskell-http-client",
-  "templateDir": "modules/openapi-generator/src/main/resources/haskell-http-client"
-}
--- a/bin/ci/java-feign.json
+++ b/bin/ci/java-feign.json
@@ -1,11 +0,0 @@
-{
-  "!include": "bin/java-petstore-feign-9x.json",
-  "generatorName": "java",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/java/feign",
-  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/feign",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "booleanGetterPrefix": "is"
-  }
-}
--- a/bin/ci/java-feign10x.json
+++ b/bin/ci/java-feign10x.json
@@ -1,11 +0,0 @@
-{
-  "!include": "bin/java-petstore-feign-10x.json",
-  "generatorName": "java",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/java/feign10x",
-  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/feign",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "booleanGetterPrefix": "is"
-  }
-}
--- a/bin/ci/java-google-api-client.json
+++ b/bin/ci/java-google-api-client.json
@@ -1,10 +0,0 @@
-{
-  "!include": "bin/java-petstore-google-api-client.json",
-  "generatorName": "java",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/java/google-api-client",
-  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/google-api-client",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-jaxrs-cxf-annotated-base-path.json
+++ b/bin/ci/java-jaxrs-cxf-annotated-base-path.json
@@ -1,12 +0,0 @@
-{
-  "artifactId": "cxf-annotated-basepath",
-  "generatorName": "jaxrs-cxf",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-cxf-annotated-base-path",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "useAnnotatedBasePath": true,
-    "serverPort": "8082"
-  }
-}
--- a/bin/ci/java-jaxrs-cxf-cdi.json
+++ b/bin/ci/java-jaxrs-cxf-cdi.json
@@ -1,9 +0,0 @@
-{
-  "generatorName": "jaxrs-cxf-cdi",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-cxf-cdi",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-jaxrs-cxf-non-spring-app.json
+++ b/bin/ci/java-jaxrs-cxf-non-spring-app.json
@@ -1,12 +0,0 @@
-{
-  "artifactId": "cxf-server-non-spring",
-  "generatorName": "jaxrs-cxf",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-cxf-non-spring-app",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "generateNonSpringApplication": true,
-    "serverPort": "8082"
-  }
-}
--- a/bin/ci/java-jaxrs-cxf.json
+++ b/bin/ci/java-jaxrs-cxf.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "jaxrs-cxf",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-cxf",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "serverPort": "8082"
-  }
-}
--- a/bin/ci/java-jaxrs-datelib-j8.json
+++ b/bin/ci/java-jaxrs-datelib-j8.json
@@ -1,11 +0,0 @@
-{
-  "!include": "./bin/jaxrs-datelib-j8.json",
-  "generatorName": "jaxrs-jersey",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-datelib-j8/",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "serverPort": "8082"
-  }
-}
--- a/bin/ci/java-jaxrs-jersey.json
+++ b/bin/ci/java-jaxrs-jersey.json
@@ -1,10 +0,0 @@
-{
-  "artifactId": "openapiv3-jaxrs-jersey-petstore-server",
-  "generatorName": "jaxrs-jersey",
-  "inputSpec": "modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-jersey",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-jaxrs-jersey1-useTags.json
+++ b/bin/ci/java-jaxrs-jersey1-useTags.json
@@ -1,13 +0,0 @@
-{
-  "artifactId": "jaxrs-jersey1-useTags",
-  "generatorName": "jaxrs-jersey",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "library": "jersey1",
-  "outputDir": "samples/server/petstore/jaxrs/jersey1-useTags",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "serverPort": "8082",
-    "useTags": true
-  }
-}
--- a/bin/ci/java-jaxrs-jersey1.json
+++ b/bin/ci/java-jaxrs-jersey1.json
@@ -1,12 +0,0 @@
-{
-  "artifactId": "jaxrs-jersey1-server",
-  "generatorName": "jaxrs-jersey",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "library": "jersey1",
-  "outputDir": "samples/server/petstore/jaxrs/jersey1",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "serverPort": "8082"
-  }
-}
--- a/bin/ci/java-jaxrs-jersey2-useTags.json
+++ b/bin/ci/java-jaxrs-jersey2-useTags.json
@@ -1,12 +0,0 @@
-{
-  "artifactId": "jaxrs-jersey2-useTags",
-  "generatorName": "jaxrs-jersey",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/server/petstore/jaxrs/jersey2-useTags",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "serverPort": "8082",
-    "useTags": true
-  }
-}
--- a/bin/ci/java-jaxrs-jersey2.json
+++ b/bin/ci/java-jaxrs-jersey2.json
@@ -1,11 +0,0 @@
-{
-  "artifactId": "jaxrs-jersey-petstore-server",
-  "generatorName": "jaxrs-jersey",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/server/petstore/jaxrs/jersey2",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "serverPort": "8082"
-  }
-}
--- a/bin/ci/java-jaxrs-resteasy-eap-java8-server.json
+++ b/bin/ci/java-jaxrs-resteasy-eap-java8-server.json
@@ -1,11 +0,0 @@
-{
-  "!include": "./bin/jaxrs-resteasy-eap-java8-petstore-server.json",
-  "artifactId": "jaxrs-resteasy-eap-java8-server",
-  "generatorName": "jaxrs-resteasy-eap",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-resteasy/eap-java8",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-jaxrs-resteasy-eap-joda-server.json
+++ b/bin/ci/java-jaxrs-resteasy-eap-joda-server.json
@@ -1,11 +0,0 @@
-{
-  "!include": "./bin/jaxrs-resteasy-eap-joda-petstore-server.json",
-  "artifactId": "jaxrs-resteasy-eap-joda-server",
-  "generatorName": "jaxrs-resteasy-eap",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-resteasy/eap-joda",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-jaxrs-resteasy-eap.json
+++ b/bin/ci/java-jaxrs-resteasy-eap.json
@@ -1,9 +0,0 @@
-{
-  "generatorName": "jaxrs-resteasy-eap",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-resteasy/eap",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-jaxrs-resteasy-joda-server.json
+++ b/bin/ci/java-jaxrs-resteasy-joda-server.json
@@ -1,11 +0,0 @@
-{
-  "!include": "./bin/jaxrs-resteasy-joda-petstore-server.json",
-  "artifactId": "jaxrs-resteasy-joda-server",
-  "generatorName": "jaxrs-resteasy",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-resteasy/joda",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-jaxrs-resteasy.json
+++ b/bin/ci/java-jaxrs-resteasy.json
@@ -1,9 +0,0 @@
-{
-  "generatorName": "jaxrs-resteasy",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-resteasy/default",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-jaxrs-spec-interface.json
+++ b/bin/ci/java-jaxrs-spec-interface.json
@@ -1,11 +0,0 @@
-{
-  "artifactId": "jaxrs-spec-interface-petstore-server",
-  "generatorName": "jaxrs-spec",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-spec-interface",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "serializableModel": true,
-    "interfaceOnly": true
-  }
-}
--- a/bin/ci/java-jaxrs-spec.json
+++ b/bin/ci/java-jaxrs-spec.json
@@ -1,10 +0,0 @@
-{
-  "artifactId": "jaxrs-spec-petstore-server",
-  "generatorName": "jaxrs-spec",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/server/petstore/jaxrs-spec",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "serializableModel": true
-  }
-}
--- a/bin/ci/java-jersey1.json
+++ b/bin/ci/java-jersey1.json
@@ -1,11 +0,0 @@
-{
-  "artifactId": "petstore-java-client-jersey1",
-  "generatorName": "java",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "library": "jersey1",
-  "outputDir": "samples/client/petstore/java/jersey1",
-  "templateDir": "modules/openapi-generator/src/main/resources/Java",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-jersey2-java6.json
+++ b/bin/ci/java-jersey2-java6.json
@@ -1,12 +0,0 @@
-{
-  "!include": "bin/java-petstore-jersey2.json",
-  "artifactId": "petstore-jersey2-java6",
-  "generatorName": "java",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/java/jersey2-java6",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "supportJava6": true,
-    "booleanGetterPrefix": "is"
-  }
-}
--- a/bin/ci/java-jersey2-java8.json
+++ b/bin/ci/java-jersey2-java8.json
@@ -1,11 +0,0 @@
-{
-  "!include": "bin/java8-petstore-jersey2.json",
-  "artifactId": "petstore-jersey2-java8",
-  "generatorName": "java",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/java/jersey2-java8",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "serverPort": "8082"
-  }
-}
--- a/bin/ci/java-jersey2.json
+++ b/bin/ci/java-jersey2.json
@@ -1,9 +0,0 @@
-{
-  "!include": "bin/java-petstore-jersey2.json",
-  "generatorName": "java",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/java/jersey2",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-msf4j-petstore-server.json
+++ b/bin/ci/java-msf4j-petstore-server.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "java-msf4j",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/server/petstore/java-msf4j/",
-  "templateDir": "modules/openapi-generator/src/main/resources/java-msf4j-server",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "artifactId": "java-msf4j-server"
-  }
-}
--- a/bin/ci/java-native.json
+++ b/bin/ci/java-native.json
@@ -1,10 +0,0 @@
-{
-  "!include": "bin/java-petstore-native.json",
-  "generatorName": "java",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/java/native",
-  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/native",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-okhttp-gson-parcelableModel.json
+++ b/bin/ci/java-okhttp-gson-parcelableModel.json
@@ -1,12 +0,0 @@
-{
-  "!include": "bin/java-petstore-okhttp-gson.json",
-  "artifactId": "petstore-okhttp-gson-parcelableModel",
-  "generatorName": "java",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/java/okhttp-gson-parcelableModel",
-  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "parcelableModel": true
-  }
-}
--- a/bin/ci/java-okhttp-gson.json
+++ b/bin/ci/java-okhttp-gson.json
@@ -1,10 +0,0 @@
-{
-  "!include": "bin/java-petstore-okhttp-gson.json",
-  "generatorName": "java",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/client/petstore/java/okhttp-gson",
-  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-petstore-feign-10x.json
+++ b/bin/ci/java-petstore-feign-10x.json
@@ -1,11 +0,0 @@
-{
-  "generatorName": "java",
-  "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/libraries/feign",
-  "outputDir": "samples/client/petstore/java/feign10x",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "booleanGetterPrefix": "is"
-  },
-  "!include": "bin/java-petstore-feign-10x.json"
-}
--- a/bin/ci/java-play-framework-api-package-override.json
+++ b/bin/ci/java-play-framework-api-package-override.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "java-play-framework",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/java-play-framework-api-package-override",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "apiPackage": "com.puppies.store.apis"
-  }
-}
--- a/bin/ci/java-play-framework-async.json
+++ b/bin/ci/java-play-framework-async.json
@@ -1,10 +0,0 @@
-{
-  "!include": "bin/java-play-framework-petstore-server-async.json",
-  "generatorName": "java-play-framework",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/java-play-framework-async",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-play-framework-controller-only.json
+++ b/bin/ci/java-play-framework-controller-only.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "java-play-framework",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/java-play-framework-controller-only",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "controllerOnly": true
-  }
-}
--- a/bin/ci/java-play-framework-fake-endpoints.json
+++ b/bin/ci/java-play-framework-fake-endpoints.json
@@ -1,9 +0,0 @@
-{
-  "generatorName": "java-play-framework",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
-  "outputDir": "samples/server/petstore/java-play-framework-fake-endpoints",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true
-  }
-}
--- a/bin/ci/java-play-framework-no-bean-validation.json
+++ b/bin/ci/java-play-framework-no-bean-validation.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "java-play-framework",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/java-play-framework-no-bean-validation",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "useBeanValidation": false
-  }
-}
--- a/bin/ci/java-play-framework-no-exception-handling.json
+++ b/bin/ci/java-play-framework-no-exception-handling.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "java-play-framework",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/java-play-framework-no-exception-handling",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "handleExceptions": false
-  }
-}
--- a/bin/ci/java-play-framework-no-interface.json
+++ b/bin/ci/java-play-framework-no-interface.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "java-play-framework",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/java-play-framework-no-interface",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "useInterfaces": false
-  }
-}
--- a/bin/ci/java-play-framework-no-swagger-ui.json
+++ b/bin/ci/java-play-framework-no-swagger-ui.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "java-play-framework",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/java-play-framework-no-swagger-ui",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "useSwaggerUI": false
-  }
-}
--- a/bin/ci/java-play-framework-no-wrap-calls.json
+++ b/bin/ci/java-play-framework-no-wrap-calls.json
@@ -1,10 +0,0 @@
-{
-  "generatorName": "java-play-framework",
-  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
-  "outputDir": "samples/server/petstore/java-play-framework-no-wrap-calls",
-  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
-  "additionalProperties": {
-    "hideGenerationTimestamp": true,
-    "wrapCalls": false
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
William Cheng	de2923f7a2	update travis config	2018-12-31 17:10:47 +08:00
William Cheng	aa58a167ab	4.0.0-beta release	2018-12-31 17:09:25 +08:00