Merge remote-tracking branch 'origin/master' into fix-release2

Revert "v6.5.0 portal release"
This reverts commit 8a91858df5.
2023-07-07 08:43:13 +08:00 · 2023-04-01 21:14:20 +08:00 · 2023-04-01 21:14:14 +08:00 · 2023-04-01 21:13:59 +08:00 · 2023-04-01 19:00:42 +08:00 · 2023-04-01 16:24:37 +08:00
5041 changed files with 37976 additions and 219931 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,18 +38,9 @@ commands: # a reusable command with parameters
      - run:
          command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; '
      - run:
-          command: |
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       path.v1.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       path.v2.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.111     path.v3.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       operation.v1.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       operation.v2.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.111     operation.v3.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       server.v1.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       server.v2.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.111     server.v3.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       petstore.swagger.io"
-            cat /etc/hosts
+          command: |-
+            printf '127.0.0.1       petstore.swagger.io
+            ' | sudo tee -a /etc/hosts
      #    - run: docker pull openapitools/openapi-petstore
      #    - run: docker run -d -e OPENAPI_BASE_PATH=/v3 -e DISABLE_API_KEY=1 -e DISABLE_OAUTH=1 -p 80:8080 openapitools/openapi-petstore
      - run: docker pull swaggerapi/petstore
@@ -204,8 +195,8 @@ jobs:
      - command_build_and_test:
          nodeNo: "3"
  node4:
-    machine:
-      image: ubuntu-2004:202201-02
+    docker:
+      - image: fkrull/multi-python
    working_directory: ~/OpenAPITools/openapi-generator
    shell: /bin/bash --login
    environment:
@@ -215,7 +206,7 @@ jobs:
      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
    steps:
      - checkout
-      - command_build_and_test:
+      - command_docker_build_and_test:
          nodeNo: "4"
 workflows:
  version: 2
--- a/.github/.test/samples.json
+++ b/.github/.test/samples.json
@@ -800,6 +800,12 @@
        "Client: Python"
      ]
    },
+    {
+      "input": "python-server-flask-petstore-python2.sh",
+      "matches": [
+        "Server: Python"
+      ]
+    },
    {
      "input": "python-server-flask-petstore.sh",
      "matches": [
--- a/.github/workflows/linux.yaml
+++ b/.github/workflows/linux.yaml
@@ -45,7 +45,7 @@ jobs:
            ${{ runner.os }}-gradle-

      - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.9.0
+        uses: s4u/setup-maven-action@v1.8.0
        with:
          java-version: ${{ matrix.java }}
          maven-version: 3.8.8
@@ -87,7 +87,7 @@ jobs:
      - name: Check out code
        uses: actions/checkout@v3
      - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.9.0
+        uses: s4u/setup-maven-action@v1.8.0
        with:
          java-version: 11
          maven-version: 3.8.8
--- a/.github/workflows/samples-dart.yaml
+++ b/.github/workflows/samples-dart.yaml
@@ -22,14 +22,22 @@ jobs:
        with:
          distribution: 'temurin'
          java-version: 11
-          cache: maven
+      - name: Cache maven dependencies
+        uses: actions/cache@v3
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.m2/repository
+            ~/.gradle
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
      - name: Cache test dependencies
        uses: actions/cache@v3
        env:
          cache-name: pub-cache
        with:
          path: $PUB_CACHE
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('samples/**/pubspec.*') }}
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('samples/**/pubspec.yaml') }}
      - uses: dart-lang/setup-dart@v1
        with:
          sdk: 2.15.0
--- a/.github/workflows/samples-dotnet6-client-echo-api.yaml
+++ b/.github/workflows/samples-dotnet6-client-echo-api.yaml
@@ -1,31 +0,0 @@
-name: Samples C# .Net 6
-
-on:
-  push:
-    paths:
-      - samples/client/echo_api/csharp-restsharp/**
-  pull_request:
-    paths:
-      - samples/client/echo_api/csharp-restsharp/**
-jobs:
-  build:
-    name: Build .Net clients
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/client/echo_api/csharp-restsharp/
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v3.2.0
-        with:
-          dotnet-version: '6.0.x'
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: dotnet build Org.OpenAPITools.sln
--- a/.github/workflows/samples-dotnet6-client.yaml
+++ b/.github/workflows/samples-dotnet6-client.yaml
@@ -20,8 +20,6 @@ on:
      - samples/client/petstore/csharp/OpenAPIClient-net5.0/**
      # build C# API client (.net 5.0 with ConditionalSerialization)
      - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
-      # build C# API client (property, parameter name mappings)
-      - samples/client/petstore/csharp-restsharp-name-parameter-mappings/**
  pull_request:
    paths:
      # build C# API client (multiple frameworks)
@@ -41,8 +39,6 @@ on:
      - samples/client/petstore/csharp/OpenAPIClient-net5.0/**
      # build C# API client (.net 5.0 with ConditionalSerialization)
      - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
-      # build C# API client (property, parameter name mappings)
-      - samples/client/petstore/csharp-restsharp-name-parameter-mappings/**
 jobs:
  build:
    name: Build .Net clients
@@ -69,8 +65,6 @@ jobs:
          - samples/client/petstore/csharp/OpenAPIClient-net5.0/
          # build C# API client (.net 5.0 with ConditionalSerialization)
          - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/
-          # build C# API client (property, parameter name mappings)
-          - samples/client/petstore/csharp-restsharp-name-parameter-mappings
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-dotnet@v3.2.0
--- a/.github/workflows/samples-haskell.yaml
+++ b/.github/workflows/samples-haskell.yaml
@@ -1,36 +0,0 @@
-name: Samples Haskell
-
-on:
-  push:
-    paths:
-      - samples/server/petstore/haskell-yesod/**
-      - samples/server/petstore/haskell-servant/**
-      - samples/client/petstore/haskell-http-client/**
-  pull_request:
-    paths:
-      - samples/server/petstore/haskell-yesod/**
-      - samples/server/petstore/haskell-servant/**
-      - samples/client/petstore/haskell-http-client/**
-jobs:
-  build:
-    name: Build stack projects
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # servers
-          - samples/server/petstore/haskell-yesod/
-          - samples/server/petstore/haskell-servant/
-          - samples/client/petstore/haskell-http-client/
-    steps:
-      - uses: actions/checkout@v3
-      - uses: haskell/actions/setup@v2
-        with:
-          # ghc-version: '8.8.4' # Exact version of ghc to use
-          # cabal-version: 'latest'. Omitted, but defaults to 'latest'
-          enable-stack: true
-          stack-version: 'latest'
-      - name: stack test
-        working-directory: ${{ matrix.sample }}
-        run: stack test
--- a/.github/workflows/samples-java-client-jdk11.yaml
+++ b/.github/workflows/samples-java-client-jdk11.yaml
@@ -49,8 +49,6 @@ jobs:
          - samples/client/petstore/java/rest-assured-jackson
          - samples/client/petstore/java/microprofile-rest-client
          - samples/client/petstore/java/microprofile-rest-client-3.0
-          - samples/client/petstore/java/microprofile-rest-client-3.0-jackson
-          - samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml
          - samples/client/petstore/java/apache-httpclient
          - samples/client/petstore/java/feign
          - samples/client/petstore/java/jersey1
@@ -78,4 +76,4 @@ jobs:
          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
      - name: Build
        working-directory: ${{ matrix.sample }}
-        run: mvn clean package
+        run: mvn clean package
--- a/.github/workflows/samples-julia.yaml
+++ b/.github/workflows/samples-julia.yaml
@@ -1,41 +0,0 @@
-name: Samples Julia
-
-on:
-  push:
-    paths:
-      - 'samples/client/petstore/julia/**'
-      - 'samples/server/petstore/julia/**'
-  pull_request:
-    paths:
-      - 'samples/client/petstore/julia/**'
-      - 'samples/server/petstore/julia/**'
-
-jobs:
-  tests-julia:
-    name: Tests Julia
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: julia-actions/setup-julia@v1
-        with:
-          version: 1.8
-          arch: x64
-      - name: Test
-        shell: bash
-        working-directory: 'samples'
-        run: |
-          currdir=`pwd`
-          # Using a specific version of OpenAPI.jl helps avoid introducing version inter-dependencies
-          #   and allows breaking changes to be done in either repos independently
-          # Using develop mode to install package so that it is easier to modify the package test files
-          julia -e "using Pkg; Pkg.develop(\"OpenAPI\");"
-          cd ~/.julia/dev/OpenAPI
-          git checkout v0.1.14
-          cd $currdir
-          rm -rf ~/.julia/dev/OpenAPI/test/client/openapigenerator_petstore_v3/petstore
-          rm -rf ~/.julia/dev/OpenAPI/test/server/openapigenerator_petstore_v3/petstore
-          cp -r client/petstore/julia ~/.julia/dev/OpenAPI/test/client/openapigenerator_petstore_v3/petstore
-          cp -r server/petstore/julia ~/.julia/dev/OpenAPI/test/server/openapigenerator_petstore_v3/petstore
-          # setting this env runs only the tests relevant to the openapi-generator repo
-          export OPENAPI_GENERATOR=true
-          julia -e "using Pkg; Pkg.test(\"OpenAPI\");"
--- a/.github/workflows/samples-kotlin-client.yaml
+++ b/.github/workflows/samples-kotlin-client.yaml
@@ -4,11 +4,9 @@ on:
  push:
    branches:
      - 'samples/client/petstore/kotlin*/**'
-      - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'
  pull_request:
    paths:
      - 'samples/client/petstore/kotlin*/**'
-      - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'

 env:
  GRADLE_VERSION: 6.9
@@ -51,7 +49,6 @@ jobs:
          - samples/client/petstore/kotlin-array-simple-string-multiplatform
          - samples/client/petstore/kotlin-bigdecimal-default-multiplatform
          - samples/client/petstore/kotlin-bigdecimal-default-okhttp4
-          - samples/client/petstore/kotlin-jvm-jackson
          - samples/client/petstore/kotlin-jvm-ktor-jackson
          - samples/client/petstore/kotlin-jvm-ktor-gson
          - samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization
@@ -62,8 +59,6 @@ jobs:
          - samples/client/petstore/kotlin-jvm-spring-2-webclient
          - samples/client/petstore/kotlin-jvm-spring-3-webclient
          - samples/client/petstore/kotlin-spring-cloud
-          - samples/client/petstore/kotlin-name-parameter-mappings
-          - samples/client/others/kotlin-jvm-okhttp-parameter-tests
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-java@v3
--- a/.github/workflows/samples-kotlin-server-jdk17.yaml
+++ b/.github/workflows/samples-kotlin-server-jdk17.yaml
@@ -4,13 +4,9 @@ on:
  push:
    branches:
      - 'samples/server/petstore/kotlin-springboot-3*/**'
-      # comment out due to gradle build failure
-      # - samples/server/petstore/kotlin-spring-default/**
  pull_request:
    paths:
      - 'samples/server/petstore/kotlin-springboot-3*/**'
-      # comment out due to gradle build failure
-      # - samples/server/petstore/kotlin-spring-default/**

 env:
  GRADLE_VERSION: 7.4
@@ -25,8 +21,6 @@ jobs:
        sample:
          # server
          - samples/server/petstore/kotlin-springboot-3
-          # comment out due to gradle build failure
-          # - samples/server/petstore/kotlin-spring-default/
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-java@v3
--- a/.github/workflows/samples-kotlin-server.yaml
+++ b/.github/workflows/samples-kotlin-server.yaml
@@ -3,16 +3,10 @@ name: Samples Kotlin server
 on:
  push:
    branches:
-      - samples/server/others/kotlin-server/jaxrs-spec/**
      - 'samples/server/petstore/kotlin*/**'
-      # comment out due to gradle build failure
-      #- samples/server/petstore/kotlin-spring-default/**
  pull_request:
    paths:
-      - samples/server/others/kotlin-server/jaxrs-spec/**
      - 'samples/server/petstore/kotlin*/**'
-      # comment out due to gradle build failure
-      # - samples/server/petstore/kotlin-spring-default/**

 env:
  GRADLE_VERSION: 6.9
@@ -35,11 +29,7 @@ jobs:
          - samples/server/petstore/kotlin-springboot-springfox
          - samples/server/petstore/kotlin-server/ktor
          - samples/server/petstore/kotlin-server/jaxrs-spec
-          - samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
          - samples/server/petstore/kotlin-server-modelMutable
-          - samples/server/others/kotlin-server/jaxrs-spec
-          # comment out due to gradle build failure
-          #- samples/server/petstore/kotlin-spring-default
          # no build.gradle file
          #- samples/server/petstore/kotlin-vertx-modelMutable
    steps:
--- a/.github/workflows/samples-rust.yaml
+++ b/.github/workflows/samples-rust.yaml
@@ -3,14 +3,12 @@ name: Samples Rust
 on:
  push:
    paths:
-      - "samples/client/others/rust/**"
-      - "samples/server/petstore/rust-server/**"
-      - "samples/client/petstore/rust-server/**"
+      - 'samples/client/petstore/rust/**'
+      - 'samples/server/petstore/rust-server/**'
  pull_request:
    paths:
-      - "samples/client/others/rust/**"
-      - "samples/client/petstore/rust/**"
-      - "samples/server/petstore/rust-server/**"
+      - 'samples/client/petstore/rust/**'
+      - 'samples/server/petstore/rust-server/**'

 jobs:
  build:
@@ -21,7 +19,6 @@ jobs:
      matrix:
        sample:
          # these folders contain sub-projects of rust clients, servers
-          - samples/client/others/rust/
          - samples/client/petstore/rust/
          - samples/server/petstore/rust-server/
    steps:
--- a/.github/workflows/samples-scala.yaml
+++ b/.github/workflows/samples-scala.yaml
@@ -27,7 +27,6 @@ jobs:
          - samples/server/petstore/scala-lagom-server
          - samples/server/petstore/scala-play-server
          - samples/server/petstore/scala-akka-http-server
-          - samples/server/petstore/scala-pekko-http-server
          - samples/server/petstore/scalatra
          - samples/server/petstore/scala-finch # cannot be tested with jdk11
    steps:
--- a/.github/workflows/samples-spring-jdk17.yaml
+++ b/.github/workflows/samples-spring-jdk17.yaml
@@ -1,36 +0,0 @@
-name: Samples Java Spring (JDK17)
-
-on:
-  push:
-    paths:
-      - samples/openapi3/client/petstore/spring-cloud-3-with-optional
-  pull_request:
-    paths:
-      - samples/openapi3/client/petstore/spring-cloud-3-with-optional
-jobs:
-  build:
-    name: Build Java Spring (JDK17)
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/openapi3/client/petstore/spring-cloud-3-with-optional
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: 17
-      - name: Cache maven dependencies
-        uses: actions/cache@v3
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.m2
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: mvn clean package
--- a/.github/workflows/samples-spring.yaml
+++ b/.github/workflows/samples-spring.yaml
@@ -26,14 +26,13 @@ jobs:
          - samples/openapi3/client/petstore/spring-stubs-skip-default-interface
          - samples/openapi3/client/petstore/spring-cloud-async
          - samples/openapi3/client/petstore/spring-cloud-spring-pageable
-          - samples/client/petstore/spring-cloud-tags
+          - samples/openapi3/client/petstore/spring-cloud-3-with-optional.yaml
          # servers
          - samples/server/petstore/springboot
          - samples/openapi3/server/petstore/springboot
          - samples/server/petstore/springboot-beanvalidation
          - samples/server/petstore/springboot-useoptional
          - samples/server/petstore/springboot-reactive
-          - samples/server/petstore/springboot-reactive-noResponseEntity
          - samples/server/petstore/springboot-implicitHeaders
          - samples/openapi3/server/petstore/springboot-implicitHeaders
          - samples/server/petstore/springboot-delegate
@@ -48,6 +47,7 @@ jobs:
          - samples/server/petstore/springboot-spring-pageable-delegatePattern
          - samples/server/petstore/springboot-spring-pageable-without-j8
          - samples/server/petstore/springboot-spring-pageable
+          - samples/openapi3/client/petstore/spring-cloud-tags.yaml
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-java@v3
--- a/.github/workflows/samples-swift.yaml
+++ b/.github/workflows/samples-swift.yaml
@@ -1,50 +0,0 @@
-name: Samples Swift
-
-on:
-  push:
-    paths:
-      - samples/client/petstore/swift5/**
-  pull_request:
-    paths:
-      - samples/client/petstore/swift5/**
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest]
-        sample:
-          - samples/client/petstore/swift5/alamofireLibrary
-          - samples/client/petstore/swift5/anycodableLibrary
-          - samples/client/petstore/swift5/asyncAwaitLibrary
-          - samples/client/petstore/swift5/combineLibrary
-          - samples/client/petstore/swift5/default
-          - samples/client/petstore/swift5/deprecated
-          - samples/client/petstore/swift5/frozenEnums
-          - samples/client/petstore/swift5/nonPublicApi
-          - samples/client/petstore/swift5/objcCompatible
-          - samples/client/petstore/swift5/oneOf
-          - samples/client/petstore/swift5/promisekitLibrary
-          - samples/client/petstore/swift5/readonlyProperties
-          - samples/client/petstore/swift5/resultLibrary
-          - samples/client/petstore/swift5/rxswiftLibrary
-          - samples/client/petstore/swift5/urlsessionLibrary
-          - samples/client/petstore/swift5/validation
-          # NOTE: disabled as vaporLibrary doesnt build when adding this CI config
-          #- samples/client/petstore/swift5/vaporLibrary
-          - samples/client/petstore/swift5/x-swift-hashable
-        include:
-        - os: ubuntu-latest
-          sample: samples/client/petstore/swift5/alamofireLibrary
-    name: Build Swift samples
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: swift-actions/setup-swift@v1
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        with:
-          swift-version: '5'
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: swift build
--- a/.github/workflows/samples-zapier.yaml
+++ b/.github/workflows/samples-zapier.yaml
@@ -1,30 +0,0 @@
-name: Samples Zapier
-
-on:
-  push:
-    branches:
-      - 'samples/client/petstore/zapier/**'
-  pull_request:
-    paths:
-      - 'samples/client/petstore/zapier/**'
-
-jobs:
-  validate:
-    name: Test zapier generation
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          - samples/client/petstore/zapier
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup node
-      uses: actions/setup-node@v3
-    - name: Install dependencies
-      working-directory: ${{ matrix.sample }}
-      run: |
-        npm install
-    - name: Validate
-      working-directory: ${{ matrix.sample }}
-      run: node index.js
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -39,7 +39,7 @@ jobs:
            ${{ runner.os }}-build-${{ env.cache-name }}-
            ${{ runner.os }}-build-
      - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.9.0
+        uses: s4u/setup-maven-action@v1.8.0
        with:
          java-version: ${{ matrix.java }}
          maven-version: 3.8.8
--- a/.gitignore
+++ b/.gitignore
@@ -173,13 +173,14 @@ samples/client/petstore/csharp-refactor/OpenAPIClient/nuget.exe
 # Python
 *.pyc
 __pycache__
-.venv/
 samples/client/petstore/python/dev-requirements.txt.log
 samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt
 samples/client/petstore/python/.coverage
 samples/client/petstore/python/.projectile
+samples/client/petstore/python/.venv/
+samples/client/petstore/python-asyncio/.venv/
 samples/client/petstore/python-asyncio/.pytest_cache/
-
+samples/client/petstore/python-tornado/.venv/

 # PHP
 samples/client/petstore/php/OpenAPIClient-php/composer.lock
--- a/.travis.yml
+++ b/.travis.yml
@@ -136,7 +136,7 @@ script:
  # 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.
  # show "error" only to reduce the log size
-  - ./mvnw -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -DskipTests -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - ./mvnw -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -DskipTests -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error 2>&1 | grep -i error
 after_success:
  # push to maven repo
  - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
--- a/CI/circle_parallel.sh
+++ b/CI/circle_parallel.sh
@@ -9,6 +9,15 @@ set -e

 export NODE_ENV=test

+function cleanup {
+  # Show logs of 'petstore.swagger' container to troubleshoot Unit Test failures, if any.
+  if [ "$NODE_INDEX" != "4" ]; then
+    docker logs petstore.swagger # container name specified in circle.yml
+  fi
+}
+
+trap cleanup EXIT
+
 if [ "$NODE_INDEX" = "1" ]; then
  echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..."
  java -version
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se

 |                                  | Languages/Frameworks                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | -------------------------------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient 4.x, Apache HttpClient 5.x, Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **Jetbrains HTTP Client**, **Julia**, **k6**, **Kotlin**, **Lua**, **N4JS**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (9.x - 16.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs), **XoJo**, **Zapier** |
+| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient 4.x, Apache HttpClient 5.x, Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **Jetbrains HTTP Client**, **Julia**, **k6**, **Kotlin**, **Lua**, **N4JS**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (9.x - 16.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs), **XoJo** |
 | **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/), [Helidon](https://helidon.io/)), **Julia**, **Kotlin** (Spring Boot, [Ktor](https://github.com/ktorio/ktor), [Vert.x](https://vertx.io/)), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                                                                               |
 | **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
@@ -115,16 +115,13 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20

 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 7.0.1 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.0.1-SNAPSHOT/) | 08.09.2023   | Patch release (enhancements, bug fixes, etc)      |
-| [7.0.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.0.0) (latest stable release)                                                    | 25.08.2023   | Major release with breaking changes (no fallback) |
-| [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)                                                    | 11.05.2023   | Minor release with breaking changes (with fallback) |
+| 7.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.0.0-SNAPSHOT/) | May/Jun 2023   | Major release with breaking changes (no fallback) |
+| [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0) (latest stable release)                                                    | 11.05.2023   | Minor release with breaking changes (with fallback) |
 | [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0)                                                    | 31.01.2022   | Minor release with breaking changes (with fallback) |
 | [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |

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

-(We do not publish daily/nightly build. Please use SNAPSHOT instead)
-
 For old releases, please refer to the [**Release**](https://github.com/OpenAPITools/openapi-generator/releases) page.

 For decomissioned generators/libraries/frameworks, please refer to [the "Decommission" label](https://github.com/OpenAPITools/openapi-generator/issues?q=label%3ADecommission+is%3Amerged+) in the pull request page.
@@ -179,16 +176,16 @@ See the different versions of the [openapi-generator-cli](https://search.maven.o
 <!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 11 runtime at a minimum):

-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.0/openapi-generator-cli-7.0.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.6.0/openapi-generator-cli-6.6.0.jar`

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

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

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

 ```sh
-openapi-generator-cli version-manager set 7.0.0
+openapi-generator-cli version-manager set 6.6.0
 ```

 Or install it as dev-dependency:
@@ -447,7 +444,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
 (if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`)

 <!-- RELEASE_VERSION -->
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.0/openapi-generator-cli-7.0.0.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.6.0/openapi-generator-cli-6.6.0.jar)
 <!-- /RELEASE_VERSION -->

 To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`
@@ -651,7 +648,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Klarna](https://www.klarna.com/)
 - [Kronsoft Development](https://www.kronsoft.ro/home/)
 - [Kubernetes](https://kubernetes.io)
- [Landeshauptstadt München - it@M](https://muenchen.digital/it-at-m/)
 - [Linode](https://www.linode.com/)
 - [Logicdrop](https://www.logicdrop.com)
 - [Lumeris](https://www.lumeris.com)
@@ -909,8 +905,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2023-04-27 - [Create an Angular Client using OpenAPI Specifications](Create an Angular Client using OpenAPI Specifications) by [Patric](https://pguso.medium.com/)
 - 2023-05-16 - [Adyen for Java developers](https://www.adyen.com/blog/adyen-java-library) by [Beppe Catanese, Developer Advocate, Adyen](https://github.com/gcatanese)
 - 2023-05-18 - [如何基于 Swagger 使用 OpenAPI Generator 生成 JMeter 脚本？](https://blog.51cto.com/u_15181572/6294974) by [高楼（Zee)](https://blog.51cto.com/u_15181572)
- 2023-06-28 - [Generate API contract using OpenAPI Generator Maven plugin](https://huongdanjava.com/generate-api-contract-using-openapi-generator-maven-plugin.html) by [Khanh Nguyen](https://huongdanjava.com/)
- 2023-06-30 - [Generate Client SDKs with OpenApi Generator in Springboot](https://medium.com/@ramavathvinayak/generate-client-sdks-with-openapi-generator-in-springboot-f9f012e73c0b) by [Vinayak Ramavath](https://medium.com/@ramavathvinayak)

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

@@ -1030,7 +1024,6 @@ Here is a list of template creators:
   * TypeScript (Rxjs): @denyo
   * TypeScript (redux-query): @petejohansonxo
   * Xojo: @Topheee
-   * Zapier: @valmoz, @emajo
 * Server Stubs
   * Ada: @stcarrez
   * C# ASP.NET 5: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
@@ -1140,7 +1133,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Bash                  | @frol (2017/07) @bkryza (2017/08) @kenjones-cisco (2017/09)                                                                                                                                                                                           |
 | C                     | @zhemant (2018/11) @ityuhui (2019/12) @michelealbano (2020/03)                                                                                                                                                                                        |
 | C++                   | @ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @martindelille (2018/03) @muttleyxd (2019/08)                                                                                                                                         |
-| C#                    | @mandrean (2017/08) @shibayan (2020/02) @Blackclaws (2021/03) @lucamazzanti (2021/05) @iBicha (2023/07)                                                                                                                                          |
+| C#                    | @mandrean (2017/08) @frankyjuang (2019/09) @shibayan (2020/02) @Blackclaws (2021/03) @lucamazzanti (2021/05)                                                                                                                                          |
 | Clojure               |                                                                                                                                                                                                                                                       |
 | Crystal               | @cyangle (2021/01)                                                                                                                                                                                                                                    |
 | Dart                  | @jaumard (2018/09) @josh-burton (2019/12) @amondnet (2019/12) @sbu-WBT (2020/12) @kuhnroyal (2020/12) @agilob (2020/12) @ahmednfwela (2021/08)                                                                                                        |
@@ -1153,8 +1146,8 @@ If you want to join the committee, please kindly apply by sending an email to te
 | 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) @martin-mfg (2023/08)                                                                 |
-| Java Spring           | @cachescrubber (2022/02) @welshm (2022/02) @MelleD (2022/02) @atextor (2022/02) @manedev79 (2022/02) @javisst (2022/02) @borsch (2022/02) @banlevente (2022/02) @Zomzog (2022/09) @martin-mfg (2023/08)                                                                     |
+| 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)                                                                 |
+| Java Spring           | @cachescrubber (2022/02) @welshm (2022/02) @MelleD (2022/02) @atextor (2022/02) @manedev79 (2022/02) @javisst (2022/02) @borsch (2022/02) @banlevente (2022/02) @Zomzog (2022/09)                                                                     |
 | JMeter                | @kannkyo (2021/01)                                                                                                                                                                                                                                    |
 | Jetbrains HTTP Client | @jlengrand (2023/01)                                                                                                                                                                                                                                  |
 | Julia                 | @tanmaykm (2023/01)                                                                                                                                                                                                                                   |
--- a/bin/configs/ada.yaml
+++ b/bin/configs/ada.yaml
@@ -1,15 +0,0 @@
-generatorName: ada
-outputDir: samples/client/petstore/ada
-inputSpec: modules/openapi-generator/src/test/resources/3_0/ada/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Ada
-nameMappings:
-  _type: P_UnderscoreType
-  type_: P_TypeWithUnderscore
-  http_debug_operation: P_HTTPDebugOperation
-parameterNameMappings:
-  _type: UnderscoreType
-  type_: TypeWithUnderscore
-  http_debug_operation: HttpDebugOperation 
-additionalProperties:
-  modelPackage: Samples.Petstore
-  projectName: Petstore
--- a/bin/configs/c.yaml
+++ b/bin/configs/c.yaml
@@ -2,6 +2,3 @@ generatorName: c
 outputDir: samples/client/petstore/c
 inputSpec: modules/openapi-generator/src/test/resources/2_0/c/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/C-libcurl
-modelNameMappings:
-  another_model: MappedModel
-  another_property: mappedProperty
--- a/bin/configs/crystal.yaml
+++ b/bin/configs/crystal.yaml
@@ -7,12 +7,3 @@ additionalProperties:
  moduleName: Petstore
  shardName: petstore
 strictSpecBehavior: false
-modelNameMappings:
-  PropertyNameMapping: AnotherPropertyNameMapping
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-  type-: type_with_dash
-parameterNameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
--- a/bin/configs/csharp-restsharp-echo-api.yaml
+++ b/bin/configs/csharp-restsharp-echo-api.yaml
@@ -1,9 +0,0 @@
-generatorName: csharp
-outputDir: samples/client/echo_api/csharp-restsharp
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{322C8CAF-0156-40C1-AE42-D59761FB9B6C}'
-  targetFramework: net6.0
-  setCompareNetObjects: "true"
-  hideGenerationTimestamp: "true"
--- a/bin/configs/csharp-restsharp-net6.0-name-mappings.yaml
+++ b/bin/configs/csharp-restsharp-net6.0-name-mappings.yaml
@@ -1,18 +0,0 @@
-generatorName: csharp
-outputDir: samples/client/petstore/csharp-restsharp-name-parameter-mappings
-inputSpec: modules/openapi-generator/src/test/resources/3_0/name-parameter-mappings.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
-nameMappings:
-  _type: UnderscoreType
-  type_: TypeWithUnderscore
-  http_debug_operation: HttpDebugOperation
-parameterNameMappings:
-  _type: UnderscoreType
-  type_: TypeWithUnderscore
-  http_debug_operation: HttpDebugOperation
-modelNameMappings:
-  Environment: Env
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  hideGenerationTimestamp: "true"
-  targetFramework: net6.0
--- a/bin/configs/elixir.yaml
+++ b/bin/configs/elixir.yaml
@@ -4,10 +4,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/elixir
 additionalProperties:
  invokerPackage: OpenapiPetstore
-modelNameMappings:
-  DeprecatedObject: DeprecatedModel
-# the following options have no effect on elixir client gen which uses baseName
-nameMappings:
-  deprecatedRef: deprecatedReference
-parameterNameMapping:
-  ioutils: ioutils_parameter
--- a/bin/configs/go-petstore.yaml
+++ b/bin/configs/go-petstore.yaml
@@ -2,17 +2,8 @@ generatorName: go
 outputDir: samples/openapi3/client/petstore/go/go-petstore
 inputSpec: modules/openapi-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
 templateDir: modules/openapi-generator/src/main/resources/go
-nameMappings:
-  _type: UnderscoreType
-  type_: TypeWithUnderscore
-  http_debug_operation: HTTPDebugOperation
-parameterNameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
-  http_debug_operation: httpDebugOperation
 additionalProperties:
  enumClassPrefix: "true"
  packageName: petstore
  disallowAdditionalPropertiesIfNotPresent: false
  generateInterfaces: true
-
--- a/bin/configs/go-server-chi-api-server.yaml
+++ b/bin/configs/go-server-chi-api-server.yaml
@@ -1,6 +1,6 @@
 generatorName: go-server
 outputDir: samples/server/petstore/go-chi-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/go-server/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/go-server
 additionalProperties:
  hideGenerationTimestamp: "true"
--- a/bin/configs/go-server-chi-api-server-test.yaml
+++ b/bin/configs/go-server-chi-api-server-test.yaml
@@ -1,6 +1,6 @@
 generatorName: go-server
-outputDir: samples/openapi3/server/petstore/go/go-petstore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/go-server/petstore_with_test_endpoint.yaml
+outputDir: samples/server/petstore/go-server-required
+inputSpec: modules/openapi-generator/src/test/resources/3_0/server-required.yaml
 templateDir: modules/openapi-generator/src/main/resources/go-server
 additionalProperties:
  hideGenerationTimestamp: "true"
--- a/bin/configs/haskell-servant.yaml
+++ b/bin/configs/haskell-servant.yaml
@@ -1,4 +1,4 @@
 generatorName: haskell
 outputDir: samples/server/petstore/haskell-servant
-inputSpec: modules/openapi-generator/src/test/resources/3_0/haskell/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/haskell-servant
--- a/bin/configs/haskell-yesod-petstore-new.yaml
+++ b/bin/configs/haskell-yesod-petstore-new.yaml
@@ -1,6 +1,6 @@
 generatorName: haskell-yesod
 outputDir: samples/server/petstore/haskell-yesod
-inputSpec: modules/openapi-generator/src/test/resources/3_0/haskell/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/haskell-yesod
 additionalProperties:
  hideGenerationTimestamp: "true"
--- a/bin/configs/java-microprofile-rest-client-3.0-jackson-with-xml.yaml
+++ b/bin/configs/java-microprofile-rest-client-3.0-jackson-with-xml.yaml
@@ -1,11 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml
-library: microprofile
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-withXml: true
-additionalProperties:
-  serializationLibrary: jackson
-  artifactId: microprofile-rest-client-3-jackson-with-xml
-  configKey: petstore
-  microprofileRestClientVersion: "3.0"
--- a/bin/configs/java-microprofile-rest-client-3.0-jackson.yaml
+++ b/bin/configs/java-microprofile-rest-client-3.0-jackson.yaml
@@ -1,10 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/microprofile-rest-client-3.0-jackson
-library: microprofile
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  serializationLibrary: jackson
-  artifactId: microprofile-rest-client-3-jackson
-  configKey: petstore
-  microprofileRestClientVersion: "3.0"
--- a/bin/configs/java-okhttp-gson-streaming.yaml
+++ b/bin/configs/java-okhttp-gson-streaming.yaml
@@ -7,4 +7,3 @@ additionalProperties:
  artifactId: petstore-okhttp-gson
  hideGenerationTimestamp: "true"
  supportStreaming: true
-  serializableModel: true
--- a/bin/configs/java-okhttp-gson.yaml
+++ b/bin/configs/java-okhttp-gson.yaml
@@ -3,12 +3,6 @@ outputDir: samples/client/petstore/java/okhttp-gson
 library: okhttp-gson
 inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
 templateDir: modules/openapi-generator/src/main/resources/Java
-nameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
-parameterNameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
 additionalProperties:
  artifactId: petstore-okhttp-gson
  hideGenerationTimestamp: "true"
--- a/bin/configs/java-resteasy.yaml
+++ b/bin/configs/java-resteasy.yaml
@@ -1,8 +1,8 @@
 generatorName: java
 outputDir: samples/client/petstore/java/resteasy
+library: resteasy
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
  artifactId: petstore-resteasy
  hideGenerationTimestamp: "true"
-  library: resteasy
--- a/bin/configs/javascript-es6.yaml
+++ b/bin/configs/javascript-es6.yaml
@@ -5,10 +5,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/javascript/petstore-
 templateDir: modules/openapi-generator/src/main/resources/Javascript
 additionalProperties:
  appName: PetstoreClient
-modelNameMappings:
-  HealthCheckResult: HealthCheckStatus
-parameterNameMappings:
-  query_1: queryOne
-# the following has no effect as js client gen use baseName directly
-nameMappings:
-  NullableMessage: nullable_field
--- a/bin/configs/julia-client-petstore-new.yaml
+++ b/bin/configs/julia-client-petstore-new.yaml
@@ -1,13 +1,7 @@
 generatorName: julia-client
 outputDir: samples/client/petstore/julia
-inputSpec: modules/openapi-generator/src/test/resources/3_0/julia/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/julia-client
 additionalProperties:
  hideGenerationTimestamp: "true"
-  packageName: OpenAPIGenPetStoreClient
-  exportOperations: "true"
-  exportModels: "true"
-modelNameMappings:
-  another_model: MappedModel
-nameMappings:
-  another_property: mappedProperty 
+  packageName: PetStoreClient
--- a/bin/configs/julia-server-petstore-new.yaml
+++ b/bin/configs/julia-server-petstore-new.yaml
@@ -1,9 +1,7 @@
 generatorName: julia-server
 outputDir: samples/server/petstore/julia
-inputSpec: modules/openapi-generator/src/test/resources/3_0/julia/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/julia-server
 additionalProperties:
  hideGenerationTimestamp: "true"
-  packageName: OpenAPIGenPetStoreServer
-  exportOperations: "true"
-  exportModels: "true"
+  packageName: PetStoreServer
--- a/bin/configs/kotlin-jvm-jackson.yaml
+++ b/bin/configs/kotlin-jvm-jackson.yaml
@@ -1,9 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/petstore/kotlin-jvm-jackson
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  artifactId: kotlin-petstore-jvm-jackson
-  enumUnknownDefaultCase: true
-  serializationLibrary: jackson
-  library: jvm-retrofit2
--- a/bin/configs/kotlin-jvm-okhttp-parameter-tests.yaml
+++ b/bin/configs/kotlin-jvm-okhttp-parameter-tests.yaml
@@ -1,7 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/others/kotlin-jvm-okhttp-parameter-tests
-library: jvm-okhttp4
-inputSpec: modules/openapi-generator/src/test/resources/3_0/parameter-test-spec.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  artifactId: kotlin-petstore-okhttp4-parameter-tests
--- a/bin/configs/kotlin-name-mappings.yaml
+++ b/bin/configs/kotlin-name-mappings.yaml
@@ -1,14 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/petstore/kotlin-name-parameter-mappings
-inputSpec: modules/openapi-generator/src/test/resources/3_0/name-parameter-mappings.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-nameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
-  http_debug_operation: httpDebugOperation
-parameterNameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
-  http_debug_operation: httpDebugOperation
-additionalProperties:
-  artifactId: kotlin-petstore-client
--- a/bin/configs/kotlin-server-jaxrs-spec-mutiny.yaml
+++ b/bin/configs/kotlin-server-jaxrs-spec-mutiny.yaml
@@ -1,9 +0,0 @@
-generatorName: kotlin-server
-outputDir: samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
-library: jaxrs-spec
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-server
-additionalProperties:
-  returnResponse: "true"
-  interfaceOnly: "true"
-  useMutiny: "true"
--- a/bin/configs/kotlin-server-jaxrs-spec-parameter-tests.yaml
+++ b/bin/configs/kotlin-server-jaxrs-spec-parameter-tests.yaml
@@ -1,7 +0,0 @@
-generatorName: kotlin-server
-outputDir: samples/server/others/kotlin-server/jaxrs-spec
-library: jaxrs-spec
-inputSpec: modules/openapi-generator/src/test/resources/3_0/parameter-test-spec.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-server
-additionalProperties:
-  useCoroutines: "true"
--- a/bin/configs/kotlin-spring-default.yaml
+++ b/bin/configs/kotlin-spring-default.yaml
@@ -1,14 +0,0 @@
-generatorName: kotlin-spring
-outputDir: samples/server/petstore/kotlin-spring-default
-library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
-# comment out below to use default settings
-#additionalProperties:
-#  documentationProvider: none
-#  annotationLibrary: none
-#  useSwaggerUI: "false"
-#  serviceImplementation: "true"
-#  serializableModel: "true"
-#  beanValidations: "true"
-#  useSpringBoot3: "true"
--- a/bin/configs/php-OpenAPIClient.yaml
+++ b/bin/configs/php-OpenAPIClient.yaml
@@ -1,11 +1,4 @@
 generatorName: php
 outputDir: samples/client/petstore/php/OpenAPIClient-php
-inputSpec: modules/openapi-generator/src/test/resources/3_0/php/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/php
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-  type-: type_with_dash
-parameterNameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
--- a/bin/configs/php-psr-18.yaml
+++ b/bin/configs/php-psr-18.yaml
@@ -1,12 +0,0 @@
-generatorName: php
-outputDir: samples/client/petstore/php/psr-18
-inputSpec: modules/openapi-generator/src/test/resources/3_0/php/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/php
-library: psr-18
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-  type-: type_with_dash
-parameterNameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
--- a/bin/configs/python.yaml
+++ b/bin/configs/python.yaml
@@ -7,6 +7,3 @@ additionalProperties:
  useOneOfDiscriminatorLookup: "true"
  disallowAdditionalPropertiesIfNotPresent: false
  mapNumberTo: StrictFloat
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
--- a/bin/configs/r-httr2-client.yaml
+++ b/bin/configs/r-httr2-client.yaml
@@ -4,12 +4,6 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/r/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/r
 httpUserAgent: PetstoreAgent
 library: httr2
-modelNameMappings:
-  dummy_model: JustModel
-parameterNameMappings:
-  path_array: path_array_parameter
-nameMappings:
-  percent_description: percent
 additionalProperties:
  packageName: petstore
  exceptionPackage: rlang
@@ -17,4 +11,3 @@ additionalProperties:
  returnExceptionOnFailure: true
  errorObjectType: "ModelApiResponse"
  operationIdNaming: snake_case
-
--- a/bin/configs/ruby.yaml
+++ b/bin/configs/ruby.yaml
@@ -1,7 +1,7 @@
 generatorName: ruby
 outputDir: samples/client/petstore/ruby
 library: typhoeus
-inputSpec: modules/openapi-generator/src/test/resources/3_0/ruby/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/ruby-client
 additionalProperties:
  gemVersion: 1.0.0
@@ -9,9 +9,3 @@ additionalProperties:
  gemName: petstore
  skipFormModel: "true"
 strictSpecBehavior: false
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-parameterNameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
--- a/bin/configs/rust-reqwest-name-mapping.yaml
+++ b/bin/configs/rust-reqwest-name-mapping.yaml
@@ -1,16 +0,0 @@
-generatorName: rust
-outputDir: samples/client/petstore/rust/reqwest/name-mapping
-library: reqwest
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/rust-name-mapping-test.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust
-additionalProperties:
-  supportAsync: false
-  packageName: petstore-name-mapping
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-  -type: dash_type
-parameterNameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-  -type: dash_type
--- a/bin/configs/rust-reqwest-regression-16119.yaml
+++ b/bin/configs/rust-reqwest-regression-16119.yaml
@@ -1,8 +0,0 @@
-generatorName: rust
-outputDir: samples/client/others/rust/reqwest-regression-16119
-library: reqwest
-inputSpec: modules/openapi-generator/src/test/resources/3_1/regression-16119.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust
-additionalProperties:
-  supportAsync: false
-  packageName: regression-16119-reqwest
--- a/bin/configs/scala-pekko-http-server.yaml
+++ b/bin/configs/scala-pekko-http-server.yaml
@@ -1,7 +0,0 @@
-generatorName: scala-akka-http-server
-outputDir: samples/server/petstore/scala-pekko-http-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-akka-http-server
-additionalProperties:
-  artifactId: openapi-scala-pekko-http-server
-  useApachePekko: true
--- a/bin/configs/scala-sttp.yaml
+++ b/bin/configs/scala-sttp.yaml
@@ -2,13 +2,5 @@ generatorName: scala-sttp
 outputDir: samples/client/petstore/scala-sttp
 inputSpec: modules/openapi-generator/src/test/resources/3_0/scala/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/scala-sttp
-nameMappings:
-  _type: "`underscoreType`"
-  type_: "`typeWithUnderscore`"
-  http_debug_operation: "`httpDebugOperation`"
-parameterNameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
-  http_debug_operation: httpDebugOperation
 additionalProperties:
  artifactId: scala-sttp-petstore
--- a/bin/configs/spring-boot-reactive-noResponseEntity.yaml
+++ b/bin/configs/spring-boot-reactive-noResponseEntity.yaml
@@ -1,12 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/springboot-reactive-noResponseEntity
-inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  groupId: org.openapitools.openapi3
-  artifactId: springboot-reactive-noResponseEntity
-  documentationProvider: springfox
-  reactive: "true"
-  hideGenerationTimestamp: "true"
-  delegatePattern: "true"
-  useResponseEntity: "false"
--- a/bin/configs/swift5-nonPublicApi.yaml
+++ b/bin/configs/swift5-nonPublicApi.yaml
@@ -10,12 +10,3 @@ additionalProperties:
  nonPublicApi: true
  projectName: PetstoreClient
  podHomepage: https://github.com/openapitools/openapi-generator
-nameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
-  -type: dashType
-parameterNameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
-  -type: dashType
-
--- a/bin/configs/typescript-angular-composed-schemas-tagged-unions.yaml
+++ b/bin/configs/typescript-angular-composed-schemas-tagged-unions.yaml
@@ -1,9 +0,0 @@
-generatorName: typescript-angular
-outputDir: samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions
-inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-angular/composed-schemas.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
-additionalProperties:
-  stringEnums: true
-  modelSuffix: Model
-  enumSuffix: Enum
-  taggedUnions: true
--- a/bin/configs/typescript-angular-composed-schemas.yaml
+++ b/bin/configs/typescript-angular-composed-schemas.yaml
@@ -1,8 +0,0 @@
-generatorName: typescript-angular
-outputDir: samples/client/others/typescript-angular/builds/composed-schemas
-inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-angular/composed-schemas.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
-additionalProperties:
-  stringEnums: true
-  modelSuffix: Model
-  enumSuffix: Enum
--- a/bin/configs/unmaintained/ada.yaml
+++ b/bin/configs/unmaintained/ada.yaml
@@ -0,0 +1,7 @@
+generatorName: ada
+outputDir: samples/client/petstore/ada
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/Ada
+additionalProperties:
+  modelPackage: Samples.Petstore
+  projectName: Petstore
--- a/bin/configs/unmaintained/openapi3/python-flask-python2.yaml
+++ b/bin/configs/unmaintained/openapi3/python-flask-python2.yaml
@@ -0,0 +1,6 @@
+generatorName: python-flask
+outputDir: samples/openapi3/server/petstore/python-flask-python2
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml
+templateDir: modules/openapi-generator/src/main/resources/python-flask
+additionalProperties:
+  supportPython2: true
--- a/bin/configs/zapier-petstore.yaml
+++ b/bin/configs/zapier-petstore.yaml
@@ -1,7 +0,0 @@
-generatorName: zapier
-outputDir: samples/client/petstore/zapier
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/zapier
-additionalProperties:
-  npmVersion: 0.0.1
-  npmName: '@openapitools/zapier'
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -395,42 +395,11 @@ or
 --import-mappings Pet=my.models.MyPet --import-mappings Order=my.models.MyOrder
 ```

-## Name Mapping
-
-One can map the property name using `nameMappings` option and parameter name using `parameterNameMappings` option to something else. Consider the following schema:
-```
-    PropertyNameCollision:
-      properties:
-        _type:
-          type: string
-        type:
-          type: string
-        type_:
-          type: string
-      type: object
-```
-`_type`, `type`, `type_` will result in property name collision in the Java client generator for example. We can resolve the issue using `nameMappings` by mapping `_type` to `underscoreType`, `type_` to `typeWithUnderscore`.
-
-Here is an example to use `nameMappings` and `parameterNameMapping` in CLI:
-```sh
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml  -o /tmp/java2/ --name-mappings _type=underscoreType,type_=typeWithUnderscore, --parameter-name-mappings _type=paramType,type_=typeParam
-```
-
-To map model names, use `modelNameMappings` option, e.g.
-```sh
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g csharp -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml  -o /tmp/csharp/ --model-name-mappings Tag=Label
-```
-will rename the `Tag` schema to `Label` instead.
-
-Not all generators support thess features yet. Please give it a try to confirm the behaviour and open an issue (ticket) to let us know which generators you would like to have this feature enabled and we'll prioritize accordingly. We also welcome PRs to add these features to generators. Related PRs for reference: #16209, #16234 (modelNameMappings), #16194, #16206 (nameMappings, parameterNameMappings).
-
-NOTE: some generators use `baseName` (original name obtained direclty from OpenAPI spec, e.g. `shipping-date`) mustache tag in the templates so the mapping feature won't work.
-
 ## Schema Mapping

 One can map the schema to something else (e.g. external objects/models outside of the package) using the `schemaMappings` option, e.g. in CLI
 ```sh
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/type-alias.yaml -o /tmp/java2/ --schema-mappings TypeAlias=foo.bar.TypeAlias
+java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/type-alias.yaml -o /tmp/java2/ --schema-mapping TypeAlias=foo.bar.TypeAlias
 ```
 Another example (in conjunction with --type-mappings):
 ```sh
@@ -476,16 +445,16 @@ For example, to name the inline schema `meta_200_response` as `MetaObject`, use
 java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i  modules/openapi-generator/src/test/resources/3_0/inline_model_resolver.yaml -o /tmp/java3/ --skip-validate-spec --inline-schema-name-mappings meta_200_response=MetaObject,arbitraryObjectRequestBodyProperty_request=ArbitraryRequest
 ```

-Another useful option is `inlineSchemaOptions`, which allows you to customize how inline schemas are handled or named
+Another useful option is `inlineSchemaNameDefaults`, which allows you to customize the suffix of the auto-generated inline schema name, e.g. in CLI
 ```
--inline-schema-options ARRAY_ITEM_SUFFIX=_array_item,MAP_ITEM_SUFFIX=_map_item,RESOLVE_INLINE_ENUMS=true
+--inline-schema-name-defaults arrayItemSuffix=_array_item,mapItemSuffix=_map_item
 ```

- `ARRAY_ITEM_SUFFIX` sets the array item suffix
- `MAP_ITEM_SUFFIX` set the map item suffix
- `SKIP_SCHEMA_REUSE=true` is a special value to skip reusing inline schemas during refactoring
+Note: Only arrayItemSuffix, mapItemSuffix are supported at the moment.
+
+There are 2 special values:
+- `SKIP_SCHEMA_REUSE=true` is a special value to skip reusing inline schemas.
 - `REFACTOR_ALLOF_INLINE_SCHEMAS=true` will restore the 6.x (or below) behaviour to refactor allOf inline schemas into $ref. (v7.0.0 will skip the refactoring of these allOf inline schmeas by default)
- `RESOLVE_INLINE_ENUMS=true` will refactor inline enum definitions into $ref

 ## OpenAPI Normalizer

@@ -544,7 +513,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat

 Example:
 ```
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/enableKeepOnlyFirstTagInOperation_test.yaml -o /tmp/java-okhttp/ --openapi-normalizer SET_TAGS_FOR_ALL_OPERATIONS=another_tag_name
+java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/enableKeepOnlyFirstTagInOperation_test.yaml -o /tmp/java-okhttp/ --openapi-normalizer SET_TAGS_FOR_ALL_OPERATIONS=true
 ```

 - `ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE`: when set to true, auto fix integer with maximum value 4294967295 (2^32-1) or long with 18446744073709551615 (2^64-1) by adding x-unsigned to the schema
--- a/docs/generators.md
+++ b/docs/generators.md
@@ -74,7 +74,6 @@ The following generators are available:
 * [typescript-redux-query](generators/typescript-redux-query.md)  
 * [typescript-rxjs](generators/typescript-rxjs.md)  
 * [xojo-client](generators/xojo-client.md)  
-* [zapier (beta)](generators/zapier.md)  


 ## SERVER generators
@@ -119,6 +118,7 @@ The following generators are available:
 * [php-laravel](generators/php-laravel.md)  
 * [php-lumen](generators/php-lumen.md)  
 * [php-mezzio-ph](generators/php-mezzio-ph.md)  
+* [php-slim-deprecated (deprecated)](generators/php-slim-deprecated.md)  
 * [php-slim4](generators/php-slim4.md)  
 * [php-symfony](generators/php-symfony.md)  
 * [python-aiohttp](generators/python-aiohttp.md)  
--- a/docs/generators/ada.md
+++ b/docs/generators/ada.md
@@ -186,7 +186,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ### Documentation Feature
 | Name | Supported | Defined By |
 | ---- | --------- | ---------- |
-|Readme|✗|ToolingExtension
+|Readme|✓|ToolingExtension
 |Model|✓|ToolingExtension
 |Api|✓|ToolingExtension

@@ -214,11 +214,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | ---- | --------- | ---------- |
 |Path|✓|OAS2,OAS3
 |Query|✓|OAS2,OAS3
-|Header|✗|OAS2,OAS3
+|Header|✓|OAS2,OAS3
 |Body|✓|OAS2
 |FormUnencoded|✓|OAS2
 |FormMultipart|✓|OAS2
-|Cookie|✗|OAS3
+|Cookie|✓|OAS3

 ### Schema Support Feature
 | Name | Supported | Defined By |
@@ -238,11 +238,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |BasicAuth|✗|OAS2,OAS3
 |ApiKey|✗|OAS2,OAS3
 |OpenIDConnect|✗|OAS3
-|BearerToken|✓|OAS3
-|OAuth2_Implicit|✓|OAS2,OAS3
-|OAuth2_Password|✓|OAS2,OAS3
-|OAuth2_ClientCredentials|✓|OAS2,OAS3
-|OAuth2_AuthorizationCode|✓|OAS2,OAS3
+|BearerToken|✗|OAS3
+|OAuth2_Implicit|✗|OAS2,OAS3
+|OAuth2_Password|✗|OAS2,OAS3
+|OAuth2_ClientCredentials|✗|OAS2,OAS3
+|OAuth2_AuthorizationCode|✗|OAS2,OAS3
 |SignatureAuth|✗|OAS3

 ### Wire Format Feature
--- a/docs/generators/aspnetcore.md
+++ b/docs/generators/aspnetcore.md
@@ -197,7 +197,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>string</li>
 <li>struct</li>
 <li>switch</li>
-<li>system</li>
 <li>this</li>
 <li>throw</li>
 <li>true</li>
--- a/docs/generators/csharp-functions.md
+++ b/docs/generators/csharp-functions.md
@@ -190,7 +190,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>string</li>
 <li>struct</li>
 <li>switch</li>
-<li>system</li>
 <li>this</li>
 <li>throw</li>
 <li>true</li>
--- a/docs/generators/csharp.md
+++ b/docs/generators/csharp.md
@@ -25,7 +25,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |dateFormat|The default Date format (only `generichost` library supports this option).| |yyyy'-'MM'-'dd|
 |dateTimeFormat|The default DateTime format (only `generichost` library supports this option).| |yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
-|equatable|Overrides Equals and GetHashCode methods.| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I|
 |library|HTTP library template (sub-template) to use|<dl><dt>**generichost**</dt><dd>HttpClient with Generic Host dependency injection (https://docs.microsoft.com/en-us/dotnet/core/extensions/generic-host) (Experimental. Subject to breaking changes without notice.)</dd><dt>**httpclient**</dt><dd>HttpClient (https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) (Experimental. Subject to breaking changes without notice.)</dd><dt>**unityWebRequest**</dt><dd>UnityWebRequest (...) (Experimental. Subject to breaking changes without notice.)</dd><dt>**restsharp**</dt><dd>RestSharp (https://github.com/restsharp/RestSharp)</dd></dl>|restsharp|
@@ -192,7 +191,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>string</li>
 <li>struct</li>
 <li>switch</li>
-<li>system</li>
 <li>this</li>
 <li>throw</li>
 <li>true</li>
--- a/docs/generators/elixir.md
+++ b/docs/generators/elixir.md
@@ -48,6 +48,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>AnyType</li>
 <li>Atom</li>
 <li>Boolean</li>
+<li>DateTime</li>
 <li>Decimal</li>
 <li>Float</li>
 <li>Integer</li>
--- a/docs/generators/groovy.md
+++ b/docs/generators/groovy.md
@@ -169,9 +169,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -189,7 +187,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/java-camel.md
+++ b/docs/generators/java-camel.md
@@ -77,7 +77,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |reactive|wrap responses in Mono/Flux Reactor types (spring-boot only)| |false|
 |requestMappingMode|Where to generate the class level @RequestMapping annotation.|<dl><dt>**api_interface**</dt><dd>Generate the @RequestMapping annotation on the generated Api Interface.</dd><dt>**controller**</dt><dd>Generate the @RequestMapping annotation on the generated Api Controller Implementation.</dd><dt>**none**</dt><dd>Do not add a class level @RequestMapping annotation.</dd></dl>|controller|
-|resourceFolder|resource folder for generated resources| |src/main/resources|
 |responseWrapper|wrap the responses in given type (Future, Callable, CompletableFuture,ListenableFuture, DeferredResult, RxObservable, RxSingle or fully qualified type)| |null|
 |returnSuccessCode|Generated server returns 2xx code| |false|
 |scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
@@ -119,7 +118,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |x-content-type|Specify custom value for 'Content-Type' header for operation|OPERATION|null
 |x-class-extra-annotation|List of custom annotations to be added to model|MODEL|null
 |x-field-extra-annotation|List of custom annotations to be added to property|FIELD|null
-|x-operation-extra-annotation|List of custom annotations to be added to operation|OPERATION|null
 |x-spring-paginated|Add org.springframework.data.domain.Pageable to controller method. Can be used to handle page & size query parameters|OPERATION|false
 |x-version-param|Marker property that tells that this parameter would be used for endpoint versioning. Applicable for headers & query params. true/false|OPERATION_PARAMETER|null
 |x-pattern-message|Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable|FIELD|null
@@ -208,9 +206,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -228,7 +224,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/java-helidon-client.md
+++ b/docs/generators/java-helidon-client.md
@@ -162,9 +162,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -182,7 +180,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/java-helidon-server.md
+++ b/docs/generators/java-helidon-server.md
@@ -164,9 +164,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -184,7 +182,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/java-inflector.md
+++ b/docs/generators/java-inflector.md
@@ -166,9 +166,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -186,7 +184,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/java-micronaut-client.md
+++ b/docs/generators/java-micronaut-client.md
@@ -194,9 +194,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -214,7 +212,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>pathvariable</li>
 <li>private</li>
--- a/docs/generators/java-micronaut-server.md
+++ b/docs/generators/java-micronaut-server.md
@@ -194,9 +194,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -214,7 +212,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>pathvariable</li>
 <li>private</li>
--- a/docs/generators/java-msf4j.md
+++ b/docs/generators/java-msf4j.md
@@ -172,9 +172,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -192,7 +190,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/java-pkmst.md
+++ b/docs/generators/java-pkmst.md
@@ -173,9 +173,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -193,7 +191,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/java-play-framework.md
+++ b/docs/generators/java-play-framework.md
@@ -176,9 +176,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -196,7 +194,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/java-undertow-server.md
+++ b/docs/generators/java-undertow-server.md
@@ -166,9 +166,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -186,7 +184,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/java-vertx-web.md
+++ b/docs/generators/java-vertx-web.md
@@ -166,9 +166,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -186,7 +184,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/java-vertx.md
+++ b/docs/generators/java-vertx.md
@@ -169,9 +169,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -189,7 +187,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -149,6 +149,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## LANGUAGE PRIMITIVES

 <ul class="column-ul">
+<li>BigDecimal</li>
 <li>Boolean</li>
 <li>Double</li>
 <li>Float</li>
@@ -197,9 +198,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -217,7 +216,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/javascript-flowtyped.md
+++ b/docs/generators/javascript-flowtyped.md
@@ -23,7 +23,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
-|enumPropertyNamingReplaceSpecialChar|Set to true to replace '-' and '+' symbols with 'minus_' and 'plus_' in enum of type string| |false|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
--- a/docs/generators/jaxrs-cxf-cdi.md
+++ b/docs/generators/jaxrs-cxf-cdi.md
@@ -180,9 +180,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -200,7 +198,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/jaxrs-cxf-client.md
+++ b/docs/generators/jaxrs-cxf-client.md
@@ -171,9 +171,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -191,7 +189,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/jaxrs-cxf-extended.md
+++ b/docs/generators/jaxrs-cxf-extended.md
@@ -194,9 +194,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -214,7 +212,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/jaxrs-cxf.md
+++ b/docs/generators/jaxrs-cxf.md
@@ -189,9 +189,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -209,7 +207,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/jaxrs-jersey.md
+++ b/docs/generators/jaxrs-jersey.md
@@ -173,9 +173,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -193,7 +191,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/jaxrs-resteasy-eap.md
+++ b/docs/generators/jaxrs-resteasy-eap.md
@@ -173,9 +173,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -193,7 +191,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/jaxrs-resteasy.md
+++ b/docs/generators/jaxrs-resteasy.md
@@ -172,9 +172,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -192,7 +190,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/jaxrs-spec.md
+++ b/docs/generators/jaxrs-spec.md
@@ -180,9 +180,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>int</li>
 <li>interface</li>
 <li>list</li>
-<li>localdate</li>
 <li>localreturntype</li>
-<li>localtime</li>
 <li>localvaraccept</li>
 <li>localvaraccepts</li>
 <li>localvarauthnames</li>
@@ -200,7 +198,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
--- a/docs/generators/kotlin-server.md
+++ b/docs/generators/kotlin-server.md
@@ -45,7 +45,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useBeanValidation|Use BeanValidation API annotations. This option is currently supported only when using jaxrs-spec library.| |false|
 |useCoroutines|Whether to use the Coroutines. This option is currently supported only when using jaxrs-spec library.| |false|
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
-|useMutiny|Whether to use Mutiny (should not be used with useCoroutines). This option is currently supported only when using jaxrs-spec library.| |false|

 ## IMPORT MAPPING

--- a/docs/generators/kotlin.md
+++ b/docs/generators/kotlin.md
@@ -28,7 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |generateRoomModels|Generate Android Room database models in addition to API models (JVM Volley library only)| |false|
 |groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
 |idea|Add IntellJ Idea plugin and mark Kotlin main and test folders as source folders.| |false|
-|library|Library template (sub-template) to use|<dl><dt>**jvm-ktor**</dt><dd>Platform: Java Virtual Machine. HTTP client: Ktor 1.6.7. JSON processing: Gson, Jackson (default).</dd><dt>**jvm-okhttp4**</dt><dd>[DEFAULT] Platform: Java Virtual Machine. HTTP client: OkHttp 4.2.0 (Android 5.0+ and Java 8+). JSON processing: Moshi 1.8.0.</dd><dt>**jvm-okhttp3**</dt><dd>Platform: Java Virtual Machine. HTTP client: OkHttp 3.12.4 (Android 2.3+ and Java 7+). JSON processing: Moshi 1.8.0. (DEPRECATED: this option will be remove in 7.x release)</dd><dt>**jvm-spring-webclient**</dt><dd>Platform: Java Virtual Machine. HTTP: Spring 5 (or 6 with useSpringBoot3 enabled) WebClient. JSON processing: Jackson.</dd><dt>**jvm-retrofit2**</dt><dd>Platform: Java Virtual Machine. HTTP client: Retrofit 2.6.2.</dd><dt>**multiplatform**</dt><dd>Platform: Kotlin multiplatform. HTTP client: Ktor 1.6.7. JSON processing: Kotlinx Serialization: 1.2.1.</dd><dt>**jvm-volley**</dt><dd>Platform: JVM for Android. HTTP client: Volley 1.2.1. JSON processing: gson 2.8.9</dd><dt>**jvm-vertx**</dt><dd>Platform: Java Virtual Machine. HTTP client: Vert.x Web Client. JSON processing: Moshi, Gson or Jackson.</dd></dl>|jvm-okhttp4|
+|library|Library template (sub-template) to use|<dl><dt>**jvm-ktor**</dt><dd>Platform: Java Virtual Machine. HTTP client: Ktor 1.6.7. JSON processing: Gson, Jackson (default).</dd><dt>**jvm-okhttp4**</dt><dd>[DEFAULT] Platform: Java Virtual Machine. HTTP client: OkHttp 4.2.0 (Android 5.0+ and Java 8+). JSON processing: Moshi 1.8.0.</dd><dt>**jvm-okhttp3**</dt><dd>Platform: Java Virtual Machine. HTTP client: OkHttp 3.12.4 (Android 2.3+ and Java 7+). JSON processing: Moshi 1.8.0.</dd><dt>**jvm-spring-webclient**</dt><dd>Platform: Java Virtual Machine. HTTP: Spring 5 (or 6 with useSpringBoot3 enabled) WebClient. JSON processing: Jackson.</dd><dt>**jvm-retrofit2**</dt><dd>Platform: Java Virtual Machine. HTTP client: Retrofit 2.6.2.</dd><dt>**multiplatform**</dt><dd>Platform: Kotlin multiplatform. HTTP client: Ktor 1.6.7. JSON processing: Kotlinx Serialization: 1.2.1.</dd><dt>**jvm-volley**</dt><dd>Platform: JVM for Android. HTTP client: Volley 1.2.1. JSON processing: gson 2.8.9</dd><dt>**jvm-vertx**</dt><dd>Platform: Java Virtual Machine. HTTP client: Vert.x Web Client. JSON processing: Moshi, Gson or Jackson.</dd></dl>|jvm-okhttp4|
 |modelMutable|Create mutable models| |false|
 |moshiCodeGen|Whether to enable codegen with the Moshi library. Refer to the [official Moshi doc](https://github.com/square/moshi#codegen) for more info.| |false|
 |nullableReturnType|Nullable return type| |false|
--- a/docs/generators/php-dt.md
+++ b/docs/generators/php-dt.md
@@ -20,17 +20,12 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
-|artifactUrl|artifact URL in generated pom.xml| |null|
 |artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
-|composerPackageName|The name to use in the composer package name field. e.g. `vendor/project` (must be lowercase and consist of words separated by `-`, `.` or `_`).| |null|
-|developerOrganization|developer organization in generated pom.xml| |null|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |null|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|licenseName|The name of the license| |null|
 |modelPackage|package for generated models| |null|
 |modern|use modern language features (generated code will require PHP 8.0)| |false|
 |packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
--- a/docs/generators/php-laravel.md
+++ b/docs/generators/php-laravel.md
@@ -20,17 +20,12 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
-|artifactUrl|artifact URL in generated pom.xml| |null|
 |artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
-|composerPackageName|The name to use in the composer package name field. e.g. `vendor/project` (must be lowercase and consist of words separated by `-`, `.` or `_`).| |null|
-|developerOrganization|developer organization in generated pom.xml| |null|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |null|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|licenseName|The name of the license| |null|
 |modelPackage|package for generated models| |null|
 |packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
--- a/docs/generators/php-lumen.md
+++ b/docs/generators/php-lumen.md
@@ -20,17 +20,12 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
-|artifactUrl|artifact URL in generated pom.xml| |null|
 |artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
-|composerPackageName|The name to use in the composer package name field. e.g. `vendor/project` (must be lowercase and consist of words separated by `-`, `.` or `_`).| |null|
-|developerOrganization|developer organization in generated pom.xml| |null|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |null|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|licenseName|The name of the license| |null|
 |modelPackage|package for generated models| |null|
 |packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
--- a/docs/generators/php-mezzio-ph.md
+++ b/docs/generators/php-mezzio-ph.md
@@ -20,17 +20,12 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
-|artifactUrl|artifact URL in generated pom.xml| |null|
 |artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
-|composerPackageName|The name to use in the composer package name field. e.g. `vendor/project` (must be lowercase and consist of words separated by `-`, `.` or `_`).| |null|
-|developerOrganization|developer organization in generated pom.xml| |null|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |null|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|licenseName|The name of the license| |null|
 |modelPackage|package for generated models| |null|
 |modern|use modern language features (generated code will require PHP 8.0)| |false|
 |packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
William Cheng	c107bfa6e1	Merge remote-tracking branch 'origin/master' into fix-release2	2023-07-07 08:43:13 +08:00
William Cheng	e297d4dd59	Revert "v6.5.0 portal release" This reverts commit `8a91858df5`.	2023-04-01 21:14:20 +08:00
William Cheng	537734404e	Revert "add back docker publish" This reverts commit `a279145cc6`.	2023-04-01 21:14:14 +08:00
William Cheng	73cf95c3ef	Revert "trigger build" This reverts commit `f7ea8baf35`.	2023-04-01 21:13:59 +08:00
William Cheng	f7ea8baf35	trigger build	2023-04-01 19:00:42 +08:00
William Cheng	a279145cc6	add back docker publish	2023-04-01 16:24:37 +08:00
William Cheng	8a91858df5	v6.5.0 portal release	2023-04-01 15:35:06 +08:00
William Cheng	35430d9406	fix publising to gradle portal	2023-04-01 15:31:05 +08:00