remove set e

2025-03-13 20:24:23 +08:00
5903 changed files with 52778 additions and 195933 deletions
--- a/.github/workflows/openapi-generator.yaml
+++ b/.github/workflows/openapi-generator.yaml
@@ -142,7 +142,6 @@ jobs:
          path: modules/openapi-generator-cli/target
      - name: Delete samples that are entirely generated
        run: |
-          rm -rf samples/client/petstore/csharp/generichost/latest/HelloWorld
          rm -rf samples/client/petstore/csharp/generichost/latest/Tags

          rm -rf samples/client/petstore/csharp/generichost/net8/AllOf
--- a/.github/workflows/samples-aspnet-fastenpoints-server.yaml
+++ b/.github/workflows/samples-aspnet-fastenpoints-server.yaml
@@ -26,7 +26,7 @@ jobs:
          - samples/server/petstore/aspnet/fastendpoints-useValidators
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.1
+      - uses: actions/setup-dotnet@v4.3.0
        with:
          dotnet-version: '8.0.x'
      - name: Build
--- a/.github/workflows/samples-dotnet-standard.yaml
+++ b/.github/workflows/samples-dotnet-standard.yaml
@@ -28,7 +28,7 @@ jobs:
          # - samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.1
+      - uses: actions/setup-dotnet@v4.3.0
        with:
          dotnet-version: 3.1.*
      - name: Build
--- a/.github/workflows/samples-dotnet6-server.yaml
+++ b/.github/workflows/samples-dotnet6-server.yaml
@@ -25,7 +25,7 @@ jobs:
          - samples/server/petstore/aspnetcore-6.0-useSwashBuckle
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.1
+      - uses: actions/setup-dotnet@v4.3.0
        with:
          dotnet-version: '6.0.x'
      - name: Build
--- a/.github/workflows/samples-dotnet8-client-echo-api.yaml
+++ b/.github/workflows/samples-dotnet8-client-echo-api.yaml
@@ -19,7 +19,7 @@ jobs:
          - samples/client/echo_api/csharp/restsharp/net8/EchoApi
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.1
+      - uses: actions/setup-dotnet@v4.3.0
        with:
          dotnet-version: '8.0.x'
      - name: Run echo server
--- a/.github/workflows/samples-dotnet8-client.yaml
+++ b/.github/workflows/samples-dotnet8-client.yaml
@@ -19,7 +19,7 @@ jobs:
          - samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.1
+      - uses: actions/setup-dotnet@v4.3.0
        with:
          dotnet-version: '8.0.x'
      - name: Build
--- a/.github/workflows/samples-dotnet8-server.yaml
+++ b/.github/workflows/samples-dotnet8-server.yaml
@@ -26,7 +26,7 @@ jobs:
          - samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.1
+      - uses: actions/setup-dotnet@v4.3.0
        with:
          dotnet-version: '8.0.x'
      - name: Build
--- a/.github/workflows/samples-dotnet8.yaml
+++ b/.github/workflows/samples-dotnet8.yaml
@@ -34,7 +34,7 @@ jobs:
          - samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.1
+      - uses: actions/setup-dotnet@v4.3.0
        with:
          dotnet-version: '8.0.x'
      - name: Build
--- a/.github/workflows/samples-dotnet9.yaml
+++ b/.github/workflows/samples-dotnet9.yaml
@@ -24,7 +24,6 @@ jobs:
      matrix:
        sample:
          - samples/client/petstore/csharp/generichost/latest/Tags
-          - samples/client/petstore/csharp/generichost/latest/HelloWorld
          - samples/client/petstore/csharp/generichost/net9/AllOf
          - samples/client/petstore/csharp/generichost/net9/AnyOf
          - samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare
@@ -44,7 +43,7 @@ jobs:
          #- samples/client/petstore/csharp/unityWebRequest/net9/Petstore
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.1
+      - uses: actions/setup-dotnet@v4.3.0
        with:
          dotnet-version: '9.0.101'
      - name: Build
--- a/.github/workflows/samples-java-client-jdk11.yaml
+++ b/.github/workflows/samples-java-client-jdk11.yaml
@@ -61,8 +61,6 @@ jobs:
          - samples/client/petstore/java/webclient-swagger2
          - samples/client/petstore/java/webclient-useSingleRequestParameter
          - samples/client/petstore/java/vertx
-          - samples/client/petstore/java/vertx-no-nullable
-          - samples/client/petstore/java/vertx-supportVertxFuture
          - samples/client/petstore/java/jersey2-java8-localdatetime
          - samples/client/petstore/java/google-api-client
          - samples/client/petstore/java/rest-assured
@@ -76,7 +74,6 @@ jobs:
          - samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter
          - samples/client/petstore/java/apache-httpclient
          - samples/client/petstore/java/feign
-          - samples/client/petstore/java/feign-hc5
          - samples/client/petstore/java/feign-no-nullable
          - samples/client/petstore/java/okhttp-gson-awsv4signature
          - samples/openapi3/client/petstore/java/jersey2-java8-special-characters
--- a/.github/workflows/samples-java-client-jdk17.yaml
+++ b/.github/workflows/samples-java-client-jdk17.yaml
@@ -28,7 +28,6 @@ jobs:
          - samples/client/petstore/java/restclient-nullable-arrays
          - samples/client/petstore/java/restclient-swagger2
          - samples/client/petstore/java/restclient-useSingleRequestParameter
-          - samples/client/petstore/java/restclient-useSingleRequestParameter-static
          - samples/client/petstore/java/webclient-useSingleRequestParameter
    steps:
      - uses: actions/checkout@v4
--- a/.github/workflows/samples-julia.yaml
+++ b/.github/workflows/samples-julia.yaml
@@ -30,7 +30,7 @@ jobs:
          # 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.2.0
+          git checkout v0.1.25
          cd $currdir
          rm -rf ~/.julia/dev/OpenAPI/test/client/openapigenerator_petstore_v3/petstore
          rm -rf ~/.julia/dev/OpenAPI/test/server/openapigenerator_petstore_v3/petstore
--- a/.github/workflows/samples-kotlin-server-jdk17.yaml
+++ b/.github/workflows/samples-kotlin-server-jdk17.yaml
@@ -42,7 +42,6 @@ jobs:
          - samples/server/petstore/kotlin-server/javalin-6
          - samples/server/petstore/kotlin-server/ktor
          - samples/server/petstore/kotlin-server/ktor2
-          - samples/server/petstore/kotlin-misk
          # comment out due to gradle build failure
          # - samples/server/petstore/kotlin-spring-default/
    steps:
@@ -67,4 +66,4 @@ jobs:
          arguments: wrapper
      - name: Build
        working-directory: ${{ matrix.sample }}
-        run: ./gradlew build -x test
+        run: ./gradlew build -x test
--- a/.github/workflows/samples-kotlin-server-jdk21.yaml
+++ b/.github/workflows/samples-kotlin-server-jdk21.yaml
@@ -25,7 +25,6 @@ jobs:
          - samples/server/petstore/kotlin-server/ktor
          - samples/server/petstore/kotlin-server/ktor2
          - samples/server/petstore/kotlin-server-required-and-nullable-properties
-          - samples/server/petstore/kotlin-misk
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-java@v4
--- a/.github/workflows/samples-kotlin-server.yaml
+++ b/.github/workflows/samples-kotlin-server.yaml
@@ -47,7 +47,6 @@ jobs:
          - samples/server/others/kotlin-server/jaxrs-spec
          - samples/server/others/kotlin-server/jaxrs-spec-array-response
          - samples/server/petstore/kotlin-spring-cloud
-          - samples/server/petstore/kotlin-misk
          # comment out due to gradle build failure
          #- samples/server/petstore/kotlin-spring-default
          # no build.gradle file
@@ -74,4 +73,4 @@ jobs:
          arguments: wrapper
      - name: Build
        working-directory: ${{ matrix.sample }}
-        run: ./gradlew build -x test
+        run: ./gradlew build -x test
--- a/.github/workflows/samples-protobuf.yaml
+++ b/.github/workflows/samples-protobuf.yaml
@@ -20,7 +20,6 @@ jobs:
        sample:
          - 'samples/config/petstore/protobuf-schema/'
          - 'samples/config/petstore/protobuf-schema-config/'
-          - 'samples/config/petstore/protobuf-schema-config-complex/'
    steps:
      - uses: actions/checkout@v4
      - name: Install Protocol Buffers Compiler
--- a/.github/workflows/samples-python-client-echo-api.yaml
+++ b/.github/workflows/samples-python-client-echo-api.yaml
@@ -18,11 +18,11 @@ jobs:
          - samples/client/echo_api/python
          - samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent
        python-version:
+          - "3.8"
          - "3.9"
          - "3.10"
          - "3.11"
          - "3.12"
-          - "3.13"
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-python@v5
--- a/.github/workflows/samples-python-petstore.yaml
+++ b/.github/workflows/samples-python-petstore.yaml
@@ -15,11 +15,11 @@ jobs:
      fail-fast: false
      matrix:
        python-version:
+          - "3.8"
          - "3.9"
          - "3.10"
          - "3.11"
          - "3.12"
-          - "3.13"
        sample:
          - samples/openapi3/client/petstore/python-aiohttp
          - samples/openapi3/client/petstore/python
--- a/.github/workflows/samples-scala-jdk8.yaml
+++ b/.github/workflows/samples-scala-jdk8.yaml
@@ -1,38 +0,0 @@
-name: Samples Scala/sbt (JDK8)
-
-on:
-  push:
-    paths:
-      - 'samples/server/petstore/scala-finch/**'
-  pull_request:
-    paths:
-      - 'samples/server/petstore/scala-finch/**'
-jobs:
-  build:
-    name: Build scala-finch servers
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # servers
-          - samples/server/petstore/scala-finch # cannot be tested with jdk11
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 8
-      - name: Setup sbt launcher
-        uses: sbt/setup-sbt@v1
-      - name: Cache maven dependencies
-        uses: actions/cache@v4
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.ivy2
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/build.sbt') }}
-      - name: Build and test
-        working-directory: ${{ matrix.sample }}
-        run: sbt -v +test
--- a/.github/workflows/samples-scala.yaml
+++ b/.github/workflows/samples-scala.yaml
@@ -20,18 +20,18 @@ jobs:
      matrix:
        sample:
          # clients
-          - samples/client/petstore/java/okhttp-gson
+          - 'samples/client/petstore/java/okhttp-gson'
          - samples/client/petstore/scalaz
          - samples/client/petstore/scala-pekko
          - samples/client/petstore/scala-http4s
-          #- samples/client/petstore/scala-sttp
-          #- samples/client/petstore/scala-sttp-circe
+          #- samples/client/petstore/scala-sttp # won't pass while the same tests in circleci pass
          # servers
          - 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
          - samples/server/petstore/scala-http4s-server
          - samples/server/petstore/scala-cask
    steps:
@@ -39,7 +39,7 @@ jobs:
      - uses: actions/setup-java@v4
        with:
          distribution: 'temurin'
-          java-version: 11
+          java-version: 8
      - name: Setup sbt launcher
        uses: sbt/setup-sbt@v1
      - name: Cache maven dependencies
--- a/.github/workflows/samples-spring-jdk17.yaml
+++ b/.github/workflows/samples-spring-jdk17.yaml
@@ -5,20 +5,16 @@ on:
    paths:
      - samples/openapi3/client/petstore/spring-cloud-3-with-optional
      - samples/openapi3/server/petstore/springboot-3
-      - samples/server/petstore/springboot-api-response-examples
      - samples/server/petstore/springboot-lombok-data
      - samples/server/petstore/springboot-lombok-tostring
      - samples/server/petstore/springboot-file-delegate-optional
-      - samples/server/petstore/springboot-petstore-with-api-response-examples
  pull_request:
    paths:
      - samples/openapi3/client/petstore/spring-cloud-3-with-optional
      - samples/openapi3/server/petstore/springboot-3
-      - samples/server/petstore/springboot-api-response-examples
      - samples/server/petstore/springboot-lombok-data
      - samples/server/petstore/springboot-lombok-tostring
      - samples/server/petstore/springboot-file-delegate-optional
-      - samples/server/petstore/springboot-petstore-with-api-response-examples
 jobs:
  build:
    name: Build Java Spring (JDK17)
@@ -31,11 +27,9 @@ jobs:
          - samples/openapi3/client/petstore/spring-cloud-3-with-optional
          # servers
          - samples/openapi3/server/petstore/springboot-3
-          - samples/server/petstore/springboot-api-response-examples
          - samples/server/petstore/springboot-lombok-data
          - samples/server/petstore/springboot-lombok-tostring
          - samples/server/petstore/springboot-file-delegate-optional
-          - samples/server/petstore/springboot-petstore-with-api-response-examples
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-java@v4
--- a/.github/workflows/samples-spring.yaml
+++ b/.github/workflows/samples-spring.yaml
@@ -45,7 +45,6 @@ jobs:
          - samples/server/petstore/spring-boot-defaultInterface-unhandledException
          - samples/server/petstore/springboot
          - samples/server/petstore/springboot-beanvalidation
-          - samples/server/petstore/springboot-builtin-validation
          - samples/server/petstore/springboot-delegate
          - samples/server/petstore/springboot-delegate-no-response-entity
          - samples/server/petstore/springboot-implicitHeaders
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,12 +37,12 @@ services:

 # comment out the host table change to use the public petstore server
 addons:
-  #apt:
-  #  sources:
-  #    - ubuntu-toolchain-r-test
-  #  packages:
-  #    - g++-5
-  #chrome: stable
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-5
+  chrome: stable
  hosts:
    - petstore.swagger.io

--- a/CI/circle_parallel.sh
+++ b/CI/circle_parallel.sh
@@ -68,7 +68,6 @@ elif [ "$NODE_INDEX" = "3" ]; then
  echo "Running node $NODE_INDEX ... "

  # Install node@stable (for angular 6)
-  set +e
  curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
  export NVM_DIR="/opt/circleci/.nvm"
  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
@@ -122,7 +121,6 @@ else

  (cd samples/client/petstore/scala-akka && mvn integration-test)
  (cd samples/client/petstore/scala-sttp && mvn integration-test)
-  (cd samples/client/petstore/scala-sttp-circe && mvn integration-test)
  (cd samples/client/petstore/scala-sttp4 && mvn integration-test)
  (cd samples/client/petstore/clojure && mvn integration-test)
  (cd samples/client/petstore/java/jersey2-java8 && mvn integration-test)
--- a/README.md
+++ b/README.md
@@ -1139,7 +1139,6 @@ Here is a list of template creators:
   * Kotlin (Spring Boot): @dr4ke616
   * Kotlin (Vertx): @Wooyme
   * Kotlin (JAX-RS): @anttileppa
-   * Kotlin Misk: @andrewwilsonnew @guiarn
   * Kotlin WireMock: @stefankoppier
   * NodeJS Express: @YishTish
   * PHP Flight: @daniel-sc
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,9 +43,6 @@ build_script:
  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln

 test_script:
-  - dotnet test samples\client\petstore\csharp\generichost\latest\Tags\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\latest\HelloWorld\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-
  - dotnet test samples\client\petstore\csharp\generichost\net9\AllOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  - dotnet test samples\client\petstore\csharp\generichost\net9\AnyOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  - dotnet test samples\client\petstore\csharp\generichost\net9\AnyOfNoCompare\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
--- a/bin/configs/csharp-generichost-latest-helloWorld.yaml
+++ b/bin/configs/csharp-generichost-latest-helloWorld.yaml
@@ -1,9 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/latest/HelloWorld
-inputSpec: modules/openapi-generator/src/test/resources/3_1/csharp/hello-world.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  modelPropertySorting: alphabetical
-  operationParameterSorting: alphabetical
--- a/bin/configs/csharp-generichost-tags-latest.yaml
+++ b/bin/configs/csharp-generichost-tags-latest.yaml
--- a/bin/configs/java-feign-hc5.yaml
+++ b/bin/configs/java-feign-hc5.yaml
@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/feign-hc5
-library: feign-hc5
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  booleanGetterPrefix: is
-  artifactId: petstore-feign-hc5
-  hideGenerationTimestamp: "true"
--- a/bin/configs/java-restclient-useSingleRequestParameter-static.yaml
+++ b/bin/configs/java-restclient-useSingleRequestParameter-static.yaml
@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/restclient-useSingleRequestParameter-static
-library: restclient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: singleparam-restclient-static
-  hideGenerationTimestamp: "true"
-  useSingleRequestParameter: static
--- a/bin/configs/java-vertx-supportVertxFuture.yaml
+++ b/bin/configs/java-vertx-supportVertxFuture.yaml
@@ -1,10 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/vertx-supportVertxFuture
-library: vertx
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-vertx-supportvertxfuture
-  hideGenerationTimestamp: "true"
-  dateLibrary: java8
-  supportVertxFuture: "true"
--- a/bin/configs/kotlin-misk.yaml
+++ b/bin/configs/kotlin-misk.yaml
@@ -1,8 +0,0 @@
-generatorName: kotlin-misk
-outputDir: samples/server/petstore/kotlin-misk
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-misk
-validateSpec: false
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  moduleClassName: "PetStoreModule"
--- a/bin/configs/manual/rust-axum-array-params.yaml
+++ b/bin/configs/manual/rust-axum-array-params.yaml
@@ -1,11 +0,0 @@
-generatorName: rust-axum
-outputDir: samples/server/petstore/rust-axum/output/rust-axum-array-params-test
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/rust-axum-array-params-test.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust-axum
-generateAliasAsModel: true
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  packageName: rust-axum-array-params-test
-globalProperties:
-  skipFormModel: false
-enablePostProcessFile: true
--- a/bin/configs/protobuf-schema-config-wrapComplexType.yaml
+++ b/bin/configs/protobuf-schema-config-wrapComplexType.yaml
@@ -1,9 +0,0 @@
-generatorName: protobuf-schema
-outputDir: samples/config/petstore/protobuf-schema-config-complex
-inputSpec: modules/openapi-generator/src/test/resources/3_0/protobuf/petstore-complex.yaml
-templateDir: modules/openapi-generator/src/main/resources/protobuf-schema
-additionalProperties:
-  packageName: petstore
-  addJsonNameAnnotation: true
-  numberedFieldNumberList: true
-  startEnumsWithUnspecified: true
--- a/bin/configs/protobuf-schema-config.yaml
+++ b/bin/configs/protobuf-schema-config.yaml
@@ -7,19 +7,3 @@ additionalProperties:
  addJsonNameAnnotation: true
  numberedFieldNumberList: true
  startEnumsWithUnspecified: true
-  wrapComplexType: false
-  supportMultipleResponses: false
-  aggregateModelsName: data
-  customOptionsApi: |
-    option java_multiple_files = true;
-    option java_package = "com.example.tutorial.protos.api";
-    option java_outer_classname = "ExampleProtos";
-  customOptionsModel: |
-    option java_multiple_files = false;
-    option java_package = "com.example.tutorial.protos.model";
-    option java_outer_classname = "ExampleProtos";
-  useSimplifiedEnumNames: true
-typeMappings:
-  object: "google.protobuf.Struct"
-importMappings:
-  google.protobuf.Struct: "google/protobuf/struct"
--- a/bin/configs/protobuf-schema.yaml
+++ b/bin/configs/protobuf-schema.yaml
@@ -4,7 +4,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/protobuf/petstore.ya
 templateDir: modules/openapi-generator/src/main/resources/protobuf-schema
 additionalProperties:
  packageName: petstore
-typeMappings:
-  object: "google.protobuf.Struct"
-importMappings:
-  google.protobuf.Struct: "google/protobuf/struct"
--- a/bin/configs/scala-sttp-circe.yaml
+++ b/bin/configs/scala-sttp-circe.yaml
@@ -1,15 +0,0 @@
-generatorName: scala-sttp
-outputDir: samples/client/petstore/scala-sttp-circe
-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
-  jsonLibrary: circe
--- a/bin/configs/spring-boot-api-response-examples.yaml
+++ b/bin/configs/spring-boot-api-response-examples.yaml
@@ -1,13 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/springboot-api-response-examples
-library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/api-response-examples_issue17610.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  artifactId: springboot-api-response-examples
-  documentationProvider: springdoc
-  useSpringBoot3: true
-  java8: true
-  delegatePattern: true
-  useBeanValidation: true
-  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-builtin-validation.yaml
+++ b/bin/configs/spring-boot-builtin-validation.yaml
@@ -1,13 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/springboot-builtin-validation
-library: spring-boot
-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:
-  documentationProvider: springfox
-  useSwaggerUI: false
-  java8: true
-  useBeanValidation: true
-  useSpringBuiltInValidation: true
-  artifactId: spring-boot-builtin-validation
-  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-petstore-with-api-response-examples.yaml
+++ b/bin/configs/spring-boot-petstore-with-api-response-examples.yaml
@@ -1,13 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/springboot-petstore-with-api-response-examples
-library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore_with_api_response_examples.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  artifactId: springboot-petstore-with-api-response-examples
-  documentationProvider: springdoc
-  useSpringBoot3: true
-  java8: true
-  delegatePattern: true
-  useBeanValidation: true
-  hideGenerationTimestamp: "true"
--- a/bin/configs/typescript-echo-api.yaml
+++ b/bin/configs/typescript-echo-api.yaml
@@ -1,10 +0,0 @@
-generatorName: typescript
-outputDir: samples/client/echo_api/typescript/build
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript
-additionalProperties:
-  artifactId: echo-api-typescript
-  hideGenerationTimestamp: "true"
-  platform: node
-  npmVersion: 1.0.0
-  npmName: '@openapitools/typescript-echo-api'
--- a/bin/configs/unmaintained/kotlin-jvm-retrofit2-coroutines.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-retrofit2-coroutines.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin
-outputDir: samples/client/petstore/kotlin-jvm-retrofit2-coroutines
+outputDir: samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines
 library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.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/kotlin-client
 additionalProperties:
  serializationLibrary: gson
@@ -9,4 +9,3 @@ additionalProperties:
  artifactId: kotlin-petstore-coroutines-client
  serializableModel: "true"
  dateLibrary: java8
-  useResponseAsReturnType: false
--- a/bin/utils/test_file_list.yaml
+++ b/bin/utils/test_file_list.yaml
@@ -10,7 +10,7 @@
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java"
  sha256: 325fdd5d7e2c97790c0fb44f712ab7b2ba022d7e1a5b0056f47b07f342682b6d
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java"
-  sha256: 67941355a0a27ed9ff9318b1caa103e78b81b9aff61b594b18be5cd2bb9f6591
+  sha256: e673d9928c8eb848262d0116fe0d28db832e128671a810a7c966d06d90cb9b63
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java"
  sha256: 8b1b8f2a2ad00ccb090873a94a5f73e328b98317d2ec715f53bd7a1accb2a023
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java"
@@ -55,8 +55,6 @@
  sha256: 45cdaba3d2adc212cd4f0184ad475419a95e2326254c2ef84175e210c922b2f3
 - filename: "samples/client/petstore/java/feign/src/test/java/org/openapitools/client/JacksonTest.java"
  sha256: 45cdaba3d2adc212cd4f0184ad475419a95e2326254c2ef84175e210c922b2f3
- filename: "samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/JacksonTest.java"
-  sha256: 45cdaba3d2adc212cd4f0184ad475419a95e2326254c2ef84175e210c922b2f3
 # rust axum test files
 - filename: "samples/server/petstore/rust-axum/output/rust-axum-oneof/tests/oneof_with_discriminator.rs"
  sha256: 2d4f5a069fdcb3057bb078d5e75b3de63cd477b97725e457079df24bd2c30600
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -601,13 +601,6 @@ 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 REMOVE_X_INTERNAL=true
 ```

- `NORMALIZER_CLASS`: Set to full classname of a class extending the default org.openapitools.codegen.OpenAPINormalizer. It allows customization of the default normalizer. 
-
-Example:
-```
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/required-properties.yaml -o /tmp/java-okhttp/ --openapi-normalizer NORMALIZER_CLASS=org.openapitools.codegen.OpenAPINormalizerTest$RemoveRequiredNormalizer
-```
-
 - `FILTER`

 The `FILTER` parameter allows selective inclusion of API operations based on specific criteria. It applies the `x-internal: true` property to operations that do **not** match the specified values, preventing them from being generated.
@@ -653,27 +646,3 @@ Example:
 ```
 java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_1/java/petstore.yaml -o /tmp/java-okhttp/ --openapi-normalizer FIX_DUPLICATED_OPERATIONID=true
 ```
-
- `SET_BEARER_AUTH_FOR_NAME`: When set to the name of an openapi 2.0 securityDefinition, that securityDefinition will be converted to the openapi 3.0 bearerAuth securityScheme.
-
-Example:
-```
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/2_0/globalSecurity.json -o /tmp/java-okhttp/ --openapi-normalizer SET_BEARER_AUTH_FOR_NAME=api_key
-```
-Transforms this securityDefinition:
-```
-  "securityDefinitions": {
-    "api_key": {
-      "type": "apiKey",
-      "name": "api_key",
-      "in": "header"
-    },
-  },
-```
-Into this securityScheme:
-```
-  securitySchemes:
-    api_key:
-      scheme: bearer
-      type: http
-```
--- a/docs/faq-generators.md
+++ b/docs/faq-generators.md
@@ -494,8 +494,6 @@ Here is a working sample that put's together all of this.
 - The default project structure now follows the SPM (Swift Package Manager) structure. To revert to the old structure, set the `useSPMFileStructure` flag to `false`.
 - The former `{{projectName}}API` is now called `{{projectName}}APIConfiguration`.
 - You can now set a request interceptor and retrier by configuring `OpenAPIClient.shared.interceptor`, making authenticated requests easier to manage.
- The protocol `JSONEncodable` was renamed to `ParameterConvertible`.
- The flag `useJSONEncodable` was renamed to `useParameterConvertible`.

 ## TypeScript

--- a/docs/generators.md
+++ b/docs/generators.md
@@ -122,7 +122,6 @@ The following generators are available:
 * [jaxrs-resteasy-eap](generators/jaxrs-resteasy-eap.md)  
 * [jaxrs-spec](generators/jaxrs-spec.md)  
 * [julia-server (beta)](generators/julia-server.md)  
-* [kotlin-misk](generators/kotlin-misk.md)  
 * [kotlin-server](generators/kotlin-server.md)  
 * [kotlin-spring](generators/kotlin-spring.md)  
 * [kotlin-vertx (beta)](generators/kotlin-vertx.md)  
--- a/docs/generators/elixir.md
+++ b/docs/generators/elixir.md
@@ -45,18 +45,19 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## LANGUAGE PRIMITIVES

 <ul class="column-ul">
-<li>Date.t</li>
-<li>DateTime.t</li>
-<li>String.t</li>
+<li>AnyType</li>
+<li>Atom</li>
+<li>Boolean</li>
+<li>Decimal</li>
+<li>Float</li>
+<li>Integer</li>
+<li>List</li>
+<li>Map</li>
+<li>PID</li>
+<li>String</li>
+<li>Tuple</li>
 <li>any()</li>
-<li>binary()</li>
-<li>boolean()</li>
-<li>float()</li>
-<li>integer()</li>
-<li>list()</li>
 <li>map()</li>
-<li>nil</li>
-<li>number()</li>
 </ul>

 ## RESERVED WORDS
@@ -188,7 +189,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |BasicAuth|✓|OAS2,OAS3
 |ApiKey|✗|OAS2,OAS3
 |OpenIDConnect|✗|OAS3
-|BearerToken|✓|OAS3
+|BearerToken|✗|OAS3
 |OAuth2_Implicit|✓|OAS2,OAS3
 |OAuth2_Password|✗|OAS2,OAS3
 |OAuth2_ClientCredentials|✗|OAS2,OAS3
--- a/docs/generators/groovy.md
+++ b/docs/generators/groovy.md
@@ -38,7 +38,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/java-camel.md
+++ b/docs/generators/java-camel.md
@@ -54,7 +54,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |documentationProvider|Select the OpenAPI documentation provider.|<dl><dt>**none**</dt><dd>Do not publish an OpenAPI specification.</dd><dt>**source**</dt><dd>Publish the original input OpenAPI specification.</dd><dt>**springfox**</dt><dd>Generate an OpenAPI 2 (fka Swagger RESTful API Documentation Specification) specification using SpringFox 2.x. Deprecated (for removal); use springdoc instead.</dd><dt>**springdoc**</dt><dd>Generate an OpenAPI 3 specification using SpringDoc.</dd></dl>|springdoc|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
@@ -99,7 +99,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |unhandledException|Declare operation methods to throw a generic exception and allow unhandled exceptions (useful for Spring `@ControllerAdvice` directives).| |false|
 |useBeanValidation|Use BeanValidation API annotations| |true|
 |useEnumCaseInsensitive|Use `equalsIgnoreCase` when String for enum comparison| |false|
-|useFeignClientContextId|Whether to generate Feign client with contextId parameter.| |true|
 |useFeignClientUrl|Whether to generate Feign client with url parameter.| |true|
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|
@@ -107,7 +106,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useResponseEntity|Use the `ResponseEntity` type to wrap return values of generated API methods. If disabled, method are annotated using a `@ResponseStatus` annotation, which has the status of the first response declared in the Api definition| |true|
 |useSealed|Whether to generate sealed model interfaces and classes| |false|
 |useSpringBoot3|Generate code and provide dependencies for use with Spring Boot 3.x. (Use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.| |false|
-|useSpringBuiltInValidation|Disable `@Validated` at the class level when using built-in validation.| |false|
 |useSpringController|Annotate the generated API as a Spring Controller| |false|
 |useSwaggerUI|Open the OpenApi specification in swagger-ui. Will also import and configure needed dependencies| |true|
 |useTags|use tags for creating interface and controller classnames| |false|
@@ -127,7 +125,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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, OPERATION_PARAMETER|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` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.|OPERATION|false
+|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, OPERATION_PARAMETER|null

--- a/docs/generators/java-helidon-client.md
+++ b/docs/generators/java-helidon-client.md
@@ -36,7 +36,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |fullProject|If set to true, it will generate all files; if set to false, it will only generate API files. If unspecified, the behavior depends on whether a project exists or not: if it does not, same as true; if it does, same as false. Note that test files are never overwritten.| ||
 |generateBuilders|Whether to generate builders for models| |false|
--- a/docs/generators/java-helidon-server.md
+++ b/docs/generators/java-helidon-server.md
@@ -35,7 +35,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |fullProject|If set to true, it will generate all files; if set to false, it will only generate API files. If unspecified, the behavior depends on whether a project exists or not: if it does not, same as true; if it does, same as false. Note that test files are never overwritten.| ||
 |generateBuilders|Whether to generate builders for models| |false|
--- a/docs/generators/java-inflector.md
+++ b/docs/generators/java-inflector.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/java-micronaut-client.md
+++ b/docs/generators/java-micronaut-client.md
@@ -49,7 +49,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/java-micronaut-server.md
+++ b/docs/generators/java-micronaut-server.md
@@ -44,7 +44,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/java-microprofile.md
+++ b/docs/generators/java-microprofile.md
@@ -47,7 +47,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |documentationProvider|Select the OpenAPI documentation provider.|<dl><dt>**none**</dt><dd>Do not publish an OpenAPI specification.</dd><dt>**source**</dt><dd>Publish the original input OpenAPI specification.</dd></dl>|source|
 |dynamicOperations|Generate operations dynamically at runtime from an OAS| |false|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |errorObjectType|Error Object type. (This option is for okhttp-gson only)| |null|
 |failOnUnknownProperties|Fail Jackson de-serialization on unknown properties| |false|
@@ -62,7 +62,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null|
 |invokerPackage|root package for generated code| |org.openapitools.client|
 |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|
-|library|library template (sub-template) to use|<dl><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.17.1</dd><dt>**jersey3**</dt><dd>HTTP client: Jersey client 3.1.1. JSON processing: Jackson 2.17.1</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 13.2.1. JSON processing: Jackson 2.17.1 or Gson 2.10.1</dd><dt>**feign-hc5**</dt><dd>HTTP client: OpenFeign 13.2.1/HttpClient5 5.4.2. JSON processing: Jackson 2.17.1 or Gson 2.10.1</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 4.11.0. JSON processing: Gson 2.10.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 4.11.0. JSON processing: Gson 2.10.1 (Retrofit 2.5.0) or Jackson 2.17.1. Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 5.3.33 (6.1.5 if `useJakartaEe=true`). JSON processing: Jackson 2.17.1</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.1.18. JSON processing: Jackson 2.17.1</dd><dt>**restclient**</dt><dd>HTTP client: Spring RestClient 6.1.6. JSON processing: Jackson 2.17.1</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 4.7.6. JSON processing: Jackson 2.17.1</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.5.2. JSON processing: Jackson 2.17.1</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 2.2.0. JSON processing: Jackson 2.17.1</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured 5.3.2. JSON processing: Gson 2.10.1 or Jackson 2.17.1. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.17.1. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 2.0 (default, set desired version via `microprofileRestClientVersion=x.x.x`). JSON processing: JSON-B 1.0.2 or Jackson 2.17.1</dd><dt>**apache-httpclient**</dt><dd>HTTP client: Apache httpclient 5.2.1. JSON processing: Jackson 2.17.1</dd></dl>|okhttp-gson|
+|library|library template (sub-template) to use|<dl><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.17.1</dd><dt>**jersey3**</dt><dd>HTTP client: Jersey client 3.1.1. JSON processing: Jackson 2.17.1</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 13.2.1. JSON processing: Jackson 2.17.1 or Gson 2.10.1</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 4.11.0. JSON processing: Gson 2.10.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 4.11.0. JSON processing: Gson 2.10.1 (Retrofit 2.5.0) or Jackson 2.17.1. Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 5.3.33 (6.1.5 if `useJakartaEe=true`). JSON processing: Jackson 2.17.1</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.1.18. JSON processing: Jackson 2.17.1</dd><dt>**restclient**</dt><dd>HTTP client: Spring RestClient 6.1.6. JSON processing: Jackson 2.17.1</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 4.7.6. JSON processing: Jackson 2.17.1</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.5.2. JSON processing: Jackson 2.17.1</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 2.2.0. JSON processing: Jackson 2.17.1</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured 5.3.2. JSON processing: Gson 2.10.1 or Jackson 2.17.1. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.17.1. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 2.0 (default, set desired version via `microprofileRestClientVersion=x.x.x`). JSON processing: JSON-B 1.0.2 or Jackson 2.17.1</dd><dt>**apache-httpclient**</dt><dd>HTTP client: Apache httpclient 5.2.1. JSON processing: Jackson 2.17.1</dd></dl>|okhttp-gson|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |microprofileFramework|Framework for microprofile. Possible values &quot;kumuluzee&quot;| |null|
@@ -87,7 +87,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |sourceFolder|source folder for generated code| |src/main/java|
 |supportStreaming|Support streaming endpoint (beta)| |false|
 |supportUrlQuery|Generate toUrlQueryString in POJO (default to true). Available on `native`, `apache-httpclient` libraries.| |false|
-|supportVertxFuture|Also generate api methods that return a vertx Future instead of taking a callback. Only `vertx` supports this option. Requires vertx 4 or greater.| |false|
 |testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
 |useAbstractionForFiles|Use alternative types instead of java.io.File to allow passing bytes without a file on disk. Available on resttemplate, webclient, restclient, libraries| |false|
 |useBeanValidation|Use BeanValidation API annotations| |false|
--- a/docs/generators/java-msf4j.md
+++ b/docs/generators/java-msf4j.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/java-pkmst.md
+++ b/docs/generators/java-pkmst.md
@@ -41,7 +41,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |eurekaUri|Eureka URI| |null|
 |generateBuilders|Whether to generate builders for models| |false|
--- a/docs/generators/java-play-framework.md
+++ b/docs/generators/java-play-framework.md
@@ -43,7 +43,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/java-undertow-server.md
+++ b/docs/generators/java-undertow-server.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/java-vertx-web.md
+++ b/docs/generators/java-vertx-web.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/java-vertx.md
+++ b/docs/generators/java-vertx.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/java-wiremock.md
+++ b/docs/generators/java-wiremock.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -47,7 +47,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |documentationProvider|Select the OpenAPI documentation provider.|<dl><dt>**none**</dt><dd>Do not publish an OpenAPI specification.</dd><dt>**source**</dt><dd>Publish the original input OpenAPI specification.</dd></dl>|source|
 |dynamicOperations|Generate operations dynamically at runtime from an OAS| |false|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |errorObjectType|Error Object type. (This option is for okhttp-gson only)| |null|
 |failOnUnknownProperties|Fail Jackson de-serialization on unknown properties| |false|
@@ -62,7 +62,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null|
 |invokerPackage|root package for generated code| |org.openapitools.client|
 |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|
-|library|library template (sub-template) to use|<dl><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.17.1</dd><dt>**jersey3**</dt><dd>HTTP client: Jersey client 3.1.1. JSON processing: Jackson 2.17.1</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 13.2.1. JSON processing: Jackson 2.17.1 or Gson 2.10.1</dd><dt>**feign-hc5**</dt><dd>HTTP client: OpenFeign 13.2.1/HttpClient5 5.4.2. JSON processing: Jackson 2.17.1 or Gson 2.10.1</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 4.11.0. JSON processing: Gson 2.10.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 4.11.0. JSON processing: Gson 2.10.1 (Retrofit 2.5.0) or Jackson 2.17.1. Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 5.3.33 (6.1.5 if `useJakartaEe=true`). JSON processing: Jackson 2.17.1</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.1.18. JSON processing: Jackson 2.17.1</dd><dt>**restclient**</dt><dd>HTTP client: Spring RestClient 6.1.6. JSON processing: Jackson 2.17.1</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 4.7.6. JSON processing: Jackson 2.17.1</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.5.2. JSON processing: Jackson 2.17.1</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 2.2.0. JSON processing: Jackson 2.17.1</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured 5.3.2. JSON processing: Gson 2.10.1 or Jackson 2.17.1. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.17.1. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 2.0 (default, set desired version via `microprofileRestClientVersion=x.x.x`). JSON processing: JSON-B 1.0.2 or Jackson 2.17.1</dd><dt>**apache-httpclient**</dt><dd>HTTP client: Apache httpclient 5.2.1. JSON processing: Jackson 2.17.1</dd></dl>|okhttp-gson|
+|library|library template (sub-template) to use|<dl><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.17.1</dd><dt>**jersey3**</dt><dd>HTTP client: Jersey client 3.1.1. JSON processing: Jackson 2.17.1</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 13.2.1. JSON processing: Jackson 2.17.1 or Gson 2.10.1</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 4.11.0. JSON processing: Gson 2.10.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 4.11.0. JSON processing: Gson 2.10.1 (Retrofit 2.5.0) or Jackson 2.17.1. Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 5.3.33 (6.1.5 if `useJakartaEe=true`). JSON processing: Jackson 2.17.1</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.1.18. JSON processing: Jackson 2.17.1</dd><dt>**restclient**</dt><dd>HTTP client: Spring RestClient 6.1.6. JSON processing: Jackson 2.17.1</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 4.7.6. JSON processing: Jackson 2.17.1</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.5.2. JSON processing: Jackson 2.17.1</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 2.2.0. JSON processing: Jackson 2.17.1</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured 5.3.2. JSON processing: Gson 2.10.1 or Jackson 2.17.1. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.17.1. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 2.0 (default, set desired version via `microprofileRestClientVersion=x.x.x`). JSON processing: JSON-B 1.0.2 or Jackson 2.17.1</dd><dt>**apache-httpclient**</dt><dd>HTTP client: Apache httpclient 5.2.1. JSON processing: Jackson 2.17.1</dd></dl>|okhttp-gson|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |microprofileFramework|Framework for microprofile. Possible values &quot;kumuluzee&quot;| |null|
@@ -87,7 +87,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |sourceFolder|source folder for generated code| |src/main/java|
 |supportStreaming|Support streaming endpoint (beta)| |false|
 |supportUrlQuery|Generate toUrlQueryString in POJO (default to true). Available on `native`, `apache-httpclient` libraries.| |false|
-|supportVertxFuture|Also generate api methods that return a vertx Future instead of taking a callback. Only `vertx` supports this option. Requires vertx 4 or greater.| |false|
 |testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
 |useAbstractionForFiles|Use alternative types instead of java.io.File to allow passing bytes without a file on disk. Available on resttemplate, webclient, restclient, libraries| |false|
 |useBeanValidation|Use BeanValidation API annotations| |false|
--- a/docs/generators/jaxrs-cxf-cdi.md
+++ b/docs/generators/jaxrs-cxf-cdi.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/jaxrs-cxf-client.md
+++ b/docs/generators/jaxrs-cxf-client.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/jaxrs-cxf-extended.md
+++ b/docs/generators/jaxrs-cxf-extended.md
@@ -41,7 +41,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/jaxrs-cxf.md
+++ b/docs/generators/jaxrs-cxf.md
@@ -41,7 +41,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/jaxrs-jersey.md
+++ b/docs/generators/jaxrs-jersey.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/jaxrs-resteasy-eap.md
+++ b/docs/generators/jaxrs-resteasy-eap.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/jaxrs-resteasy.md
+++ b/docs/generators/jaxrs-resteasy.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/jaxrs-spec.md
+++ b/docs/generators/jaxrs-spec.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
--- a/docs/generators/kotlin-misk.md
+++ b/docs/generators/kotlin-misk.md
@@ -1,279 +0,0 @@
---
-title: Documentation for the kotlin-misk Generator
---
-
-## METADATA
-
-| Property | Value | Notes |
-| -------- | ----- | ----- |
-| generator name | kotlin-misk | pass this to the generate command after -g |
-| generator stability | STABLE | |
-| generator type | SERVER | |
-| generator language | Kotlin | |
-| generator default templating engine | mustache | |
-| helpTxt | Generates a kotlin-misk server. | |
-
-## CONFIG OPTIONS
-These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
-|apiSuffix|suffix for api classes| |Api|
-|artifactId|Generated artifact id (name of jar).| |null|
-|artifactVersion|Generated artifact's package version.| |1.0.0|
-|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |original|
-|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
-|modelMutable|Create mutable models| |false|
-|moduleClassName|Name of the generated module class| |OpenApiModule|
-|packageName|Generated artifact package name.| |org.openapitools|
-|parcelizeModels|toggle &quot;@Parcelize&quot; for generated models| |null|
-|serializableModel|boolean - toggle &quot;implements Serializable&quot; for generated models| |null|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null|
-|sourceFolder|source folder for generated code| |src/main/kotlin|
-|useBeanValidation|Use BeanValidation API annotations to validate data types| |true|
-
-## IMPORT MAPPING
-
-| Type/Alias | Imports |
-| ---------- | ------- |
-|BigDecimal|java.math.BigDecimal|
-|Date|java.time.LocalDate|
-|DateTime|java.time.OffsetDateTime|
-|File|java.io.File|
-|LocalDate|java.time.LocalDate|
-|LocalDateTime|java.time.LocalDateTime|
-|LocalTime|java.time.LocalTime|
-|Timestamp|java.sql.Timestamp|
-|URI|java.net.URI|
-|UUID|java.util.UUID|
-
-
-## INSTANTIATION TYPES
-
-| Type/Alias | Instantiated By |
-| ---------- | --------------- |
-|array|kotlin.collections.ArrayList|
-|list|kotlin.collections.ArrayList|
-|map|kotlin.collections.HashMap|
-
-
-## LANGUAGE PRIMITIVES
-
-<ul class="column-ul">
-<li>kotlin.Array</li>
-<li>kotlin.Boolean</li>
-<li>kotlin.Byte</li>
-<li>kotlin.ByteArray</li>
-<li>kotlin.Char</li>
-<li>kotlin.Double</li>
-<li>kotlin.Float</li>
-<li>kotlin.Int</li>
-<li>kotlin.Long</li>
-<li>kotlin.Short</li>
-<li>kotlin.String</li>
-<li>kotlin.collections.List</li>
-<li>kotlin.collections.Map</li>
-<li>kotlin.collections.MutableList</li>
-<li>kotlin.collections.MutableMap</li>
-<li>kotlin.collections.MutableSet</li>
-<li>kotlin.collections.Set</li>
-</ul>
-
-## RESERVED WORDS
-
-<ul class="column-ul">
-<li>ApiResponse</li>
-<li>abstract</li>
-<li>actual</li>
-<li>annotation</li>
-<li>as</li>
-<li>break</li>
-<li>class</li>
-<li>companion</li>
-<li>const</li>
-<li>constructor</li>
-<li>continue</li>
-<li>contract</li>
-<li>crossinline</li>
-<li>data</li>
-<li>delegate</li>
-<li>do</li>
-<li>dynamic</li>
-<li>else</li>
-<li>enum</li>
-<li>expect</li>
-<li>external</li>
-<li>false</li>
-<li>field</li>
-<li>final</li>
-<li>finally</li>
-<li>for</li>
-<li>fun</li>
-<li>if</li>
-<li>import</li>
-<li>in</li>
-<li>infix</li>
-<li>init</li>
-<li>inline</li>
-<li>inner</li>
-<li>interface</li>
-<li>internal</li>
-<li>is</li>
-<li>it</li>
-<li>lateinit</li>
-<li>noinline</li>
-<li>null</li>
-<li>object</li>
-<li>open</li>
-<li>operator</li>
-<li>out</li>
-<li>override</li>
-<li>package</li>
-<li>param</li>
-<li>private</li>
-<li>property</li>
-<li>protected</li>
-<li>public</li>
-<li>receiver</li>
-<li>reified</li>
-<li>return</li>
-<li>sealed</li>
-<li>setparam</li>
-<li>super</li>
-<li>suspend</li>
-<li>tailrec</li>
-<li>this</li>
-<li>throw</li>
-<li>true</li>
-<li>try</li>
-<li>typealias</li>
-<li>typeof</li>
-<li>val</li>
-<li>value</li>
-<li>var</li>
-<li>vararg</li>
-<li>when</li>
-<li>where</li>
-<li>while</li>
-</ul>
-
-## FEATURE SET
-
-
-### Client Modification Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|BasePath|✗|ToolingExtension
-|Authorizations|✗|ToolingExtension
-|UserAgent|✗|ToolingExtension
-|MockServer|✗|ToolingExtension
-
-### Data Type Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Custom|✗|OAS2,OAS3
-|Int32|✓|OAS2,OAS3
-|Int64|✓|OAS2,OAS3
-|Float|✓|OAS2,OAS3
-|Double|✓|OAS2,OAS3
-|Decimal|✓|ToolingExtension
-|String|✓|OAS2,OAS3
-|Byte|✓|OAS2,OAS3
-|Binary|✓|OAS2,OAS3
-|Boolean|✓|OAS2,OAS3
-|Date|✓|OAS2,OAS3
-|DateTime|✓|OAS2,OAS3
-|Password|✓|OAS2,OAS3
-|File|✓|OAS2
-|Uuid|✗|
-|Array|✓|OAS2,OAS3
-|Null|✗|OAS3
-|AnyType|✗|OAS2,OAS3
-|Object|✓|OAS2,OAS3
-|Maps|✓|ToolingExtension
-|CollectionFormat|✓|OAS2
-|CollectionFormatMulti|✓|OAS2
-|Enum|✓|OAS2,OAS3
-|ArrayOfEnum|✓|ToolingExtension
-|ArrayOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfPrimitives|✓|ToolingExtension
-|ArrayOfCollectionOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfEnum|✓|ToolingExtension
-|MapOfEnum|✓|ToolingExtension
-|MapOfModel|✓|ToolingExtension
-|MapOfCollectionOfPrimitives|✓|ToolingExtension
-|MapOfCollectionOfModel|✓|ToolingExtension
-|MapOfCollectionOfEnum|✓|ToolingExtension
-
-### Documentation Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Readme|✓|ToolingExtension
-|Model|✓|ToolingExtension
-|Api|✓|ToolingExtension
-
-### Global Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Host|✓|OAS2,OAS3
-|BasePath|✓|OAS2,OAS3
-|Info|✓|OAS2,OAS3
-|Schemes|✗|OAS2,OAS3
-|PartialSchemes|✓|OAS2,OAS3
-|Consumes|✓|OAS2
-|Produces|✓|OAS2
-|ExternalDocumentation|✓|OAS2,OAS3
-|Examples|✓|OAS2,OAS3
-|XMLStructureDefinitions|✗|OAS2,OAS3
-|MultiServer|✗|OAS3
-|ParameterizedServer|✗|OAS3
-|ParameterStyling|✗|OAS3
-|Callbacks|✗|OAS3
-|LinkObjects|✗|OAS3
-
-### Parameter Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Path|✓|OAS2,OAS3
-|Query|✓|OAS2,OAS3
-|Header|✓|OAS2,OAS3
-|Body|✓|OAS2
-|FormUnencoded|✓|OAS2
-|FormMultipart|✓|OAS2
-|Cookie|✓|OAS3
-
-### Schema Support Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Simple|✓|OAS2,OAS3
-|Composite|✓|OAS2,OAS3
-|Polymorphism|✗|OAS2,OAS3
-|Union|✗|OAS3
-|allOf|✗|OAS2,OAS3
-|anyOf|✗|OAS3
-|oneOf|✗|OAS3
-|not|✗|OAS3
-
-### Security Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|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
-|SignatureAuth|✗|OAS3
-|AWSV4Signature|✗|ToolingExtension
-
-### Wire Format Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|JSON|✗|OAS2,OAS3
-|XML|✗|OAS2,OAS3
-|PROTOBUF|✓|ToolingExtension
-|Custom|✗|OAS2,OAS3
--- a/docs/generators/kotlin.md
+++ b/docs/generators/kotlin.md
@@ -30,7 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |generateOneOfAnyOfWrappers|Generate oneOf, anyOf schemas as wrappers. Only `jvm-retrofit2`(library), `gson`(serializationLibrary) support this option.| |false|
 |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 IntelliJ Idea plugin and mark Kotlin main and test folders as source folders.| |false|
+|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-spring-webclient**</dt><dd>Platform: Java Virtual Machine. HTTP: Spring 5 (or 6 with useSpringBoot3 enabled) WebClient. JSON processing: Jackson.</dd><dt>**jvm-spring-restclient**</dt><dd>Platform: Java Virtual Machine. HTTP: Spring 6 RestClient. 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|
 |mapFileBinaryToByteArray|Map File and Binary to ByteArray (default: false)| |false|
 |modelMutable|Create mutable models| |false|
@@ -50,7 +50,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |supportAndroidApiLevel25AndBelow|[WARNING] This flag will generate code that has a known security vulnerability. It uses `kotlin.io.createTempFile` instead of `java.nio.file.Files.createTempFile` in order to support Android API level 25 and below. For more info, please check the following links https://github.com/OpenAPITools/openapi-generator/security/advisories/GHSA-23x4-m842-fmwf, https://github.com/OpenAPITools/openapi-generator/pull/9284| |false|
 |useCoroutines|Whether to use the Coroutines adapter with the retrofit2 library.| |false|
 |useNonAsciiHeaders|Allow to use non-ascii headers with the okhttp library| |false|
-|useResponseAsReturnType|When using retrofit2 and coroutines, use `Response`&lt;`T`&gt; as return type instead of `T`.| |true|
 |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library.| |false|
 |useSettingsGradle|Whether the project uses settings.gradle.| |false|
 |useSpringBoot3|Whether to use the Spring Boot 3 with the jvm-spring-webclient library.| |false|
--- a/docs/generators/protobuf-schema.md
+++ b/docs/generators/protobuf-schema.md
@@ -19,14 +19,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |addJsonNameAnnotation|Append &quot;json_name&quot; annotation to message field when the specification name differs from the protobuf field name| |false|
-|aggregateModelsName|Aggregated model filename. If set, all generated models will be combined into this single file.| |null|
-|customOptionsApi|Custom options for the api files.| |null|
-|customOptionsModel|Custom options for the model files.| |null|
 |numberedFieldNumberList|Field numbers in order.| |false|
 |startEnumsWithUnspecified|Introduces &quot;UNSPECIFIED&quot; as the first element of enumerations.| |false|
-|supportMultipleResponses|Support multiple responses| |true|
-|useSimplifiedEnumNames|Use a simple name for enums| |false|
-|wrapComplexType|Generate Additional message for complex type| |true|

 ## IMPORT MAPPING

--- a/docs/generators/python.md
+++ b/docs/generators/python.md
@@ -10,7 +10,7 @@ title: Documentation for the python Generator
 | generator stability | STABLE | |
 | generator type | CLIENT | |
 | generator language | Python | |
-| generator language version | 3.9+ | |
+| generator language version | 3.8+ | |
 | generator default templating engine | mustache | |
 | helpTxt | Generates a Python client library. | |

--- a/docs/generators/scala-sttp.md
+++ b/docs/generators/scala-sttp.md
@@ -20,7 +20,6 @@ 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|
-|circeVersion|The version of circe library| |0.14.1|
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (preferred for JDK 1.8+)</dd></dl>|java8|
 |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|
--- a/docs/generators/spring.md
+++ b/docs/generators/spring.md
@@ -47,7 +47,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |documentationProvider|Select the OpenAPI documentation provider.|<dl><dt>**none**</dt><dd>Do not publish an OpenAPI specification.</dd><dt>**source**</dt><dd>Publish the original input OpenAPI specification.</dd><dt>**springfox**</dt><dd>Generate an OpenAPI 2 (fka Swagger RESTful API Documentation Specification) specification using SpringFox 2.x. Deprecated (for removal); use springdoc instead.</dd><dt>**springdoc**</dt><dd>Generate an OpenAPI 3 specification using SpringDoc.</dd></dl>|springdoc|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
+|enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE' and 'legacy'| |MACRO_CASE|
 |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|
 |generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
@@ -92,7 +92,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |unhandledException|Declare operation methods to throw a generic exception and allow unhandled exceptions (useful for Spring `@ControllerAdvice` directives).| |false|
 |useBeanValidation|Use BeanValidation API annotations| |true|
 |useEnumCaseInsensitive|Use `equalsIgnoreCase` when String for enum comparison| |false|
-|useFeignClientContextId|Whether to generate Feign client with contextId parameter.| |true|
 |useFeignClientUrl|Whether to generate Feign client with url parameter.| |true|
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|
@@ -100,7 +99,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useResponseEntity|Use the `ResponseEntity` type to wrap return values of generated API methods. If disabled, method are annotated using a `@ResponseStatus` annotation, which has the status of the first response declared in the Api definition| |true|
 |useSealed|Whether to generate sealed model interfaces and classes| |false|
 |useSpringBoot3|Generate code and provide dependencies for use with Spring Boot 3.x. (Use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.| |false|
-|useSpringBuiltInValidation|Disable `@Validated` at the class level when using built-in validation.| |false|
 |useSpringController|Annotate the generated API as a Spring Controller| |false|
 |useSwaggerUI|Open the OpenApi specification in swagger-ui. Will also import and configure needed dependencies| |true|
 |useTags|use tags for creating interface and controller classnames| |false|
@@ -120,7 +118,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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, OPERATION_PARAMETER|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` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.|OPERATION|false
+|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, OPERATION_PARAMETER|null

--- a/docs/generators/swift6.md
+++ b/docs/generators/swift6.md
@@ -56,7 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useBacktickEscapes|Escape reserved words using backticks (default: false)| |false|
 |useClasses|Use final classes for models instead of structs (default: false)| |false|
 |useCustomDateWithoutTime|Uses a custom type to decode and encode dates without time information to support OpenAPIs date format (default: false)| |false|
-|useParameterConvertible|Make models conform to ParameterConvertible protocol (default: true)| |true|
+|useJsonEncodable|Make models conform to JSONEncodable protocol (default: true)| |true|
 |useSPMFileStructure|Use SPM file structure and set the source path to Sources/{{projectName}} (default: true).| |null|
 |validatable|Make validation rules and validator for model properties (default: true)| |true|

--- a/modules/openapi-generator-cli/pom.xml
+++ b/modules/openapi-generator-cli/pom.xml
@@ -4,7 +4,7 @@
        <groupId>org.openapitools</groupId>
        <artifactId>openapi-generator-project</artifactId>
        <!-- RELEASE_VERSION -->
-        <version>7.13.0</version>
+        <version>7.13.0-SNAPSHOT</version>
        <!-- /RELEASE_VERSION -->
        <relativePath>../../pom.xml</relativePath>
    </parent>
--- a/modules/openapi-generator-core/pom.xml
+++ b/modules/openapi-generator-core/pom.xml
@@ -6,7 +6,7 @@
    <artifactId>openapi-generator-project</artifactId>
    <groupId>org.openapitools</groupId>
    <!-- RELEASE_VERSION -->
-    <version>7.13.0</version>
+    <version>7.13.0-SNAPSHOT</version>
    <!-- /RELEASE_VERSION -->
    <relativePath>../../pom.xml</relativePath>
  </parent>
--- a/modules/openapi-generator-gradle-plugin/gradle.properties
+++ b/modules/openapi-generator-gradle-plugin/gradle.properties
@@ -1,5 +1,5 @@
 # RELEASE_VERSION
-openApiGeneratorVersion=7.13.0
+openApiGeneratorVersion=7.13.0-SNAPSHOT
 # /RELEASE_VERSION

 # BEGIN placeholders
--- a/modules/openapi-generator-gradle-plugin/pom.xml
+++ b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -4,7 +4,7 @@
        <groupId>org.openapitools</groupId>
        <artifactId>openapi-generator-project</artifactId>
        <!-- RELEASE_VERSION -->
-        <version>7.13.0</version>
+        <version>7.13.0-SNAPSHOT</version>
        <!-- /RELEASE_VERSION -->
        <relativePath>../../pom.xml</relativePath>
    </parent>
--- a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
+++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
@@ -1,3 +1,3 @@
 # RELEASE_VERSION
-openApiGeneratorVersion=7.13.0
+openApiGeneratorVersion=7.13.0-SNAPSHOT
 # /RELEASE_VERSION
--- a/modules/openapi-generator-maven-plugin/examples/java-client.xml
+++ b/modules/openapi-generator-maven-plugin/examples/java-client.xml
@@ -13,7 +13,7 @@
                <groupId>org.openapitools</groupId>
                <artifactId>openapi-generator-maven-plugin</artifactId>
                <!-- RELEASE_VERSION -->
-                <version>7.13.0</version>
+                <version>7.13.0-SNAPSHOT</version>
                <!-- /RELEASE_VERSION -->
                <executions>
                    <execution>
--- a/modules/openapi-generator-maven-plugin/examples/kotlin.xml
+++ b/modules/openapi-generator-maven-plugin/examples/kotlin.xml
@@ -15,7 +15,7 @@
 				<groupId>org.openapitools</groupId>
 				<artifactId>openapi-generator-maven-plugin</artifactId>
 				<!-- RELEASE_VERSION -->
-				<version>7.13.0</version>
+				<version>7.13.0-SNAPSHOT</version>
 				<!-- /RELEASE_VERSION -->
 				<executions>
 					<execution>
--- a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
+++ b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
@@ -19,7 +19,7 @@
                <groupId>org.openapitools</groupId>
                <artifactId>openapi-generator-maven-plugin</artifactId>
                <!-- RELEASE_VERSION -->
-                <version>7.13.0</version>
+                <version>7.13.0-SNAPSHOT</version>
                <!-- /RELEASE_VERSION -->
                <dependencies>
                    <dependency>
--- a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
+++ b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
@@ -13,7 +13,7 @@
                <groupId>org.openapitools</groupId>
                <artifactId>openapi-generator-maven-plugin</artifactId>
                <!-- RELEASE_VERSION -->
-                <version>7.13.0</version>
+                <version>7.13.0-SNAPSHOT</version>
                <!-- /RELEASE_VERSION -->
                <executions>
                    <execution>
--- a/modules/openapi-generator-maven-plugin/examples/non-java.xml
+++ b/modules/openapi-generator-maven-plugin/examples/non-java.xml
@@ -13,7 +13,7 @@
                <groupId>org.openapitools</groupId>
                <artifactId>openapi-generator-maven-plugin</artifactId>
                <!-- RELEASE_VERSION -->
-                <version>7.13.0</version>
+                <version>7.13.0-SNAPSHOT</version>
                <!-- /RELEASE_VERSION -->
                <executions>
                    <execution>
--- a/modules/openapi-generator-maven-plugin/examples/spring.xml
+++ b/modules/openapi-generator-maven-plugin/examples/spring.xml
@@ -20,7 +20,7 @@
                <groupId>org.openapitools</groupId>
                <artifactId>openapi-generator-maven-plugin</artifactId>
                <!-- RELEASE_VERSION -->
-                <version>7.13.0</version>
+                <version>7.13.0-SNAPSHOT</version>
                <!-- /RELEASE_VERSION -->
                <executions>
                    <execution>
--- a/modules/openapi-generator-maven-plugin/pom.xml
+++ b/modules/openapi-generator-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
        <groupId>org.openapitools</groupId>
        <artifactId>openapi-generator-project</artifactId>
        <!-- RELEASE_VERSION -->
-        <version>7.13.0</version>
+        <version>7.13.0-SNAPSHOT</version>
        <!-- /RELEASE_VERSION -->
        <relativePath>../../pom.xml</relativePath>
    </parent>
--- a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
+++ b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
@@ -116,24 +116,6 @@ public class CodeGenMojo extends AbstractMojo {
    @Parameter(name = "mergedFileName", property = "openapi.generator.maven.plugin.mergedFileName", defaultValue = "_merged_spec")
    private String mergedFileName;

-    /**
-     * Name that will appear in the info section of the merged spec
-     */
-    @Parameter(name = "mergedFileInfoName", property = "openapi.generator.maven.plugin.mergedFileInfoName", defaultValue = "merged spec")
-    private String mergedFileInfoName;
-
-    /**
-     * Description that will appear in the info section of the merged spec
-     */
-    @Parameter(name = "mergedFileInfoDescription", property = "openapi.generator.maven.plugin.mergedFileInfoDescription", defaultValue = "merged spec")
-    private String mergedFileInfoDescription;
-
-    /**
-     * Version that will appear in the info section of the merged spec
-     */
-    @Parameter(name = "mergedFileInfoVersion", property = "openapi.generator.maven.plugin.mergedFileInfoVersion", defaultValue = "1.0.0")
-    private String mergedFileInfoVersion;
-
    /**
     * Git host, e.g. gitlab.com.
     */
@@ -563,8 +545,7 @@ public class CodeGenMojo extends AbstractMojo {
        }

        if (StringUtils.isNotBlank(inputSpecRootDirectory)) {
-            inputSpec = new MergedSpecBuilder(inputSpecRootDirectory, mergedFileName,
-                    mergedFileInfoName, mergedFileInfoDescription, mergedFileInfoVersion)
+            inputSpec = new MergedSpecBuilder(inputSpecRootDirectory, mergedFileName)
                    .buildMergedSpec();
            LOGGER.info("Merge input spec would be used - {}", inputSpec);
        }
--- a/modules/openapi-generator-online/pom.xml
+++ b/modules/openapi-generator-online/pom.xml
@@ -4,7 +4,7 @@
        <groupId>org.openapitools</groupId>
        <artifactId>openapi-generator-project</artifactId>
        <!-- RELEASE_VERSION -->
-        <version>7.13.0</version>
+        <version>7.13.0-SNAPSHOT</version>
        <!-- /RELEASE_VERSION -->
        <relativePath>../../pom.xml</relativePath>
    </parent>
--- a/modules/openapi-generator/pom.xml
+++ b/modules/openapi-generator/pom.xml
@@ -4,7 +4,7 @@
        <groupId>org.openapitools</groupId>
        <artifactId>openapi-generator-project</artifactId>
        <!-- RELEASE_VERSION -->
-        <version>7.13.0</version>
+        <version>7.13.0-SNAPSHOT</version>
        <!-- /RELEASE_VERSION -->
        <relativePath>../../pom.xml</relativePath>
    </parent>
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -65,7 +65,6 @@ import org.openapitools.codegen.model.WebhooksMap;
 import org.openapitools.codegen.serializer.SerializerUtils;
 import org.openapitools.codegen.templating.MustacheEngineAdapter;
 import org.openapitools.codegen.templating.mustache.*;
-import org.openapitools.codegen.utils.ExamplesUtils;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.openapitools.codegen.utils.OneOfImplementorAdditionalData;
 import org.slf4j.Logger;
@@ -2339,10 +2338,6 @@ public class DefaultCodegen implements CodegenConfig {
        return ModelUtils.unaliasSchema(this.openAPI, schema, schemaMapping);
    }

-    private List<Map<String, Object>> unaliasExamples(Map<String, Example> examples){
-        return ExamplesUtils.unaliasExamples(this.openAPI, examples);
-    }
-
    /**
     * Return a string representation of the schema type, resolving aliasing and references if necessary.
     *
@@ -4926,13 +4921,9 @@ public class DefaultCodegen implements CodegenConfig {
        }
        r.schema = responseSchema;
        r.message = escapeText(response.getDescription());
-
-        // adding examples to API responses
-        Map<String, Example> examples = ExamplesUtils.getExamplesFromResponse(openAPI, response);
-
-        if (examples != null && !examples.isEmpty())
-            r.examples = unaliasExamples(examples);
-
+        // TODO need to revise and test examples in responses
+        // ApiResponse does not support examples at the moment
+        //r.examples = toExamples(response.getExamples());
        r.jsonSchema = Json.pretty(response);
        if (response.getExtensions() != null && !response.getExtensions().isEmpty()) {
            r.vendorExtensions.putAll(response.getExtensions());
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -261,7 +261,7 @@ public class DefaultGenerator implements Generator {
                if (version.atLeast("3.1.0")) {
                    config.openapiNormalizer().put("NORMALIZE_31SPEC", "true");
                }
-                OpenAPINormalizer openapiNormalizer = OpenAPINormalizer.createNormalizer(openAPI, config.openapiNormalizer());
+                OpenAPINormalizer openapiNormalizer = new OpenAPINormalizer(openAPI, config.openapiNormalizer());
                openapiNormalizer.normalize();
            }
        } catch (Exception e) {
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
@@ -30,7 +30,6 @@ import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.parameters.RequestBody;
 import io.swagger.v3.oas.models.responses.ApiResponse;
 import io.swagger.v3.oas.models.responses.ApiResponses;
-import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
@@ -418,18 +417,7 @@ public class InlineModelResolver {
                    if (schema.getAllOf().size() == 1) {
                        // handle earlier in this function when looping through properties
                    } else if (schema.getAllOf().size() > 1) {
-                        // Check if there is only one "non metadata" schema.
-                        // For example, there may be an `description` only schema that is used to override the descrption.
-                        // In these cases, we can simply discard those schemas.
-                        List<Schema> nonMetadataOnlySchemas = (List<Schema>) schema.getAllOf().stream()
-                                .filter(v -> ModelUtils.isMetadataOnlySchema((Schema) v))
-                                .collect(Collectors.toList());
-
-                        if (nonMetadataOnlySchemas.size() == 1) {
-                            schema.setAllOf(nonMetadataOnlySchemas);
-                        } else {
-                            LOGGER.warn("allOf schema `{}` containing multiple types (not model) is not supported at the moment.", schema.getName());
-                        }
+                        LOGGER.warn("allOf schema `{}` containing multiple types (not model) is not supported at the moment.", schema.getName());
                    } else {
                        LOGGER.error("allOf schema `{}` contains no items.", schema.getName());
                    }
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java
@@ -26,29 +26,25 @@ import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.parameters.RequestBody;
 import io.swagger.v3.oas.models.responses.ApiResponse;
 import io.swagger.v3.oas.models.responses.ApiResponses;
-import io.swagger.v3.oas.models.security.SecurityScheme;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;

-import static org.openapitools.codegen.utils.ModelUtils.simplyOneOfAnyOfWithOnlyOneNonNullSubSchema;
 import static org.openapitools.codegen.utils.StringUtils.getUniqueString;

 public class OpenAPINormalizer {
-    protected OpenAPI openAPI;
+    private OpenAPI openAPI;
    private Map<String, String> inputRules = new HashMap<>();
    private Map<String, Boolean> rules = new HashMap<>();

    private TreeSet<String> anyTypeTreeSet = new TreeSet<>();

-    protected final Logger LOGGER = LoggerFactory.getLogger(OpenAPINormalizer.class);
+    final Logger LOGGER = LoggerFactory.getLogger(OpenAPINormalizer.class);

    Set<String> ruleNames = new TreeSet<>();
    Set<String> rulesDefaultToTrue = new TreeSet<>();
@@ -62,9 +58,6 @@ public class OpenAPINormalizer {
    final String DISABLE_ALL = "DISABLE_ALL";
    boolean disableAll;

-    // when defined, use the class name to instantiate the normalizer
-    static final String NORMALIZER_CLASS = "NORMALIZER_CLASS";
-
    // when set to true, $ref in allOf is treated as parent so that x-parent: true will be added
    // to the schema in $ref (if x-parent is not present)
    final String REF_AS_PARENT_IN_ALLOF = "REF_AS_PARENT_IN_ALLOF";
@@ -108,10 +101,6 @@ public class OpenAPINormalizer {
    String fixDuplicatedOperationId;
    HashSet<String> operationIdSet = new HashSet<>();

-    // when set to true, if a securityScheme is found with the specified name, it will be converted to bearerAuth
-    final String SET_BEARER_AUTH_FOR_NAME = "SET_BEARER_AUTH_FOR_NAME";
-    String bearerAuthSecuritySchemeName;
-
    // 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
    final String ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE = "ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE";
@@ -152,25 +141,6 @@ public class OpenAPINormalizer {

    // ============= end of rules =============

-    /**
-     * Factory constructor for OpenAPINormalizer.
-     *
-     * Default can be overriden by setting the NORMALIZER_CLASS rule
-     */
-    public static OpenAPINormalizer createNormalizer(OpenAPI openAPI, Map<String, String> inputRules) {
-        if (inputRules.containsKey(NORMALIZER_CLASS)) {
-            try {
-                Class clazz = Class.forName(inputRules.get(NORMALIZER_CLASS));
-                Constructor constructor = clazz.getConstructor(OpenAPI.class, Map.class);
-                return (OpenAPINormalizer) constructor.newInstance(openAPI, inputRules);
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-        } else {
-            return new OpenAPINormalizer(openAPI, inputRules);
-        }
-    }
-
    /**
     * Initializes OpenAPI Normalizer with a set of rules
     *
@@ -187,7 +157,6 @@ public class OpenAPINormalizer {
        }

        // a set of ruleNames
-        ruleNames.add(NORMALIZER_CLASS);
        ruleNames.add(REF_AS_PARENT_IN_ALLOF);
        ruleNames.add(REMOVE_ANYOF_ONEOF_AND_KEEP_PROPERTIES_ONLY);
        ruleNames.add(SIMPLIFY_ANYOF_STRING_AND_ENUM_STRING);
@@ -198,7 +167,6 @@ public class OpenAPINormalizer {
        ruleNames.add(SET_TAGS_TO_OPERATIONID);
        ruleNames.add(SET_TAGS_TO_VENDOR_EXTENSION);
        ruleNames.add(FIX_DUPLICATED_OPERATIONID);
-        ruleNames.add(SET_BEARER_AUTH_FOR_NAME);
        ruleNames.add(ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE);
        ruleNames.add(REFACTOR_ALLOF_WITH_PROPERTIES_ONLY);
        ruleNames.add(NORMALIZE_31SPEC);
@@ -333,18 +301,13 @@ public class OpenAPINormalizer {
                LOGGER.error("SET_PRIMITIVE_TYPES_TO_NULLABLE rule must be in the form of `string|integer|number|boolean`, e.g. `string`, `integer|number`: {}", inputRules.get(SET_PRIMITIVE_TYPES_TO_NULLABLE));
            }
        }
-
-        bearerAuthSecuritySchemeName = inputRules.get(SET_BEARER_AUTH_FOR_NAME);
-        if (bearerAuthSecuritySchemeName != null) {
-            rules.put(SET_BEARER_AUTH_FOR_NAME, true);
-        }
    }

    /**
     * Normalizes the OpenAPI input, which may not perfectly conform to
     * the specification.
     */
-    protected void normalize() {
+    void normalize() {
        if (rules == null || rules.isEmpty() || disableAll) {
            return;
        }
@@ -359,7 +322,6 @@ public class OpenAPINormalizer {

        normalizeInfo();
        normalizePaths();
-        normalizeComponentsSecuritySchemes();
        normalizeComponentsSchemas();
        normalizeComponentsResponses();
    }
@@ -367,7 +329,7 @@ public class OpenAPINormalizer {
    /**
     * Pre-populate info if it's not defined.
     */
-    protected void normalizeInfo() {
+    private void normalizeInfo() {
        if (this.openAPI.getInfo() == null) {
            Info info = new Info();
            info.setTitle("OpenAPI");
@@ -380,7 +342,7 @@ public class OpenAPINormalizer {
    /**
     * Normalizes inline models in Paths
     */
-    protected void normalizePaths() {
+    private void normalizePaths() {
        Paths paths = openAPI.getPaths();
        if (paths == null) {
            return;
@@ -455,7 +417,7 @@ public class OpenAPINormalizer {
     *
     * @param operation Operation
     */
-    protected void normalizeOperation(Operation operation) {
+    private void normalizeOperation(Operation operation) {
        processRemoveXInternalFromOperation(operation);

        processKeepOnlyFirstTagInOperation(operation);
@@ -474,7 +436,7 @@ public class OpenAPINormalizer {
     *
     * @param content target content
     */
-    protected void normalizeContent(Content content) {
+    private void normalizeContent(Content content) {
        if (content == null || content.isEmpty()) {
            return;
        }
@@ -498,7 +460,7 @@ public class OpenAPINormalizer {
     *
     * @param operation target operation
     */
-    protected void normalizeRequestBody(Operation operation) {
+    private void normalizeRequestBody(Operation operation) {
        RequestBody requestBody = operation.getRequestBody();
        if (requestBody == null) {
            return;
@@ -522,7 +484,7 @@ public class OpenAPINormalizer {
     *
     * @param parameters List parameters
     */
-    protected void normalizeParameters(List<Parameter> parameters) {
+    private void normalizeParameters(List<Parameter> parameters) {
        if (parameters == null) {
            return;
        }
@@ -545,7 +507,7 @@ public class OpenAPINormalizer {
     *
     * @param operation target operation
     */
-    protected void normalizeResponses(Operation operation) {
+    private void normalizeResponses(Operation operation) {
        ApiResponses responses = operation.getResponses();
        if (responses == null) {
            return;
@@ -561,7 +523,7 @@ public class OpenAPINormalizer {
     *
     * @param apiResponse API response
     */
-    protected void normalizeResponse(ApiResponse apiResponse) {
+    private void normalizeResponse(ApiResponse apiResponse) {
        if (apiResponse != null) {
            normalizeContent(ModelUtils.getReferencedApiResponse(openAPI, apiResponse).getContent());
            normalizeHeaders(ModelUtils.getReferencedApiResponse(openAPI, apiResponse).getHeaders());
@@ -573,7 +535,7 @@ public class OpenAPINormalizer {
     *
     * @param headers a map of headers
     */
-    protected void normalizeHeaders(Map<String, Header> headers) {
+    private void normalizeHeaders(Map<String, Header> headers) {
        if (headers == null || headers.isEmpty()) {
            return;
        }
@@ -585,40 +547,10 @@ public class OpenAPINormalizer {
        }
    }

-    /**
-     * Normalizes securitySchemes in components
-     */
-    protected void normalizeComponentsSecuritySchemes() {
-         if (StringUtils.isEmpty(bearerAuthSecuritySchemeName)) {
-             return;
-         }
-
-        Map<String, SecurityScheme> schemes = openAPI.getComponents().getSecuritySchemes();
-        if (schemes == null) {
-            return;
-        }
-
-        for (String schemeKey : schemes.keySet()) {
-            if (schemeKey.equals(bearerAuthSecuritySchemeName)) {
-                SecurityScheme scheme = schemes.get(schemeKey);
-                scheme.setType(SecurityScheme.Type.HTTP);
-                scheme.setScheme("bearer");
-                scheme.setIn(null);
-                scheme.setName(null);
-                scheme.setBearerFormat(null);
-                scheme.setFlows(null);
-                scheme.setOpenIdConnectUrl(null);
-                scheme.setExtensions(null);
-                scheme.set$ref(null);
-                schemes.put(schemeKey, scheme);
-            }
-        }
-    }
-
    /**
     * Normalizes schemas in components
     */
-    protected void normalizeComponentsSchemas() {
+    private void normalizeComponentsSchemas() {
        Map<String, Schema> schemas = openAPI.getComponents().getSchemas();
        if (schemas == null) {
            return;
@@ -628,7 +560,7 @@ public class OpenAPINormalizer {
        for (String schemaName : schemaNames) {
            Schema schema = schemas.get(schemaName);
            if (schema == null) {
-                LOGGER.warn("{} not found in openapi/components/schemas.", schemaName);
+                LOGGER.warn("{} not fount found in openapi/components/schemas.", schemaName);
            } else {
                // remove x-internal if needed
                if (schema.getExtensions() != null && getRule(REMOVE_X_INTERNAL)) {
@@ -649,7 +581,7 @@ public class OpenAPINormalizer {
    /**
     * Normalizes schemas in component's responses.
     */
-    protected void normalizeComponentsResponses() {
+    private void normalizeComponentsResponses() {
        Map<String, ApiResponse> apiResponses = openAPI.getComponents().getResponses();
        if (apiResponses == null) {
            return;
@@ -701,7 +633,7 @@ public class OpenAPINormalizer {

    }

-    protected boolean isSelfReference(String name, Schema subSchema) {
+    private boolean isSelfReference(String name, Schema subSchema) {
        if (subSchema != null && name.equals(ModelUtils.getSimpleRef(subSchema.get$ref()))) {
            return true;
        } else {
@@ -717,10 +649,20 @@ public class OpenAPINormalizer {
     * @return Schema
     */
    public Schema normalizeSchema(Schema schema, Set<Schema> visitedSchemas) {
-        if (skipNormalization(schema, visitedSchemas)) {
+        if (schema == null) {
            return schema;
        }
-        markSchemaAsVisited(schema, visitedSchemas);
+
+        if (StringUtils.isNotEmpty(schema.get$ref())) {
+            // no need to process $ref
+            return schema;
+        }
+
+        if (visitedSchemas.contains(schema)) {
+            return schema; // skip due to circular reference
+        } else {
+            visitedSchemas.add(schema);
+        }

        if (ModelUtils.isArraySchema(schema)) { // array
            Schema result = normalizeArraySchema(schema);
@@ -774,73 +716,35 @@ public class OpenAPINormalizer {
        } else {
            throw new RuntimeException("Unknown schema type found in normalizer: " + schema);
        }
+
        return schema;
    }

-
-    /**
-     * Check if normalization is needed.
-     *
-     * No normalization needed if the schema is null or is a $ref or already processed.
-     *
-     * @param schema         Schema
-     * @param visitedSchemas a set of visited schemas
-     * @return false if normalization is needed
-     */
-    protected boolean skipNormalization(Schema schema, Set<Schema> visitedSchemas) {
-        if (schema == null) {
-            return true;
-        }
-
-        if (StringUtils.isNotEmpty(schema.get$ref())) {
-            // no need to process $ref
-            return true;
-        }
-
-        if (visitedSchemas.contains(schema)) {
-            return true; // skip due to circular reference
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Add the schema to the collection of visited schemas.
-     *
-     * @param schema schema to add
-     * @param visitedSchemas current visited schemas
-     */
-    protected void markSchemaAsVisited(Schema schema, Set<Schema> visitedSchemas) {
-        if (schema != null) {
-            visitedSchemas.add(schema);
-        }
-    }
-
-    protected Schema normalizeArraySchema(Schema schema) {
+    private Schema normalizeArraySchema(Schema schema) {
        Schema result = processNormalize31Spec(schema, new HashSet<>());
        return processSetArraytoNullable(result);
    }

-    protected Schema normalizeMapSchema(Schema schema) {
+    private Schema normalizeMapSchema(Schema schema) {
        return processSetMapToNullable(schema);
    }

-    protected Schema normalizeSimpleSchema(Schema schema, Set<Schema> visitedSchemas) {
+    private Schema normalizeSimpleSchema(Schema schema, Set<Schema> visitedSchemas) {
        Schema result = processNormalize31Spec(schema, visitedSchemas);
        return processSetPrimitiveTypesToNullable(result);
    }

-    protected void normalizeBooleanSchema(Schema schema, Set<Schema> visitedSchemas) {
+    private void normalizeBooleanSchema(Schema schema, Set<Schema> visitedSchemas) {
        processSimplifyBooleanEnum(schema);
        processSetPrimitiveTypesToNullable(schema);
    }

-    protected void normalizeIntegerSchema(Schema schema, Set<Schema> visitedSchemas) {
+    private void normalizeIntegerSchema(Schema schema, Set<Schema> visitedSchemas) {
        processAddUnsignedToIntegerWithInvalidMaxValue(schema);
        processSetPrimitiveTypesToNullable(schema);
    }

-    protected void normalizeProperties(Map<String, Schema> properties, Set<Schema> visitedSchemas) {
+    private void normalizeProperties(Map<String, Schema> properties, Set<Schema> visitedSchemas) {
        if (properties == null) {
            return;
        }
@@ -856,7 +760,7 @@ public class OpenAPINormalizer {
     *
     * @param schema Schema
     */
-    protected void removeUnsupportedSchemasFromAllOf(Schema schema) {
+    private void removeUnsupportedSchemasFromAllOf(Schema schema) {
        if (schema.getAllOf() == null) {
            return;
        }
@@ -879,7 +783,7 @@ public class OpenAPINormalizer {
        }
    }

-    protected Schema normalizeAllOf(Schema schema, Set<Schema> visitedSchemas) {
+    private Schema normalizeAllOf(Schema schema, Set<Schema> visitedSchemas) {
        removeUnsupportedSchemasFromAllOf(schema);

        if (schema.getAllOf() == null) {
@@ -900,7 +804,7 @@ public class OpenAPINormalizer {
        return schema;
    }

-    protected Schema normalizeAllOfWithProperties(Schema schema, Set<Schema> visitedSchemas) {
+    private Schema normalizeAllOfWithProperties(Schema schema, Set<Schema> visitedSchemas) {
        removeUnsupportedSchemasFromAllOf(schema);

        if (schema.getAllOf() == null) {
@@ -921,7 +825,7 @@ public class OpenAPINormalizer {
        return schema;
    }

-    protected Schema normalizeOneOf(Schema schema, Set<Schema> visitedSchemas) {
+    private Schema normalizeOneOf(Schema schema, Set<Schema> visitedSchemas) {
        // simplify first as the schema may no longer be a oneOf after processing the rule below
        schema = processSimplifyOneOf(schema);

@@ -949,7 +853,7 @@ public class OpenAPINormalizer {
        return schema;
    }

-    protected Schema normalizeAnyOf(Schema schema, Set<Schema> visitedSchemas) {
+    private Schema normalizeAnyOf(Schema schema, Set<Schema> visitedSchemas) {
        for (int i = 0; i < schema.getAnyOf().size(); i++) {
            // normalize anyOf sub schemas one by one
            Object item = schema.getAnyOf().get(i);
@@ -973,7 +877,7 @@ public class OpenAPINormalizer {
        return normalizeSchema(processSimplifyAnyOfStringAndEnumString(schema), visitedSchemas);
    }

-    protected Schema normalizeComplexComposedSchema(Schema schema, Set<Schema> visitedSchemas) {
+    private Schema normalizeComplexComposedSchema(Schema schema, Set<Schema> visitedSchemas) {
        // loop through properties, if any
        if (schema.getProperties() != null && !schema.getProperties().isEmpty()) {
            normalizeProperties(schema.getProperties(), visitedSchemas);
@@ -992,7 +896,7 @@ public class OpenAPINormalizer {
     *
     * @param schema Schema
     */
-    protected void processUseAllOfRefAsParent(Schema schema) {
+    private void processUseAllOfRefAsParent(Schema schema) {
        if (!getRule(REF_AS_PARENT_IN_ALLOF)) {
            return;
        }
@@ -1038,7 +942,7 @@ public class OpenAPINormalizer {
     *
     * @param operation Operation
     */
-    protected void processRemoveXInternalFromOperation(Operation operation) {
+    private void processRemoveXInternalFromOperation(Operation operation) {
        if (!getRule(REMOVE_X_INTERNAL)) {
            return;
        }
@@ -1058,7 +962,7 @@ public class OpenAPINormalizer {
     *
     * @param operation Operation
     */
-    protected void processKeepOnlyFirstTagInOperation(Operation operation) {
+    private void processKeepOnlyFirstTagInOperation(Operation operation) {
        if (!getRule(KEEP_ONLY_FIRST_TAG_IN_OPERATION)) {
            return;
        }
@@ -1076,7 +980,7 @@ public class OpenAPINormalizer {
     *
     * @param operation Operation
     */
-    protected void processSetTagsForAllOperations(Operation operation) {
+    private void processSetTagsForAllOperations(Operation operation) {
        if (StringUtils.isEmpty(setTagsForAllOperations)) {
            return;
        }
@@ -1090,7 +994,7 @@ public class OpenAPINormalizer {
     *
     * @param operation Operation
     */
-    protected void processSetTagsToOperationId(Operation operation) {
+    private void processSetTagsToOperationId(Operation operation) {
        if (!getRule(SET_TAGS_TO_OPERATIONID)) {
            return;
        }
@@ -1108,7 +1012,7 @@ public class OpenAPINormalizer {
     *
     * @param operation Operation
     */
-    protected void processSetTagsToVendorExtension(Operation operation) {
+    private void processSetTagsToVendorExtension(Operation operation) {
        if (StringUtils.isEmpty(setTagsToVendorExtension)) {
            return;
        }
@@ -1131,7 +1035,7 @@ public class OpenAPINormalizer {
        }
    }

-    protected void processFixDuplicatedOperationId(Operation operation) {
+    private void processFixDuplicatedOperationId(Operation operation) {
        if (!getRule(FIX_DUPLICATED_OPERATIONID)) {
            return;
        }
@@ -1149,13 +1053,14 @@ public class OpenAPINormalizer {
        }
    }

+
    /**
     * If the schema contains anyOf/oneOf and properties, remove oneOf/anyOf as these serve as rules to
     * ensure inter-dependency between properties. It's a workaround as such validation is not supported at the moment.
     *
     * @param schema Schema
     */
-    protected void processRemoveAnyOfOneOfAndKeepPropertiesOnly(Schema schema) {
+    private void processRemoveAnyOfOneOfAndKeepPropertiesOnly(Schema schema) {
        if (!getRule(REMOVE_ANYOF_ONEOF_AND_KEEP_PROPERTIES_ONLY)) {
            return;
        }
@@ -1177,7 +1082,7 @@ public class OpenAPINormalizer {
     * @param schema Schema
     * @return Schema
     */
-    protected Schema processSimplifyAnyOfStringAndEnumString(Schema schema) {
+    private Schema processSimplifyAnyOfStringAndEnumString(Schema schema) {
        if (!getRule(SIMPLIFY_ANYOF_STRING_AND_ENUM_STRING)) {
            return schema;
        }
@@ -1233,7 +1138,7 @@ public class OpenAPINormalizer {
     * @param schema Schema
     * @return Schema
     */
-    protected Schema processSimplifyOneOf(Schema schema) {
+    private Schema processSimplifyOneOf(Schema schema) {
        if (!getRule(SIMPLIFY_ONEOF_ANYOF)) {
            return schema;
        }
@@ -1267,7 +1172,17 @@ public class OpenAPINormalizer {
                }
            }

-            schema = simplyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, schema, oneOfSchemas);
+            if (oneOfSchemas.removeIf(oneOf -> ModelUtils.isNullTypeSchema(openAPI, oneOf))) {
+                schema.setNullable(true);
+
+                // if only one element left, simplify to just the element (schema)
+                if (oneOfSchemas.size() == 1) {
+                    if (Boolean.TRUE.equals(schema.getNullable())) { // retain nullable setting
+                        ((Schema) oneOfSchemas.get(0)).setNullable(true);
+                    }
+                    return (Schema) oneOfSchemas.get(0);
+                }
+            }

            if (ModelUtils.isIntegerSchema(schema) || ModelUtils.isNumberSchema(schema) || ModelUtils.isStringSchema(schema)) {
                // TODO convert oneOf const to enum
@@ -1284,7 +1199,7 @@ public class OpenAPINormalizer {
     * @param schema Schema
     * @return Schema
     */
-    protected Schema processSetArraytoNullable(Schema schema) {
+    private Schema processSetArraytoNullable(Schema schema) {
        if (!getRule(SET_CONTAINER_TO_NULLABLE)) {
            return schema;
        }
@@ -1308,7 +1223,7 @@ public class OpenAPINormalizer {
     * @param schema Schema
     * @return Schema
     */
-    protected Schema processSetPrimitiveTypesToNullable(Schema schema) {
+    private Schema processSetPrimitiveTypesToNullable(Schema schema) {
        if (!getRule(SET_PRIMITIVE_TYPES_TO_NULLABLE)) {
            return schema;
        }
@@ -1326,7 +1241,7 @@ public class OpenAPINormalizer {
        return schema;
    }

-    protected Schema setNullable(Schema schema) {
+    private Schema setNullable(Schema schema) {
        if (schema.getNullable() != null || (schema.getExtensions() != null && schema.getExtensions().containsKey("x-nullable"))) {
            // already set, don't overwrite
            return schema;
@@ -1341,7 +1256,7 @@ public class OpenAPINormalizer {
     * @param schema Schema
     * @return Schema
     */
-    protected Schema processSetMapToNullable(Schema schema) {
+    private Schema processSetMapToNullable(Schema schema) {
        if (!getRule(SET_CONTAINER_TO_NULLABLE)) {
            return schema;
        }
@@ -1360,7 +1275,7 @@ public class OpenAPINormalizer {
     * @param schema Schema
     * @return Schema
     */
-    protected Schema processSimplifyAnyOf(Schema schema) {
+    private Schema processSimplifyAnyOf(Schema schema) {
        if (!getRule(SIMPLIFY_ONEOF_ANYOF)) {
            return schema;
        }
@@ -1394,7 +1309,17 @@ public class OpenAPINormalizer {
                }
            }

-            schema = simplyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, schema, anyOfSchemas);
+            if (anyOfSchemas.removeIf(anyOf -> ModelUtils.isNullTypeSchema(openAPI, anyOf))) {
+                schema.setNullable(true);
+            }
+
+            // if only one element left, simplify to just the element (schema)
+            if (anyOfSchemas.size() == 1) {
+                if (Boolean.TRUE.equals(schema.getNullable())) { // retain nullable setting
+                    ((Schema) anyOfSchemas.get(0)).setNullable(true);
+                }
+                return (Schema) anyOfSchemas.get(0);
+            }
        }

        return schema;
@@ -1407,7 +1332,7 @@ public class OpenAPINormalizer {
     * @param schema Schema
     * @return Schema
     */
-    protected void processSimplifyBooleanEnum(Schema schema) {
+    private void processSimplifyBooleanEnum(Schema schema) {
        if (!getRule(SIMPLIFY_BOOLEAN_ENUM)) {
            return;
        }
@@ -1427,7 +1352,7 @@ public class OpenAPINormalizer {
     * @param schema Schema
     * @return Schema
     */
-    protected void processAddUnsignedToIntegerWithInvalidMaxValue(Schema schema) {
+    private void processAddUnsignedToIntegerWithInvalidMaxValue(Schema schema) {
        if (!getRule(ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE)) {
            return;
        }
@@ -1454,7 +1379,7 @@ public class OpenAPINormalizer {
     * @param schema Schema
     * @return Schema
     */
-    protected Schema processRefactorAllOfWithPropertiesOnly(Schema schema) {
+    private Schema processRefactorAllOfWithPropertiesOnly(Schema schema) {
        if (!getRule(REFACTOR_ALLOF_WITH_PROPERTIES_ONLY)) {
            return schema;
        }
@@ -1494,7 +1419,7 @@ public class OpenAPINormalizer {
     * @param visitedSchemas a set of visited schemas
     * @return Schema
     */
-    protected Schema processNormalize31Spec(Schema schema, Set<Schema> visitedSchemas) {
+    private Schema processNormalize31Spec(Schema schema, Set<Schema> visitedSchemas) {
        if (!getRule(NORMALIZE_31SPEC)) {
            return schema;
        }
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java
@@ -10,7 +10,7 @@ import java.util.List;
 public enum VendorExtension {

    X_IMPLEMENTS("x-implements", ExtensionLevel.MODEL, "Ability to specify interfaces that model must implements", "empty array"),
-    X_SPRING_PAGINATED("x-spring-paginated", ExtensionLevel.OPERATION, "Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.", "false"),
+    X_SPRING_PAGINATED("x-spring-paginated", ExtensionLevel.OPERATION, "Add org.springframework.data.domain.Pageable to controller method. Can be used to handle page & size query parameters", "false"),
    X_SPRING_PROVIDE_ARGS("x-spring-provide-args", ExtensionLevel.OPERATION, "Allows adding additional hidden parameters in the API specification to allow access to content such as header values or properties", "empty array"),
    X_DISCRIMINATOR_VALUE("x-discriminator-value", ExtensionLevel.MODEL, "Used with model inheritance to specify value for discriminator that identifies current model", ""),
    X_SETTER_EXTRA_ANNOTATION("x-setter-extra-annotation", ExtensionLevel.FIELD, "Custom annotation that can be specified over java setter for specific field", "When field is array & uniqueItems, then this extension is used to add `@JsonDeserialize(as = LinkedHashSet.class)` over setter, otherwise no value"),
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/GlobalSettings.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/GlobalSettings.java
@@ -38,13 +38,12 @@ public class GlobalSettings {

    private static final Logger LOGGER = LoggerFactory.getLogger(GlobalSettings.class);

-    private static ThreadLocal<Properties> properties = new InheritableThreadLocal<>() {
+    private static ThreadLocal<Properties> properties = new InheritableThreadLocal<Properties>() {
        @Override
        protected Properties initialValue() {
            // avoid using System.getProperties().clone() which is broken in Gradle - see https://github.com/gradle/gradle/issues/17344
            Properties copy = new Properties();
-            System.getProperties()
-                .forEach((k,v) -> copy.put(String.valueOf(k), String.valueOf(v)));
+            copy.putAll(System.getProperties());
            return copy;
        }
    };
@@ -70,10 +69,8 @@ public class GlobalSettings {
    }

    public static void log() {
-        if(LOGGER.isDebugEnabled()) {
-            StringWriter stringWriter = new StringWriter();
-            properties.get().list(new PrintWriter(stringWriter));
-            LOGGER.debug("GlobalSettings: {}", stringWriter);
-        }
+        StringWriter stringWriter = new StringWriter();
+        properties.get().list(new PrintWriter(stringWriter));
+        LOGGER.debug("GlobalSettings: {}", stringWriter);
    }
 }
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/MergedSpecBuilder.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/MergedSpecBuilder.java
@@ -25,21 +25,10 @@ public class MergedSpecBuilder {

    private final String inputSpecRootDirectory;
    private final String mergeFileName;
-    private final String mergedFileInfoName;
-    private final String mergedFileInfoDescription;
-    private final String mergedFileInfoVersion;

    public MergedSpecBuilder(final String rootDirectory, final String mergeFileName) {
-        this(rootDirectory, mergeFileName, "merged spec", "merged spec", "1.0.0");
-    }
-
-    public MergedSpecBuilder(final String rootDirectory, final String mergeFileName,
-                             final String mergedFileInfoName, final String mergedFileInfoDescription, final String mergedFileInfoVersion) {
        this.inputSpecRootDirectory = rootDirectory;
        this.mergeFileName = mergeFileName;
-        this.mergedFileInfoName = mergedFileInfoName;
-        this.mergedFileInfoDescription = mergedFileInfoDescription;
-        this.mergedFileInfoVersion = mergedFileInfoVersion;
    }

    public String buildMergedSpec() {
@@ -91,8 +80,8 @@ public class MergedSpecBuilder {
        return mergedFilePath.toString();
    }

-    private Map<String, Object> generatedMergedSpec(String openapiVersion, List<SpecWithPaths> allPaths) {
-        Map<String, Object> spec = generateHeader(openapiVersion, mergedFileInfoName, mergedFileInfoDescription, mergedFileInfoVersion);
+    private static Map<String, Object> generatedMergedSpec(String openapiVersion, List<SpecWithPaths> allPaths) {
+        Map<String, Object> spec = generateHeader(openapiVersion);
        Map<String, Object> paths = new HashMap<>();
        spec.put("paths", paths);

@@ -108,13 +97,13 @@ public class MergedSpecBuilder {
        return spec;
    }

-    private static Map<String, Object> generateHeader(String openapiVersion, String title, String description, String version) {
+    private static Map<String, Object> generateHeader(String openapiVersion) {
        Map<String, Object> map = new HashMap<>();
        map.put("openapi", openapiVersion);
        map.put("info", ImmutableMap.of(
-                "title", title,
-                "description", description,
-                "version", version
+                "title", "merged spec",
+                "description", "merged spec",
+                "version", "1.0.0"
        ));
        map.put("servers", Collections.singleton(
                ImmutableMap.of("url", "http://localhost:8080")
--- a/Show More
+++ b/Show More