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

This reverts commit 8a91858df5.

.circleci/config.yml

@@ -38,18 +38,9 @@ commands: # a reusable command with parameters
       - run:
           command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; '
       - run:
-          command: |
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       path.v1.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       path.v2.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.111     path.v3.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       operation.v1.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       operation.v2.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.111     operation.v3.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       server.v1.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       server.v2.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.111     server.v3.test.openapi-generator.tech"
-            sudo tee -a /etc/hosts \<<< "127.0.0.1       petstore.swagger.io"
-            cat /etc/hosts
+          command: |-
+            printf '127.0.0.1       petstore.swagger.io
+            ' | sudo tee -a /etc/hosts
       #    - run: docker pull openapitools/openapi-petstore
       #    - run: docker run -d -e OPENAPI_BASE_PATH=/v3 -e DISABLE_API_KEY=1 -e DISABLE_OAUTH=1 -p 80:8080 openapitools/openapi-petstore
       - run: docker pull swaggerapi/petstore
@@ -57,43 +48,54 @@ commands: # a reusable command with parameters
       - run: docker ps -a
       - run: sleep 30
       - run: cat /etc/hosts
-      - run: export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
+      # Test
+      - run: ./mvnw --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
       - run:
           name: "Setup custom environment variables"
           command: echo 'export CIRCLE_NODE_INDEX="<<parameters.nodeNo>>"' >> $BASH_ENV
       - run: ./CI/circle_parallel.sh
       # Save dependency cache
-      #- save_cache:
-      #    key: source-v2-{{ .Branch }}-{{ .Revision }}
-      #    paths:
-      #      # This is a broad list of cache paths to include many possible development environments
-      #      # You can probably delete some of these entries
-      #      - ~/.m2
-      #      - ~/.ivy2
-      #      - ~/.sbt
-      #      - ~/.bundle
-      #      - ~/.go_workspace
-      #      - ~/.gradle
-      #      - ".git"
-      #      - ~/.stack
-      #      - ~/R
-      ## save "default" cache using the key "source-v2-"
-      #- save_cache:
-      #    key: source-v2-
-      #    paths:
-      #      # This is a broad list of cache paths to include many possible development environments
-      #      # You can probably delete some of these entries
-      #      - vendor/bundle
-      #      - ~/.m2
-      #      - ~/.ivy2
-      #      - ~/.sbt
-      #      - ~/.bundle
-      #      - ~/.go_workspace
-      #      - ~/.gradle
-      #      - ~/.cache/bower
-      #      - ".git"
-      #      - ~/.stack
-      #      - ~/R
+      - save_cache:
+          key: source-v2-{{ .Branch }}-{{ .Revision }}
+          paths:
+            # This is a broad list of cache paths to include many possible development environments
+            # You can probably delete some of these entries
+            - vendor/bundle
+            - ~/.nvm
+            - ~/.pyenv
+            - ~/virtualenvs
+            - ~/.m2
+            - ~/.ivy2
+            - ~/.sbt
+            - ~/.bundle
+            - ~/.go_workspace
+            - ~/.gradle
+            - ~/.cache/bower
+            - ".git"
+            - ~/.stack
+            - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
+            - ~/R
+      # save "default" cache using the key "source-v2-"
+      - save_cache:
+          key: source-v2-
+          paths:
+            # This is a broad list of cache paths to include many possible development environments
+            # You can probably delete some of these entries
+            - vendor/bundle
+            - ~/.nvm
+            - ~/.pyenv
+            - ~/virtualenvs
+            - ~/.m2
+            - ~/.ivy2
+            - ~/.sbt
+            - ~/.bundle
+            - ~/.go_workspace
+            - ~/.gradle
+            - ~/.cache/bower
+            - ".git"
+            - ~/.stack
+            - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
+            - ~/R
       # Teardown
       #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
       # Save test results
@@ -192,6 +194,20 @@ jobs:
       - checkout
       - command_build_and_test:
           nodeNo: "3"
+  node4:
+    docker:
+      - image: fkrull/multi-python
+    working_directory: ~/OpenAPITools/openapi-generator
+    shell: /bin/bash --login
+    environment:
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
+      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
+    steps:
+      - checkout
+      - command_docker_build_and_test:
+          nodeNo: "4"
 workflows:
   version: 2
   build:
@@ -200,3 +216,4 @@ workflows:
       - node1
       - node2
       - node3
+      - node4

.devcontainer/devcontainer.json

@@ -9,13 +9,7 @@
     "ghcr.io/devcontainers/features/node:1": {
       "version": "lts"
     },
-    "ghcr.io/devcontainers/features/rust:1": {},
-    "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {},
-    "docker-in-docker": {
-      "version": "latest",
-      "moby": true,
-      "dockerDashComposeVersion": "v1"
-    }
+    "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {}
   },
   // Configure tool-specific properties.
   "customizations": {
@@ -50,4 +44,4 @@
   // "postCreateCommand": "mvn clean package -DskipTests",
   // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode"
-}
+}

.envrc

@@ -1 +1 @@
-has nix && use flake
+use flake

.github/.test/samples.json

@@ -319,6 +319,12 @@
         "Client: Java"
       ]
     },
+    {
+      "input": "java-petstore-jersey1.sh",
+      "matches": [
+        "Client: Java"
+      ]
+    },
     {
       "input": "java-petstore-jersey2-java6.sh",
       "matches": [
@@ -578,6 +584,18 @@
         "Server: Java"
       ]
     },
+    {
+      "input": "jaxrs-jersey1-petstore-server.sh",
+      "matches": [
+        "Server: Java"
+      ]
+    },
+    {
+      "input": "jaxrs-jersey1-usetags-petstore-server.sh",
+      "matches": [
+        "Server: Java"
+      ]
+    },
     {
       "input": "jaxrs-petstore-server-datelib-j8.sh",
       "matches": [
@@ -782,6 +800,12 @@
         "Client: Python"
       ]
     },
+    {
+      "input": "python-server-flask-petstore-python2.sh",
+      "matches": [
+        "Server: Python"
+      ]
+    },
     {
       "input": "python-server-flask-petstore.sh",
       "matches": [

.github/CODEOWNERS

@@ -28,14 +28,8 @@ modules/openapi-generator-cli/**/* @jimschubert
 modules/openapi-generator-gradle-plugin/**/* @jimschubert
 modules/openapi-generator-maven-plugin/**/* @jimschubert
 
-# cpp-qt-client technical committee
-modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @ravinikam
-samples/client/petstore/cpp-qt/**/* @ravinikam
-modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @stkrwork
-samples/client/petstore/cpp-qt/**/* @stkrwork
-modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @etherealjoy
-samples/client/petstore/cpp-qt/**/* @etherealjoy
-modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @martindelille
-samples/client/petstore/cpp-qt/**/* @martindelille
-modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @muttleyxd
-samples/client/petstore/cpp-qt/**/* @muttleyxd
+# Martin Delille
+/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtClientCodegen.java @martindelille
+/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java @martindelille
+/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/resources/cpp-qt-client @martindelille
+/Users/martin/dev/clone/openapi-generator/samples/client/petstore/cpp-qt @martindelille

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,14 +8,18 @@
 - [ ] Run the following to [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) and update samples:
   ```
   ./mvnw clean package 
-  ./bin/generate-samples.sh ./bin/configs/*.yaml
+  ./bin/generate-samples.sh
   ./bin/utils/export_docs_generators.sh
   ``` 
-  (For Windows users, please run the script in [Git BASH](https://gitforwindows.org/))
   Commit all changed files. 
   This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. 
   These must match the expectations made by your contribution. 
   You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. 
-  IMPORTANT: Do **NOT** purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
-- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming 7.1.0 minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks)
+  For Windows users, please run the script in [Git BASH](https://gitforwindows.org/).
+- [ ] In case you are adding a new generator, run the following additional script : 
+  ```
+  ./bin/utils/ensure-up-to-date
+  ``` 
+  Commit all changed files.
+- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (6.3.0) (minor release - breaking changes with fallbacks), `7.0.x` (breaking changes without fallbacks)
 - [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request.

.github/workflows/docker.yaml

@@ -1,7 +1,6 @@
 name: Docker tests
 
 on:
-  workflow_dispatch:
   push:
     paths:
       - Dockerfile
@@ -9,8 +8,6 @@ on:
       - pom.xml
       - modules/openapi-generator-online/pom.xml
       - modules/openapi-generator-online/Dockerfile
-      - modules/openapi-generator-cli/pom.xml
-      - modules/openapi-generator-cli/Dockerfile
   pull_request:
     paths:
       - Dockerfile
@@ -18,21 +15,19 @@ on:
       - pom.xml
       - modules/openapi-generator-online/pom.xml
       - modules/openapi-generator-online/Dockerfile
-      - modules/openapi-generator-cli/pom.xml
-      - modules/openapi-generator-cli/Dockerfile
 jobs:
   build:
     name: 'Build: Docker'
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Test run-in-docker.sh
         shell: bash
         run: |
           sed -i 's/ -it / /g' run-in-docker.sh
-          ./run-in-docker.sh mvn -B clean install
+          ./run-in-docker.sh mvn clean install
 
       - name: Build Dockerfile
         shell: bash
@@ -42,12 +37,3 @@ jobs:
         shell: bash
         run: |
           docker build modules/openapi-generator-online/ -t test
-      - name: Build and test modules/openapi-generator-cli
-        shell: bash
-        run: |
-          cp docker-entrypoint.sh ./modules/openapi-generator-cli 
-          docker build modules/openapi-generator-cli/ -t cli-test
-          docker run --rm -v "${PWD}:/local" cli-test generate \
-          -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
-          -g go \
-          -o /local/out/go

.github/workflows/gradle-plugin-tests.yaml

@@ -13,14 +13,14 @@ jobs:
     name: Gradle plugin tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/gradle-test.yaml

@@ -30,21 +30,21 @@ jobs:
           - samples/client/petstore/java/okhttp-gson-group-parameter
           - samples/client/petstore/java/webclient-swagger2
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11
       # Cache Gradle Dependencies
       - name: Setup Gradle Dependencies Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
 
       # Cache Gradle Wrapper
       - name: Setup Gradle Wrapper Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

.github/workflows/linux.yaml

@@ -20,22 +20,22 @@ jobs:
         os: [ubuntu-latest]
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -45,7 +45,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.12.0
+        uses: s4u/setup-maven-action@v1.8.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8
@@ -57,7 +57,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
       - name: Upload Maven build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         if: matrix.java == '11' && matrix.os == 'ubuntu-latest'
         with:
           name: artifact
@@ -85,14 +85,14 @@ jobs:
         os: [ubuntu-latest]
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.12.0
+        uses: s4u/setup-maven-action@v1.8.0
         with:
           java-version: 11
           maven-version: 3.8.8
       - name: Download build artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: artifact
       - name: Run Ensures Script

.github/workflows/maven-plugin-tests.yaml

@@ -13,14 +13,14 @@ jobs:
     name: Maven plugin tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/misc-test.yaml

@@ -15,7 +15,7 @@ jobs:
     name: Misc tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.6'

.github/workflows/openapi-generator.yaml

@@ -15,14 +15,14 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: cache-maven-repository
         with:
@@ -41,7 +41,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       - run: ls -la  modules/openapi-generator-cli/target
       - name: Upload openapi-generator-cli.jar artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -53,14 +53,14 @@ jobs:
     needs:
       - build
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: cache-maven-repository
         with:
@@ -79,7 +79,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       - name: Publish unit test reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: surefire-test-results
           path: '**/surefire-reports/TEST-*.xml'
@@ -90,14 +90,14 @@ jobs:
     needs:
       - build
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
@@ -129,34 +129,19 @@ jobs:
       - build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
-      - name: Delete samples that are entirely generated
-        run: |
-          rm -rf samples/client/petstore/csharp/generichost/net8/AllOf
-          rm -rf samples/client/petstore/csharp/generichost/net8/AnyOf
-          rm -rf samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
-          rm -rf samples/client/petstore/csharp/generichost/net8/FormModels
-          rm -rf samples/client/petstore/csharp/generichost/net8/NullReferenceTypes
-          rm -rf samples/client/petstore/csharp/generichost/net8/OneOf
-          rm -rf samples/client/petstore/csharp/generichost/net8/Petstore
-          rm -rf samples/client/petstore/csharp/generichost/net8/SourceGeneration
-          rm -rf samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
-          rm -rf samples/client/petstore/csharp/generichost/standard2.0/Petstore
       - name: Generate samples
-        run: |
-          bash bin/generate-samples.sh
-          # when a sample is deleted, you have to generate it twice for all files to get created
-          bash bin/generate-samples.sh
+        run: bash bin/generate-samples.sh
       - name: Verify git status
         run: |
           if [[ "$(git status --porcelain)" != "" ]]; then

.github/workflows/samples-c-libcurl-client.yaml

@@ -4,31 +4,22 @@ on:
   push:
     paths:
       - 'samples/client/petstore/c/**'
-      - 'samples/client/petstore/c-useJsonUnformatted/**'
   pull_request:
     paths:
       - 'samples/client/petstore/c/**'
-      - 'samples/client/petstore/c-useJsonUnformatted/**'
 
 jobs:
   build:
     name: Build c libcurl client
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          - 'samples/client/petstore/c/'
-          - 'samples/client/petstore/c-useJsonUnformatted/'
-
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Prepare
         run: |
           sudo apt-get update
           sudo apt-get install -y libssl-dev libcurl4-openssl-dev
       - name: Build
-        working-directory: ${{ matrix.sample }}
+        working-directory: "samples/client/petstore/c"
         run: |
           mkdir build
           cd build

.github/workflows/samples-cpp-qt-client.yaml

@@ -18,16 +18,18 @@ jobs:
       matrix:
         qt-version:
           - '5.15.2'
-          - '6.5.3'
+          - '6.4.2'
         os:
           - ubuntu-latest
           - macOS-latest
           - windows-latest
+        include:
+          - os: windows-latest
+            tools: 'tools_openssl_x64'
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+      - uses: actions/checkout@v3
+      - uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt-version }}
           tools: ${{ matrix.tools }}

.github/workflows/samples-dart.yaml

@@ -17,19 +17,27 @@ jobs:
     name: Tests Dart
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11
-          cache: maven
+      - name: Cache maven dependencies
+        uses: actions/cache@v3
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.m2/repository
+            ~/.gradle
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
       - name: Cache test dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: pub-cache
         with:
           path: $PUB_CACHE
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('samples/**/pubspec.*') }}
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('samples/**/pubspec.yaml') }}
       - uses: dart-lang/setup-dart@v1
         with:
           sdk: 2.15.0

.github/workflows/samples-dotnet-standard.yaml

@@ -1,18 +1,12 @@
-name: Samples C# .Net Standard Client
+name: Samples C# .Net Standard
 
 on:
   push:
     paths:
-      - samples/client/petstore/csharp/generichost/standard2.0/**
-      - samples/client/petstore/csharp/httpclient/standard2.0/**
-      - samples/client/petstore/csharp/restsharp/standard2.0/**
-      - samples/client/petstore/csharp/unityWebRequest/standard2.0/**
+      - 'samples/client/petstore/csharp/**netstandard**/'
   pull_request:
     paths:
-      - samples/client/petstore/csharp/generichost/standard2.0/**
-      - samples/client/petstore/csharp/httpclient/standard2.0/**
-      - samples/client/petstore/csharp/restsharp/standard2.0/**
-      - samples/client/petstore/csharp/unityWebRequest/standard2.0/**
+      - 'samples/client/petstore/csharp/**netstandard**/'
 jobs:
   build:
     name: Build .Net projects
@@ -21,21 +15,16 @@ jobs:
       fail-fast: false
       matrix:
         sample:
-          - samples/client/petstore/csharp/generichost/standard2.0/Petstore/
-          - samples/client/petstore/csharp/httpclient/standard2.0/Petstore/
-          - samples/client/petstore/csharp/restsharp/standard2.0/Petstore/
-          - samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/
-          # - samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/
+          # clients
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.0
+      - uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: 3.1.*
       - name: Build
         working-directory: ${{ matrix.sample }}
         run: dotnet build Org.OpenAPITools.sln
-      # skip tests as petstore server it not running
-      # these tests are run in appveyor instead
-      #- name: Test
-      #  working-directory: ${{ matrix.sample }}
-      #  run: dotnet test Org.OpenAPITools.sln
+      - name: Test
+        working-directory: ${{ matrix.sample }}
+        run: dotnet test Org.OpenAPITools.sln

.github/workflows/samples-dotnet.yaml

@@ -1,18 +1,25 @@
-name: Samples C# .Net 8 Clients
+name: Samples C# .Net 7
 
 on:
   push:
     paths:
-      - samples/client/petstore/csharp/generichost/net8/**
-      - samples/client/petstore/csharp/httpclient/net8/**
-      - samples/client/petstore/csharp/restsharp/net8/**
-      - samples/client/petstore/csharp/unityWebRequest/net8/**
+      - 'samples/client/petstore/csharp/**net6.0**/'
+      - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
+      - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**'
+      - 'samples/server/petstore/aspnetcore-6.0/**'
+      - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
+      - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**'
   pull_request:
     paths:
-      - samples/client/petstore/csharp/generichost/net8/**
-      - samples/client/petstore/csharp/httpclient/net8/**
-      - samples/client/petstore/csharp/restsharp/net8/**
-      - samples/client/petstore/csharp/unityWebRequest/net8/**
+      - 'samples/client/petstore/csharp/**net6.0**/'
+      - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
+      - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**'
+      - 'samples/server/petstore/aspnetcore-6.0/**'
+      - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
+      - 'samples/server/petstore/aspnetcore-6.0-project4Models/**'
+      - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**'
+      - 'samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/**'
+      - 'samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/**'
 jobs:
   build:
     name: Build .Net projects
@@ -21,22 +28,24 @@ jobs:
       fail-fast: false
       matrix:
         sample:
-          - samples/client/petstore/csharp/generichost/net8/AllOf
-          - samples/client/petstore/csharp/generichost/net8/AnyOf
-          - samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
-          - samples/client/petstore/csharp/generichost/net8/FormModels
-          - samples/client/petstore/csharp/generichost/net8/ManualPetstoreTests
-          - samples/client/petstore/csharp/generichost/net8/ManualSourceGenerationTests
-          - samples/client/petstore/csharp/generichost/net8/NullReferenceTypes
-          - samples/client/petstore/csharp/generichost/net8/OneOf
-          - samples/client/petstore/csharp/generichost/net8/Petstore
-          - samples/client/petstore/csharp/generichost/net8/SourceGeneration
-          - samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
+          # clients
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests
+          - samples/server/petstore/aspnetcore-6.0
+          - samples/server/petstore/aspnetcore-6.0-pocoModels
+          - samples/server/petstore/aspnetcore-6.0-project4Models
+          - samples/server/petstore/aspnetcore-6.0-useSwashBuckle
+          - samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse
+          - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.0
+      - uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '7.0.x'
       - name: Build
         working-directory: ${{ matrix.sample }}
         run: dotnet build Org.OpenAPITools.sln

.github/workflows/samples-dotnet6-client-echo-api.yaml

@@ -1,33 +0,0 @@
-name: Samples C# .Net 6 Client Echo API
-
-on:
-  push:
-    paths:
-      - samples/client/echo_api/csharp-restsharp/**
-  pull_request:
-    paths:
-      - samples/client/echo_api/csharp-restsharp/**
-jobs:
-  build:
-    name: Build .Net clients
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/client/echo_api/csharp-restsharp/
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.0
-        with:
-          dotnet-version: '6.0.x'
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: |
-          dotnet build Org.OpenAPITools.sln
-          dotnet test Org.OpenAPITools.sln

.github/workflows/samples-dotnet6-client.yaml

@@ -1,12 +1,44 @@
-name: Samples C# .Net 6 Client
+name: Samples C# .Net 6
 
 on:
   push:
     paths:
-      - samples/client/petstore/csharp/restsharp/net6/**
+      # build C# API client (multiple frameworks)
+      - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
+      # build C# API client (httpclient)
+      - samples/client/petstore/csharp/OpenAPIClient-httpclient/**
+      # build C# API client (generichost)
+      - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/**
+      # build C# API client (netcore)
+      - samples/client/petstore/csharp/OpenAPIClient/**
+      - samples/client/petstore/csharp/OpenAPIClientCore/**
+      # build C# API client (.net framework 4.7)
+      - samples/client/petstore/csharp/OpenAPIClient-net47/**
+      # build C# API client (.net framework 4.8)
+      - samples/client/petstore/csharp/OpenAPIClient-net48/**
+      # build C# API client (.net 5.0)
+      - samples/client/petstore/csharp/OpenAPIClient-net5.0/**
+      # build C# API client (.net 5.0 with ConditionalSerialization)
+      - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
   pull_request:
     paths:
-      - samples/client/petstore/csharp/restsharp/net6/**
+      # build C# API client (multiple frameworks)
+      - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
+      # build C# API client (httpclient)
+      - samples/client/petstore/csharp/OpenAPIClient-httpclient/**
+      # build C# API client (generichost)
+      - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/**
+      # build C# API client (netcore)
+      - samples/client/petstore/csharp/OpenAPIClient/**
+      - samples/client/petstore/csharp/OpenAPIClientCore/**
+      # build C# API client (.net framework 4.7)
+      - samples/client/petstore/csharp/OpenAPIClient-net47/**
+      # build C# API client (.net framework 4.8)
+      - samples/client/petstore/csharp/OpenAPIClient-net48/**
+      # build C# API client (.net 5.0)
+      - samples/client/petstore/csharp/OpenAPIClient-net5.0/**
+      # build C# API client (.net 5.0 with ConditionalSerialization)
+      - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
 jobs:
   build:
     name: Build .Net clients
@@ -15,10 +47,27 @@ jobs:
       fail-fast: false
       matrix:
         sample:
-          - samples/client/petstore/csharp/restsharp/net6/ParameterMappings/
+          # clients
+          # build C# API client (multiple frameworks)
+          - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/
+          # build C# API client (httpclient)
+          - samples/client/petstore/csharp/OpenAPIClient-httpclient/
+          # build C# API client (generichost)
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/
+          # build C# API client (netcore)
+          - samples/client/petstore/csharp/OpenAPIClient/
+          - samples/client/petstore/csharp/OpenAPIClientCore/
+          # build C# API client (.net framework 4.7)
+          - samples/client/petstore/csharp/OpenAPIClient-net47/
+          # build C# API client (.net framework 4.8)
+          - samples/client/petstore/csharp/OpenAPIClient-net48/
+          # build C# API client (.net 5.0)
+          - samples/client/petstore/csharp/OpenAPIClient-net5.0/
+          # build C# API client (.net 5.0 with ConditionalSerialization)
+          - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.0
+      - uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: '6.0.x'
       - name: Build

.github/workflows/samples-dotnet6-server.yaml

@@ -1,31 +1,36 @@
-name: Samples C# .Net 6 Server
+name: Samples C# .Net 6
 
 on:
   push:
     paths:
-      - samples/server/petstore/aspnetcore-6.0/**
-      - samples/server/petstore/aspnetcore-6.0-*/**
+      - 'samples/server/petstore/aspnetcore-6.0/**'
+      - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
+      - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**'
   pull_request:
     paths:
-      - samples/server/petstore/aspnetcore-6.0/**
-      - samples/server/petstore/aspnetcore-6.0-*/**
+      - 'samples/server/petstore/aspnetcore-6.0/**'
+      - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
+      - 'samples/server/petstore/aspnetcore-6.0-project4Models/**'
+      - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**'
+      - 'samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/**'
+      - 'samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/**'
 jobs:
   build:
-    name: Build .Net 6 servers
+    name: Build .Net servers
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         sample:
           - samples/server/petstore/aspnetcore-6.0
-          - samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse
-          - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
           - samples/server/petstore/aspnetcore-6.0-pocoModels
           - samples/server/petstore/aspnetcore-6.0-project4Models
           - samples/server/petstore/aspnetcore-6.0-useSwashBuckle
+          - samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse
+          - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.0
+      - uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: '6.0.x'
       - name: Build

.github/workflows/samples-elm.yaml

@@ -21,7 +21,7 @@ jobs:
           - samples/client/petstore/elm
           - samples/openapi3/client/elm
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: jorelali/setup-elm@v5
         with:
           elm-version: 0.19.1

.github/workflows/samples-erlang.yaml

@@ -26,7 +26,7 @@ jobs:
           - samples/client/petstore/erlang-client/
           - samples/client/petstore/erlang-proper/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: erlef/setup-beam@v1
         with:
           otp-version: '22.2'

.github/workflows/samples-go-client-echo-api.yaml

@@ -1,32 +0,0 @@
-name: Go Client (Echo API)
-
-on:
-  pull_request:
-    paths:
-      - samples/client/echo_api/go/**
-      - .github/workflows/samples-go-client-echo-api.yaml
-jobs:
-  build:
-    name: Test Go client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/client/echo_api/go
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: "stable"
-      - name: Setup node.js
-        uses: actions/setup-node@v4
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-      - run: go version
-      - name: Run test
-        working-directory: ${{ matrix.sample }}
-        run: go test -mod=mod -v

.github/workflows/samples-go-gin.yaml

@@ -1,31 +0,0 @@
-name: Samples Go 
-
-on:
-  push:
-    paths:
-      - 'samples/server/petstore/go-gin-api-server/**'
-      - 'samples/server/petstore/go-gin-api-server-interface-only/**'
-  pull_request:
-    paths:
-      - 'samples/server/petstore/go-gin-api-server/**'
-      - 'samples/server/petstore/go-gin-api-server-interface-only/**'
-
-jobs:
-  build:
-    name: Build Go 
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          - samples/server/petstore/go-gin-api-server/
-          - samples/server/petstore/go-gin-api-server-interface-only/
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: "stable"
-      - run: go version
-      - name: Run test
-        working-directory: ${{ matrix.sample }}
-        run: go test -mod=mod -v

.github/workflows/samples-go.yaml

@@ -24,8 +24,8 @@ jobs:
           - samples/server/petstore/go-api-server/
           - samples/server/petstore/go-chi-server/
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: "stable"
       - run: go version

.github/workflows/samples-groovy.yaml

@@ -21,13 +21,13 @@ jobs:
         sample:
           - samples/client/petstore/groovy
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:
@@ -35,7 +35,7 @@ jobs:
             ~/.gradle
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
       - name: Install Gradle wrapper
-        uses: eskatos/gradle-command-action@v3
+        uses: eskatos/gradle-command-action@v2
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
           build-root-directory: ${{ matrix.sample }}

.github/workflows/samples-haskell.yaml

@@ -1,36 +0,0 @@
-name: Samples Haskell
-
-on:
-  push:
-    paths:
-      - samples/server/petstore/haskell-yesod/**
-      - samples/server/petstore/haskell-servant/**
-      - samples/client/petstore/haskell-http-client/**
-  pull_request:
-    paths:
-      - samples/server/petstore/haskell-yesod/**
-      - samples/server/petstore/haskell-servant/**
-      - samples/client/petstore/haskell-http-client/**
-jobs:
-  build:
-    name: Build stack projects
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # servers
-          - samples/server/petstore/haskell-yesod/
-          - samples/server/petstore/haskell-servant/
-          - samples/client/petstore/haskell-http-client/
-    steps:
-      - uses: actions/checkout@v4
-      - uses: haskell/actions/setup@v2
-        with:
-          # ghc-version: '8.8.4' # Exact version of ghc to use
-          # cabal-version: 'latest'. Omitted, but defaults to 'latest'
-          enable-stack: true
-          stack-version: 'latest'
-      - name: stack test
-        working-directory: ${{ matrix.sample }}
-        run: stack test

.github/workflows/samples-java-client-echo-api-jdk11.yaml

@@ -19,16 +19,14 @@ jobs:
           - samples/client/echo_api/java/apache-httpclient
           - samples/client/echo_api/java/native
           - samples/client/echo_api/java/feign-gson
-          - samples/client/echo_api/java/resttemplate
-          - samples/client/echo_api/java/resteasy
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:
@@ -36,7 +34,7 @@ jobs:
             ~/.m2
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
       - name: Setup node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
       - name: Run echo server
         run: |
           git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server

.github/workflows/samples-java-client-echo-api-jdk8.yaml

@@ -6,14 +6,11 @@ on:
       - samples/client/echo_api/java/apache-httpclient/**
       - samples/client/echo_api/java/feign-gson/**
       - samples/client/echo_api/java/okhttp-gson/**
-      - samples/client/echo_api/java/resttemplate/**
-      - samples/client/echo_api/java/resteasy/**
   pull_request:
     paths:
       - samples/client/echo_api/java/apache-httpclient/**
       - samples/client/echo_api/java/feign-gson/**
       - samples/client/echo_api/java/okhttp-gson/**
-      - samples/client/echo_api/java/resteasy/**
 jobs:
   build:
     name: Build Java Client JDK8
@@ -26,16 +23,14 @@ jobs:
           - samples/client/echo_api/java/apache-httpclient
           - samples/client/echo_api/java/feign-gson
           - samples/client/echo_api/java/okhttp-gson
-          - samples/client/echo_api/java/resttemplate
-          - samples/client/echo_api/java/resteasy
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:
@@ -43,7 +38,7 @@ jobs:
             ~/.m2
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
       - name: Setup node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
       - name: Run echo server
         run: |
           git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server

.github/workflows/samples-java-client-jdk11.yaml

@@ -10,11 +10,6 @@ on:
       - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/**
       - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/**
       - samples/openapi3/client/petstore/java/native**
-      - samples/client/others/java/okhttp-gson-oneOf/**
-      - samples/client/others/java/resttemplate-useAbstractionForFiles/**
-      - samples/client/others/java/webclient-useAbstractionForFiles/**
-      - samples/client/others/java/jersey2-oneOf-duplicates/**
-      - samples/client/others/java/jersey2-oneOf-Mixed/**
   pull_request:
     paths:
       - 'samples/client/petstore/java/**'
@@ -24,11 +19,6 @@ on:
       - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/**
       - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/**
       - samples/openapi3/client/petstore/java/native**
-      - samples/client/others/java/okhttp-gson-oneOf/**
-      - samples/client/others/java/resttemplate-useAbstractionForFiles/**
-      - samples/client/others/java/webclient-useAbstractionForFiles/**
-      - samples/client/others/java/jersey2-oneOf-duplicates/**
-      - samples/client/others/java/jersey2-oneOf-Mixed/**
 jobs:
   build:
     name: Build Java Client JDK11
@@ -53,17 +43,15 @@ jobs:
           - samples/client/petstore/java/webclient-swagger2
           - samples/client/petstore/java/vertx
           - samples/client/petstore/java/jersey2-java8-localdatetime
+          - samples/client/petstore/java/resteasy
           - samples/client/petstore/java/google-api-client
           - samples/client/petstore/java/rest-assured
           - samples/client/petstore/java/rest-assured-jackson
           - samples/client/petstore/java/microprofile-rest-client
           - samples/client/petstore/java/microprofile-rest-client-3.0
-          - samples/client/petstore/java/microprofile-rest-client-3.0-jackson
-          - samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml
-          - samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter
           - samples/client/petstore/java/apache-httpclient
           - samples/client/petstore/java/feign
-          - samples/client/petstore/java/okhttp-gson-awsv4signature
+          - samples/client/petstore/java/jersey1
           - samples/openapi3/client/petstore/java/jersey2-java8-special-characters
           - samples/openapi3/client/petstore/java/native
           - samples/client/petstore/java/okhttp-gson-swagger1/
@@ -72,20 +60,14 @@ jobs:
           - samples/client/petstore/java/okhttp-gson-swagger2/
           - samples/client/petstore/java/resttemplate-swagger2/
           - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/
-          - samples/client/others/java/okhttp-gson-oneOf/
-          - samples/client/echo_api/java/okhttp-gson-user-defined-templates/
-          - samples/client/others/java/resttemplate-useAbstractionForFiles/
-          - samples/client/others/java/webclient-useAbstractionForFiles/
-          - samples/client/others/java/jersey2-oneOf-duplicates/
-          - samples/client/others/java/jersey2-oneOf-Mixed/
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-client-jdk17.yaml

@@ -21,13 +21,13 @@ jobs:
           - samples/client/petstore/java/resttemplate-jakarta
           - samples/client/petstore/java/webclient-jakarta
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-helidon.yaml

@@ -23,13 +23,13 @@ jobs:
           - samples/server/petstore/java-helidon-server/se
         version: [17]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.version }}
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-play-framework.yaml

@@ -29,13 +29,13 @@ jobs:
           - samples/server/petstore/java-play-framework-no-swagger-ui
           - samples/server/petstore/java-play-framework-no-wrap-calls
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-server-jdk8.yaml

@@ -8,7 +8,6 @@ on:
       - 'samples/server/petstore/java-vertx-web/**'
       - 'samples/server/petstore/java-inflector/**'
       - 'samples/server/petstore/java-pkmst/**'
-      # test in circleci instead
       - 'samples/server/petstore/java-undertow/**'
   pull_request:
     paths:
@@ -16,7 +15,7 @@ on:
       - 'samples/server/petstore/java-vertx-web/**'
       - 'samples/server/petstore/java-inflector/**'
       - 'samples/server/petstore/java-pkmst/**'
-      #- 'samples/server/petstore/java-undertow/**'
+      - 'samples/server/petstore/java-undertow/**'
 jobs:
   build:
     name: Build Java Server
@@ -30,15 +29,15 @@ jobs:
           - samples/server/petstore/java-vertx-web/
           - samples/server/petstore/java-inflector/
           - samples/server/petstore/java-pkmst/
-          #- samples/server/petstore/java-undertow/
+          - samples/server/petstore/java-undertow/
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-wiremock.yaml

@@ -1,35 +0,0 @@
-name: Samples Java Wiremock
-
-on:
-  push:
-    paths:
-      - samples/server/petstore/java-wiremock/**
-  pull_request:
-    paths:
-      - samples/server/petstore/java-wiremock/**
-jobs:
-  build:
-    name: Build Java Wiremock
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          - samples/server/petstore/java-wiremock
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 11
-      - name: Cache maven dependencies
-        uses: actions/cache@v4
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.m2
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: mvn clean package

.github/workflows/samples-jaxrs-jdk11.yaml

@@ -1,36 +0,0 @@
-name: Samples JAX-RS (JDK11)
-
-on:
-  push:
-    paths:
-      - samples/server/petstore/jaxrs/jersey3/**
-  pull_request:
-    paths:
-      - samples/server/petstore/jaxrs/jersey3/**
-jobs:
-  build:
-    name: Build JAX-RS
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # servers
-          - samples/server/petstore/jaxrs/jersey3
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 11
-      - name: Cache maven dependencies
-        uses: actions/cache@v4
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.m2
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: mvn clean package

.github/workflows/samples-jaxrs.yaml

@@ -26,6 +26,8 @@ jobs:
           - samples/server/petstore/jaxrs-spec
           - samples/server/petstore/jaxrs-spec-interface
           - samples/server/petstore/jaxrs-spec-interface-response
+          - samples/server/petstore/jaxrs/jersey1
+          - samples/server/petstore/jaxrs/jersey1-useTags
           - samples/server/petstore/jaxrs-datelib-j8
           - samples/server/petstore/jaxrs-resteasy/default
           - samples/server/petstore/jaxrs-resteasy/eap
@@ -38,13 +40,13 @@ jobs:
           - samples/server/petstore/jaxrs-cxf-non-spring-app
           - samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-jdk17.yaml

@@ -8,7 +8,6 @@ on:
       - samples/client/petstore/java-helidon-client/se/**
       - samples/client/petstore/spring-http-interface-reactive/**
       - samples/client/petstore/spring-http-interface/**
-      - samples/client/petstore/java/webclient-jakarta/**
       # servers
       - samples/openapi3/server/petstore/springboot-3/**
       - samples/server/petstore/java-helidon-server/mp/**
@@ -21,7 +20,6 @@ on:
       - samples/client/petstore/java-helidon-client/se/**
       - samples/client/petstore/spring-http-interface-reactive/**
       - samples/client/petstore/spring-http-interface/**
-      - samples/client/petstore/java/webclient-jakarta/**
       # servers
       - samples/openapi3/server/petstore/springboot-3/**
       - samples/server/petstore/java-helidon-server/mp/**
@@ -40,7 +38,6 @@ jobs:
           - samples/client/petstore/java-helidon-client/se
           - samples/client/petstore/spring-http-interface-reactive
           - samples/client/petstore/spring-http-interface
-          - samples/client/petstore/java/webclient-jakarta
           # servers
           - samples/openapi3/server/petstore/springboot-3
           - samples/server/petstore/java-helidon-server/mp
@@ -48,13 +45,13 @@ jobs:
           - samples/client/petstore/spring-http-interface-reactive
           - samples/client/petstore/spring-http-interface
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-julia.yaml

@@ -1,41 +0,0 @@
-name: Samples Julia
-
-on:
-  push:
-    paths:
-      - 'samples/client/petstore/julia/**'
-      - 'samples/server/petstore/julia/**'
-  pull_request:
-    paths:
-      - 'samples/client/petstore/julia/**'
-      - 'samples/server/petstore/julia/**'
-
-jobs:
-  tests-julia:
-    name: Tests Julia
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v2
-        with:
-          version: 1.8
-          arch: x64
-      - name: Test
-        shell: bash
-        working-directory: 'samples'
-        run: |
-          currdir=`pwd`
-          # Using a specific version of OpenAPI.jl helps avoid introducing version inter-dependencies
-          #   and allows breaking changes to be done in either repos independently
-          # Using develop mode to install package so that it is easier to modify the package test files
-          julia -e "using Pkg; Pkg.develop(\"OpenAPI\");"
-          cd ~/.julia/dev/OpenAPI
-          git checkout v0.1.14
-          cd $currdir
-          rm -rf ~/.julia/dev/OpenAPI/test/client/openapigenerator_petstore_v3/petstore
-          rm -rf ~/.julia/dev/OpenAPI/test/server/openapigenerator_petstore_v3/petstore
-          cp -r client/petstore/julia ~/.julia/dev/OpenAPI/test/client/openapigenerator_petstore_v3/petstore
-          cp -r server/petstore/julia ~/.julia/dev/OpenAPI/test/server/openapigenerator_petstore_v3/petstore
-          # setting this env runs only the tests relevant to the openapi-generator repo
-          export OPENAPI_GENERATOR=true
-          julia -e "using Pkg; Pkg.test(\"OpenAPI\");"

.github/workflows/samples-kotlin-client.yaml

@@ -4,11 +4,9 @@ on:
   push:
     branches:
       - 'samples/client/petstore/kotlin*/**'
-      - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'
   pull_request:
     paths:
       - 'samples/client/petstore/kotlin*/**'
-      - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'
 
 env:
   GRADLE_VERSION: 6.9
@@ -25,34 +23,32 @@ jobs:
           - samples/client/petstore/kotlin
           - samples/client/petstore/kotlin-gson
           - samples/client/petstore/kotlin-jackson
-          - samples/client/petstore/kotlin-model-prefix-type-mappings
           # needs Android configured
           #- samples/client/petstore/kotlin-json-request-string
           - samples/client/petstore/kotlin-jvm-okhttp4-coroutines
           - samples/client/petstore/kotlin-jvm-volley
           - samples/client/petstore/kotlin-moshi-codegen
           - samples/client/petstore/kotlin-multiplatform
-          - samples/client/petstore/kotlin-multiplatform-kotlinx-datetime
           - samples/client/petstore/kotlin-nonpublic
           - samples/client/petstore/kotlin-nullable
+          - samples/client/petstore/kotlin-okhttp3
           - samples/client/petstore/kotlin-retrofit2
           - samples/client/petstore/kotlin-retrofit2-kotlinx_serialization
-          - samples/client/petstore/kotlin-retrofit2-jackson
           - samples/client/petstore/kotlin-retrofit2-rx3
           - samples/client/petstore/kotlin-string
           - samples/client/petstore/kotlin-threetenbp
-          - samples/client/petstore/kotlin-kotlinx-datetime
           - samples/client/petstore/kotlin-uppercase-enum
+          - samples/client/petstore/kotlin-default-values-jvm-okhttp3
           - samples/client/petstore/kotlin-default-values-jvm-okhttp4
           - samples/client/petstore/kotlin-default-values-jvm-retrofit2
           - samples/client/petstore/kotlin-default-values-jvm-volley
           - samples/client/petstore/kotlin-default-values-multiplatform
+          - samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3
           - samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4
           - samples/client/petstore/kotlin-array-simple-string-jvm-volley
           - samples/client/petstore/kotlin-array-simple-string-multiplatform
           - samples/client/petstore/kotlin-bigdecimal-default-multiplatform
           - samples/client/petstore/kotlin-bigdecimal-default-okhttp4
-          - samples/client/petstore/kotlin-jvm-jackson
           - samples/client/petstore/kotlin-jvm-ktor-jackson
           - samples/client/petstore/kotlin-jvm-ktor-gson
           - samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization
@@ -62,20 +58,15 @@ jobs:
           - samples/client/petstore/kotlin-jvm-vertx-moshi
           - samples/client/petstore/kotlin-jvm-spring-2-webclient
           - samples/client/petstore/kotlin-jvm-spring-3-webclient
-          - samples/client/echo_api/kotlin-jvm-spring-3-webclient
-          - samples/client/petstore/kotlin-jvm-spring-3-restclient
-          - samples/client/echo_api/kotlin-jvm-spring-3-restclient
           - samples/client/petstore/kotlin-spring-cloud
-          - samples/client/petstore/kotlin-name-parameter-mappings
-          - samples/client/others/kotlin-jvm-okhttp-parameter-tests
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:
@@ -83,7 +74,7 @@ jobs:
             ~/.gradle
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
       - name: Install Gradle wrapper
-        uses: eskatos/gradle-command-action@v3
+        uses: eskatos/gradle-command-action@v2
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
           build-root-directory: ${{ matrix.sample }}

.github/workflows/samples-kotlin-echo-api.yaml

@@ -1,51 +0,0 @@
-name: Kotlin Client (Echo API) JDK17
-
-on:
-  push:
-    paths:
-      - samples/client/echo_api/kotlin**
-  pull_request:
-    paths:
-      - samples/client/echo_api/kotlin**
-env:
-  GRADLE_VERSION: 7.4
-jobs:
-  build:
-    name: Build Kotlin Client JDK17
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/client/echo_api/kotlin-jvm-spring-3-restclient
-          - samples/client/echo_api/kotlin-model-prefix-type-mappings
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 17
-      - name: Cache maven dependencies
-        uses: actions/cache@v4
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.gradle
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-      - name: Install Gradle wrapper
-        uses: eskatos/gradle-command-action@v3
-        with:
-          gradle-version: ${{ env.GRADLE_VERSION }}
-          build-root-directory: ${{ matrix.sample }}
-          arguments: wrapper
-      - name: Setup node.js
-        uses: actions/setup-node@v4
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: ./gradlew build

.github/workflows/samples-kotlin-server-jdk17.yaml

@@ -4,15 +4,9 @@ on:
   push:
     branches:
       - 'samples/server/petstore/kotlin-springboot-3*/**'
-      - 'samples/server/petstore/kotlin-server/javalin/**'
-      # comment out due to gradle build failure
-      # - samples/server/petstore/kotlin-spring-default/**
   pull_request:
     paths:
       - 'samples/server/petstore/kotlin-springboot-3*/**'
-      - 'samples/server/petstore/kotlin-server/javalin/**'
-      # comment out due to gradle build failure
-      # - samples/server/petstore/kotlin-spring-default/**
 
 env:
   GRADLE_VERSION: 7.4
@@ -27,18 +21,14 @@ jobs:
         sample:
           # server
           - samples/server/petstore/kotlin-springboot-3
-          - samples/server/petstore/kotlin-springboot-request
-          - samples/server/petstore/kotlin-server/javalin
-          # comment out due to gradle build failure
-          # - samples/server/petstore/kotlin-spring-default/
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:
@@ -46,7 +36,7 @@ jobs:
             ~/.gradle
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
       - name: Install Gradle wrapper
-        uses: eskatos/gradle-command-action@v3
+        uses: eskatos/gradle-command-action@v2
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
           build-root-directory: ${{ matrix.sample }}

.github/workflows/samples-kotlin-server.yaml

@@ -3,18 +3,10 @@ name: Samples Kotlin server
 on:
   push:
     branches:
-      - samples/server/others/kotlin-server/jaxrs-spec/**
       - 'samples/server/petstore/kotlin*/**'
-      - 'samples/server/others/kotlin-server/jaxrs-spec-array-response/**'
-      # comment out due to gradle build failure
-      #- samples/server/petstore/kotlin-spring-default/**
   pull_request:
     paths:
-      - samples/server/others/kotlin-server/jaxrs-spec/**
       - 'samples/server/petstore/kotlin*/**'
-      - 'samples/server/others/kotlin-server/jaxrs-spec-array-response/**'
-      # comment out due to gradle build failure
-      # - samples/server/petstore/kotlin-spring-default/**
 
 env:
   GRADLE_VERSION: 6.9
@@ -29,7 +21,6 @@ jobs:
         sample:
           # server
           - samples/server/petstore/kotlin-springboot
-          - samples/server/petstore/kotlin-springboot-bigdecimal-default
           - samples/server/petstore/kotlin-springboot-delegate
           - samples/server/petstore/kotlin-springboot-modelMutable
           - samples/server/petstore/kotlin-springboot-reactive
@@ -38,23 +29,17 @@ jobs:
           - samples/server/petstore/kotlin-springboot-springfox
           - samples/server/petstore/kotlin-server/ktor
           - samples/server/petstore/kotlin-server/jaxrs-spec
-          - samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
           - samples/server/petstore/kotlin-server-modelMutable
-          - samples/server/petstore/kotlin-server/javalin
-          - samples/server/others/kotlin-server/jaxrs-spec
-          - samples/server/others/kotlin-server/jaxrs-spec-array-response
-          # comment out due to gradle build failure
-          #- samples/server/petstore/kotlin-spring-default
           # no build.gradle file
           #- samples/server/petstore/kotlin-vertx-modelMutable
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:
@@ -62,7 +47,7 @@ jobs:
             ~/.gradle
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
       - name: Install Gradle wrapper
-        uses: eskatos/gradle-command-action@v3
+        uses: eskatos/gradle-command-action@v2
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
           build-root-directory: ${{ matrix.sample }}

.github/workflows/samples-php7.yaml

@@ -18,7 +18,7 @@ jobs:
           # servers
           - samples/server/petstore/php-laravel/lib/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Setup PHP with tools
         uses: shivammathur/setup-php@v2
         with:

.github/workflows/samples-php8.yaml

@@ -4,11 +4,9 @@ on:
   push:
     paths:
       - samples/server/petstore/php-symfony/SymfonyBundle-php/**
-      - samples/server/petstore/php-flight/**
   pull_request:
     paths:
       - samples/server/petstore/php-symfony/SymfonyBundle-php/**
-      - samples/server/petstore/php-flight/**
 jobs:
   build:
     name: Build PHP projects
@@ -19,9 +17,8 @@ jobs:
         sample:
           # servers
           - samples/server/petstore/php-symfony/SymfonyBundle-php/
-          - samples/server/petstore/php-flight/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Setup PHP with tools
         uses: shivammathur/setup-php@v2
         with:

.github/workflows/samples-postman.yaml

@@ -1,33 +0,0 @@
-name: Samples Postman
-
-on:
-  pull_request:
-    paths:
-      - samples/schema/postman-collection/python/**
-      - samples/schema/postman-collection/postman.json
-      - .github/workflows/samples-postman.yaml
-jobs:
-  build:
-    name: Test Python client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # schema
-          - samples/schema/postman-collection
-        python-version:
-          - "3.11"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install
-        working-directory: ${{ matrix.sample }}
-        run: |
-          pip install -r python/requirements.txt
-          pip install -r python/test-requirements.txt
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: python -m pytest

.github/workflows/samples-python-client-echo-api.yaml

@@ -1,48 +0,0 @@
-name: Python Client (Echo API)
-
-on:
-  pull_request:
-    paths:
-      - samples/client/echo_api/python/**
-      - .github/workflows/samples-python-client-echo-api.yaml
-jobs:
-  build:
-    name: Test Python client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/client/echo_api/python
-          - samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent
-        python-version:
-          - "3.7"
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Setup node.js
-        uses: actions/setup-node@v4
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-      - name: Install 
-        working-directory: ${{ matrix.sample }}
-        run: |
-          pip install -r requirements.txt
-          pip install -r test-requirements.txt
-
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: python -m pytest
-
-      - name: mypy
-        working-directory: ${{ matrix.sample }}
-        run: python -m mypy

.github/workflows/samples-python-fastapi-server.yaml

@@ -1,33 +0,0 @@
-name: Python FastAPI Server
-
-on:
-  push:
-    paths:
-      - samples/server/petstore/python-fastapi/**
-  pull_request:
-    paths:
-      - samples/server/petstore/python-fastapi/**
-jobs:
-  build:
-    name: Test Python FastAPI server
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # servers
-          - samples/server/petstore/python-fastapi/
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.9'
-      - name: Install dependencies
-        working-directory: ${{ matrix.sample }}
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install pytest
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: PYTHONPATH=src pytest

.github/workflows/samples-python-nextgen-client-echo-api.yaml

@@ -0,0 +1,38 @@
+name: Python Client (Echo API)
+
+on:
+  push:
+    paths:
+      - samples/client/echo_api/python/**
+  pull_request:
+    paths:
+      - samples/client/echo_api/python/**
+jobs:
+  build:
+    name: Test Python client
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/echo_api/python
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.7'
+      - name: Setup node.js
+        uses: actions/setup-node@v3
+      - name: Run echo server
+        run: |
+          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
+          (cd http-echo-server && npm install && npm start &)
+      - name: Install 
+        working-directory: ${{ matrix.sample }}
+        run: |
+          pip install -r requirements.txt
+          pip install -r test-requirements.txt
+      - name: Test
+        working-directory: ${{ matrix.sample }}
+        run: python -m pytest

.github/workflows/samples-python-petstore.yaml

@@ -1,63 +0,0 @@
-name: "Python Client: Petstore"
-
-on:
-  pull_request:
-    paths:
-      - samples/openapi3/client/petstore/python-aiohttp/**
-      - samples/openapi3/client/petstore/python/**
-      - .github/workflows/samples-python-petstore.yaml
-
-jobs:
-  build:
-    name: Test Python client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - "3.7"
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-        sample:
-          - samples/openapi3/client/petstore/python-aiohttp
-          - samples/openapi3/client/petstore/python
-    services:
-      petstore-api:
-        image: swaggerapi/petstore
-        ports:
-          - 80:8080
-        env:
-          SWAGGER_HOST: http://petstore.swagger.io
-          SWAGGER_BASE_PATH: /v2
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        id: py
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          key: ${{ runner.os }}-python-${{ steps.py.outputs.python-version }}-
-          path: |
-            ~/.cache/pypoetry/virtualenvs/
-            ~/.local/pipx/venvs/poetry/
-            .mypy_cache/
-
-      - name: Install poetry
-        run: pipx install --python '${{ steps.py.outputs.python-path }}' poetry
-
-      - name: Install
-        working-directory: ${{ matrix.sample }}
-        run: poetry install
-
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: poetry run pytest -v
-
-      - name: mypy
-        working-directory: ${{ matrix.sample }}
-        run: poetry run mypy

.github/workflows/samples-python-pydantic-v1-client-echo-api.yaml

@@ -1,44 +0,0 @@
-name: Python Client pydantic v1 (Echo API)
-
-on:
-  pull_request:
-    paths:
-      - samples/client/echo_api/python-pydantic-v1/**
-      - .github/workflows/samples-python-pydantic-v1-client-echo-api.yaml
-
-jobs:
-  build:
-    name: Test Python client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/client/echo_api/python-pydantic-v1/
-        python-version:
-          - "3.7"
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Setup node.js
-        uses: actions/setup-node@v4
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-      - name: Install 
-        working-directory: ${{ matrix.sample }}
-        run: |
-          pip install -r requirements.txt
-          pip install -r test-requirements.txt
-
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: python -m pytest

.github/workflows/samples-python-pydantic-v1-petstore.yaml

@@ -1,59 +0,0 @@
-name: "Python Client pydantic v1: Petstore"
-
-on:
-  pull_request:
-    paths:
-      - samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/**
-      - samples/openapi3/client/petstore/python-pydantic-v1/**
-      - .github/workflows/samples-python-pydantic-v1-petstore.yaml
-
-jobs:
-  build:
-    name: Test Python client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - "3.7"
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-        sample:
-          - samples/openapi3/client/petstore/python-pydantic-v1-aiohttp
-          - samples/openapi3/client/petstore/python-pydantic-v1
-    services:
-      petstore-api:
-        image: swaggerapi/petstore
-        ports:
-          - 80:8080
-        env:
-          SWAGGER_HOST: http://petstore.swagger.io
-          SWAGGER_BASE_PATH: /v2
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        id: py
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          key: ${{ runner.os }}-python-${{ steps.py.outputs.python-version }}-
-          path: |
-            ~/.cache/pypoetry/virtualenvs/
-            ~/.local/pipx/venvs/poetry/
-            .mypy_cache/
-
-      - name: Install poetry
-        run: pipx install --python '${{ steps.py.outputs.python-path }}' poetry
-
-      - name: Install
-        working-directory: ${{ matrix.sample }}
-        run: poetry install
-
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: poetry run pytest -v

.github/workflows/samples-python-server.yaml

@@ -3,10 +3,10 @@ name: Python Server
 on:
   push:
     paths:
-      - samples/server/petstore/python-aiohttp-srclayout/**
+      - samples/server/petstore/python-aiohttp/**
   pull_request:
     paths:
-      - samples/server/petstore/python-aiohttp-srclayout/**
+      - samples/server/petstore/python-aiohttp/**
 jobs:
   build:
     name: Test Python server
@@ -16,10 +16,10 @@ jobs:
       matrix:
         sample:
           # servers
-          - samples/server/petstore/python-aiohttp-srclayout/
+          - samples/server/petstore/python-aiohttp/
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: '3.7'
       - name: Test

.github/workflows/samples-r.yaml

@@ -1,42 +0,0 @@
-name: Samples R
-
-on:
-  push:
-    paths:
-      - 'samples/client/echo_api/r/**'
-  pull_request:
-    paths:
-      - 'samples/client/echo_api/r/**'
-
-jobs:
-  build:
-    name: Build R
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          - 'samples/client/echo_api/r/'
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup node.js
-        uses: actions/setup-node@v4
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-      - uses: r-lib/actions/setup-r@v2
-        with:
-          r-version: 3.6.1
-      - uses: r-lib/actions/setup-r-dependencies@v2
-        working-directory: ${{ matrix.sample }}
-        with:
-          cache-version: 2
-      - name: Install curl
-        run: sudo apt-get install -y r-cran-curl
-      - name: build and test
-        working-directory: ${{ matrix.sample }}
-        run: |
-          # export _R_CHECK_FORCE_SUGGESTS_=false
-          /bin/bash build_and_test.bash
-        shell: bash

.github/workflows/samples-ruby.yaml

@@ -1,43 +0,0 @@
-name: Samples Ruby 
-
-on:
-  push:
-    paths:
-      - 'samples/client/echo_api/ruby-httpx/**'
-      - 'samples/client/echo_api/ruby-faraday/**'
-      - 'samples/client/echo_api/ruby-typhoeus/**'
-  pull_request:
-    paths:
-      - 'samples/client/echo_api/ruby-httpx/**'
-      - 'samples/client/echo_api/ruby-faraday/**'
-      - 'samples/client/echo_api/ruby-typhoeus/**'
-
-jobs:
-  build:
-    name: Build Ruby
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          - 'samples/client/echo_api/ruby-httpx/'
-          - 'samples/client/echo_api/ruby-faraday/'
-          - 'samples/client/echo_api/ruby-typhoeus/'
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup node.js
-        uses: actions/setup-node@v4
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-      - uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 3.0
-          bundler-cache: true
-      - name: Install bundle
-        working-directory: ${{ matrix.sample }}
-        run: bundle install
-      - name: Run rspec
-        working-directory: ${{ matrix.sample }}
-        run: rspec

.github/workflows/samples-rust.yaml

@@ -3,16 +3,12 @@ name: Samples Rust
 on:
   push:
     paths:
-      - "samples/client/others/rust/**"
-      - "samples/server/petstore/rust-server/**"
-      - "samples/client/petstore/rust-server/**"
-      - "samples/server/petstore/rust-axum/**"
+      - 'samples/client/petstore/rust/**'
+      - 'samples/server/petstore/rust-server/**'
   pull_request:
     paths:
-      - "samples/client/others/rust/**"
-      - "samples/client/petstore/rust/**"
-      - "samples/server/petstore/rust-server/**"
-      - "samples/server/petstore/rust-axum/**"
+      - 'samples/client/petstore/rust/**'
+      - 'samples/server/petstore/rust-server/**'
 
 jobs:
   build:
@@ -23,12 +19,10 @@ jobs:
       matrix:
         sample:
           # these folders contain sub-projects of rust clients, servers
-          - samples/client/others/rust/
           - samples/client/petstore/rust/
           - samples/server/petstore/rust-server/
-          - samples/server/petstore/rust-axum/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable

.github/workflows/samples-scala.yaml

@@ -22,25 +22,21 @@ jobs:
           # clients
           - 'samples/client/petstore/java/okhttp-gson'
           - samples/client/petstore/scalaz
-          - samples/client/petstore/scala-pekko
           #- 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:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-spring-jdk17.yaml

@@ -1,41 +0,0 @@
-name: Samples Java Spring (JDK17)
-
-on:
-  push:
-    paths:
-      - samples/openapi3/client/petstore/spring-cloud-3-with-optional
-  pull_request:
-    paths:
-      - samples/openapi3/client/petstore/spring-cloud-3-with-optional
-      - samples/server/petstore/springboot-lombok-data
-      - samples/server/petstore/springboot-lombok-tostring
-jobs:
-  build:
-    name: Build Java Spring (JDK17)
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/openapi3/client/petstore/spring-cloud-3-with-optional
-          # servers
-          - samples/server/petstore/springboot-lombok-data
-          - samples/server/petstore/springboot-lombok-tostring
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 17
-      - name: Cache maven dependencies
-        uses: actions/cache@v4
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.m2
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: mvn clean package

.github/workflows/samples-spring.yaml

@@ -3,16 +3,10 @@ name: Samples Java Spring
 on:
   push:
     paths:
-      # clients
-      - 'samples/client/petstore/spring*/**'
-      # servers
       - 'samples/server/petstore/spring*/**'
       - 'samples/openapi3/server/petstore/spring*/**'
   pull_request:
     paths:
-      # clients
-      - 'samples/client/petstore/spring*/**'
-      # servers
       - 'samples/server/petstore/spring*/**'
       - 'samples/openapi3/server/petstore/spring*/**'
 jobs:
@@ -28,21 +22,17 @@ jobs:
           - samples/openapi3/client/petstore/spring-cloud
           - samples/client/petstore/spring-cloud-date-time
           - samples/openapi3/client/petstore/spring-cloud-date-time
-          - samples/openapi3/client/petstore/spring-cloud-http-basic
           - samples/openapi3/client/petstore/spring-stubs
           - samples/openapi3/client/petstore/spring-stubs-skip-default-interface
           - samples/openapi3/client/petstore/spring-cloud-async
           - samples/openapi3/client/petstore/spring-cloud-spring-pageable
-          - samples/client/petstore/spring-cloud-tags
-          - samples/client/petstore/spring-cloud-auth
-          - samples/client/petstore/spring-cloud-deprecated
+          - samples/openapi3/client/petstore/spring-cloud-3-with-optional.yaml
           # servers
           - samples/server/petstore/springboot
           - samples/openapi3/server/petstore/springboot
           - samples/server/petstore/springboot-beanvalidation
           - samples/server/petstore/springboot-useoptional
           - samples/server/petstore/springboot-reactive
-          - samples/server/petstore/springboot-reactive-noResponseEntity
           - samples/server/petstore/springboot-implicitHeaders
           - samples/openapi3/server/petstore/springboot-implicitHeaders
           - samples/server/petstore/springboot-delegate
@@ -57,16 +47,15 @@ jobs:
           - samples/server/petstore/springboot-spring-pageable-delegatePattern
           - samples/server/petstore/springboot-spring-pageable-without-j8
           - samples/server/petstore/springboot-spring-pageable
-          - samples/server/petstore/springboot-spring-provide-args
-          - samples/server/petstore/springboot-lombok-data
+          - samples/openapi3/client/petstore/spring-cloud-tags.yaml
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-swift.yaml

@@ -1,50 +0,0 @@
-name: Samples Swift
-
-on:
-  push:
-    paths:
-      - samples/client/petstore/swift5/**
-  pull_request:
-    paths:
-      - samples/client/petstore/swift5/**
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest]
-        sample:
-          - samples/client/petstore/swift5/alamofireLibrary
-          - samples/client/petstore/swift5/anycodableLibrary
-          - samples/client/petstore/swift5/asyncAwaitLibrary
-          - samples/client/petstore/swift5/combineLibrary
-          - samples/client/petstore/swift5/default
-          - samples/client/petstore/swift5/deprecated
-          - samples/client/petstore/swift5/frozenEnums
-          - samples/client/petstore/swift5/nonPublicApi
-          - samples/client/petstore/swift5/objcCompatible
-          - samples/client/petstore/swift5/oneOf
-          - samples/client/petstore/swift5/promisekitLibrary
-          - samples/client/petstore/swift5/readonlyProperties
-          - samples/client/petstore/swift5/resultLibrary
-          - samples/client/petstore/swift5/rxswiftLibrary
-          - samples/client/petstore/swift5/urlsessionLibrary
-          - samples/client/petstore/swift5/validation
-          # NOTE: disabled as vaporLibrary doesnt build when adding this CI config
-          #- samples/client/petstore/swift5/vaporLibrary
-          - samples/client/petstore/swift5/x-swift-hashable
-        include:
-        - os: ubuntu-latest
-          sample: samples/client/petstore/swift5/alamofireLibrary
-    name: Build Swift samples
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: swift-actions/setup-swift@v2
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        with:
-          swift-version: '5'
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: swift build

.github/workflows/samples-typescript-axios-echo-api.yaml

@@ -1,42 +0,0 @@
-name: TypeScript Axios Client (Echo API)
-
-on:
-  pull_request:
-    paths:
-      - samples/client/echo_api/typescript-axios/**
-      - .github/workflows/samples-typescript-axios-echo-api.yaml
-jobs:
-  build:
-    name: Test TypeScript Axios client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/client/echo_api/typescript-axios/test
-        node-version:
-          - 16
-          - 18
-          - 20
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && git checkout 15a684c41d4de692878636f47fcc1670af309a0f && npm install && npm start &)
-
-      - name: Install
-        working-directory: ${{ matrix.sample }}
-        run: |
-          npm run preinstall
-          npm i
-
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: npm test

.github/workflows/samples-zapier.yaml

@@ -1,30 +0,0 @@
-name: Samples Zapier
-
-on:
-  push:
-    branches:
-      - 'samples/client/petstore/zapier/**'
-  pull_request:
-    paths:
-      - 'samples/client/petstore/zapier/**'
-
-jobs:
-  validate:
-    name: Test zapier generation
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          - samples/client/petstore/zapier
-    steps:
-    - uses: actions/checkout@v4
-    - name: Setup node
-      uses: actions/setup-node@v4
-    - name: Install dependencies
-      working-directory: ${{ matrix.sample }}
-      run: |
-        npm install
-    - name: Validate
-      working-directory: ${{ matrix.sample }}
-      run: node index.js

.github/workflows/sonar.yml

@@ -0,0 +1,26 @@
+name: Sonar CI
+on:
+  push:
+    branches:
+    - master
+    - '[4-9]+.[0-9]+.x'
+    - sonar
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'OpenAPITools' }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: 11
+    - name: Compile with Maven
+      run: ./mvnw -B -q clean install jacoco:report
+    - name: Jacoco Aggregate
+      run: ./mvnw jacoco:report-aggregate
+    - name: Publish to Sonar
+      run: ./mvnw -B -q -nsu sonar:sonar -Dsonar.projectKey=OpenAPITools_openapi-generator -Dsonar.organization=openapitools -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Dsonar.branch.name=${GITHUB_REF##*/}

.github/workflows/windows.yaml

@@ -18,14 +18,14 @@ jobs:
       matrix:
         java: [11, 17]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           cache-name: cache-maven-repository
         with:
@@ -39,7 +39,7 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.12.0
+        uses: s4u/setup-maven-action@v1.8.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8
@@ -53,7 +53,7 @@ jobs:
           # generator names containing "-" caused problems in the past, see https://github.com/OpenAPITools/openapi-generator/issues/9528
           java -jar ./openapi-generator-cli.jar author template --verbose  -g jaxrs-spec --library quarkus
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/gradle-build-action@v2
       - name: Gradle tests
         run: |
           gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace

.gitignore

@@ -8,7 +8,6 @@ out/
 *.gpg
 classpath.txt
 version.properties
-modules/openapi-generator-maven-plugin/src/test/resources/default/_merged_spec.yaml
 modules/openapi-generator-gradle-plugin/bin/
 !modules/openapi-generator-cli/src/main/resources/version.properties
 .project
@@ -85,17 +84,12 @@ samples/client/petstore/cpp-restsdk/CMakeCache.txt
 samples/client/petstore/cpp-restsdk/CMakeFiles/
 samples/client/petstore/cpp-restsdk/Makefile
 samples/client/petstore/cpp-restsdk/cmake_install.cmake
-samples/client/petstore/cpp-restsdk/client/CMakeFiles
-samples/client/petstore/cpp-restsdk/client/Makefile
-samples/client/petstore/cpp-restsdk/client/cmake_install.cmake
-samples/client/petstore/cpp-restsdk/client/CppRestPetstoreClientConfig.cmake
-samples/client/petstore/cpp-restsdk/client/CMakeCache.txt
 
 #Java/Android
 **/.gradle
 samples/client/petstore/java/hello.txt
 samples/client/petstore/java/okhttp-gson/hello.txt
-samples/client/petstore/java/okhttp-gson-3.1/hello.txt
+samples/client/petstore/java/jersey1/hello.txt
 samples/client/petstore/java/jersey2-java8/hello.txt
 samples/client/petstore/java/jersey2/hello.txt
 samples/client/petstore/android/default/hello.txt
@@ -179,17 +173,17 @@ samples/client/petstore/csharp-refactor/OpenAPIClient/nuget.exe
 # Python
 *.pyc
 __pycache__
-.venv/
 samples/client/petstore/python/dev-requirements.txt.log
 samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt
 samples/client/petstore/python/.coverage
 samples/client/petstore/python/.projectile
+samples/client/petstore/python/.venv/
+samples/client/petstore/python-asyncio/.venv/
 samples/client/petstore/python-asyncio/.pytest_cache/
-**/poetry.lock
+samples/client/petstore/python-tornado/.venv/
 
 # PHP
 samples/client/petstore/php/OpenAPIClient-php/composer.lock
-samples/client/petstore/php-nextgen/OpenAPIClient-php/composer.lock
 samples/client/petstore/php-dt/composer.lock
 samples/client/petstore/php-dt-modern/composer.lock
 samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/composer.lock
@@ -217,8 +211,6 @@ samples/server/petstore/kotlin-server/ktor/build
 samples/server/petstore/kotlin-springboot/build
 samples/client/petstore/kotlin*/src/main/kotlin/test/
 samples/client/petstore/kotlin*/build/
-samples/server/others/kotlin-server/jaxrs-spec/build/
-samples/client/echo_api/kotlin-jvm-spring-3-restclient/build/
 
 # haskell
 .stack-work
@@ -278,7 +270,6 @@ samples/client/petstore/c/*.so
 # Ruby
 samples/openapi3/client/petstore/ruby/Gemfile.lock
 samples/openapi3/client/petstore/ruby-faraday/Gemfile.lock
-samples/openapi3/client/petstore/ruby-httpx/Gemfile.lock
 
 # Crystal
 samples/client/petstore/crystal/lib
@@ -288,6 +279,3 @@ samples/openapi3/client/petstore/go/privatekey.pem
 
 ## OCaml
 samples/client/petstore/ocaml/_build/
-
-# jetbrain http client
-samples/client/jetbrains/adyen/checkout71/http/client/Apis/http-client.private.env.json

.hub.cli.dockerfile

@@ -3,19 +3,19 @@
 ##
 ## You can build _just_ this part with:
 ##     docker --target builder -t container-name:builder -f .hub.cli.dockerfile .
-FROM maven:3-eclipse-temurin-17 as builder
+FROM maven:3.6.3-jdk-11-openj9 as builder
 
 ENV GEN_DIR /opt/openapi-generator
 WORKDIR ${GEN_DIR}
 COPY . ${GEN_DIR}
 
 # Pre-compile openapi-generator-cli
-RUN mvn -B -am -pl "modules/openapi-generator-cli" package
+RUN mvn -am -pl "modules/openapi-generator-cli" package
 
 ## The final (release) image
 ## The resulting container here only needs the target jar
 ## and ca-certificates (to be able to query HTTPS hosted specs)
-FROM eclipse-temurin:17-jre
+FROM openjdk:11.0.8-jre-slim-buster
 
 ENV GEN_DIR /opt/openapi-generator
 

.hub.online.dockerfile

@@ -3,18 +3,18 @@
 ##
 ## You can build _just_ this part with:
 ##     docker --target builder -t container-name:builder -f .hub.online.dockerfile .
-FROM maven:3-eclipse-temurin-17 as builder
+FROM maven:3.6.3-jdk-11-openj9 as builder
 
 ENV GEN_DIR /opt/openapi-generator
 WORKDIR ${GEN_DIR}
 COPY . ${GEN_DIR}
 
 # Pre-compile openapi-generator-online
-RUN mvn -B -am -pl "modules/openapi-generator-online" package
+RUN mvn -am -pl "modules/openapi-generator-online" package
 
 ## The final (release) image
 ## The resulting container here only needs the target jar
-FROM eclipse-temurin:17-jre
+FROM openjdk:11.0.8-jre-slim-buster
 
 ENV GEN_DIR /opt/openapi-generator
 ENV TARGET_DIR /generator

.java-version

@@ -1 +1 @@
-11
+1.8

.mvn/extensions.xml

@@ -3,11 +3,11 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>gradle-enterprise-maven-extension</artifactId>
-        <version>1.20.1</version>
+        <version>1.17</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>common-custom-user-data-maven-extension</artifactId>
-        <version>1.12.5</version>
+        <version>1.11.1</version>
     </extension>
 </extensions>

.mvn/gradle-enterprise.xml

@@ -34,12 +34,19 @@
   </buildScan>
   <buildCache>
     <local>
-      <enabled>true</enabled>
+      <enabled>false</enabled>
     </local>
     <remote>
-      <enabled>true</enabled>
-      <!-- Check credentials presence to avoid build cache errors on PR builds when credentials are not present -->
-      <storeEnabled>#{isTrue(env['CI']) and isTrue(env['GRADLE_ENTERPRISE_ACCESS_KEY'])}</storeEnabled>
+      <server>
+        <url>https://ge.openapi-generator.tech/cache/exp3/</url>           <!-- adjust to your GE hostname, and note the trailing slash -->
+        <allowUntrusted>true</allowUntrusted>                   <!-- set to false if a trusted certificate is configured for the GE server -->
+        <credentials>
+          <username>${env.GRADLE_ENTERPRISE_CACHE_USERNAME}</username>
+          <password>${env.GRADLE_ENTERPRISE_CACHE_PASSWORD}</password>
+        </credentials>
+      </server>
+      <enabled>true</enabled>                                   <!-- must be true for this experiment -->
+      <storeEnabled>#{env['CI'] != null}</storeEnabled>  <!-- adjust to an env var that is always present only in your CI environment -->
     </remote>
   </buildCache>
 </gradleEnterprise>

.travis.yml

@@ -22,7 +22,6 @@ cache:
   - $HOME/samples/client/petstore/ruby/vendor/bundle
   - $HOME/samples/client/petstore/python/.venv/
   - $HOME/samples/server/petstore/rust-server/target
-  - $HOME/samples/server/petstore/rust-axum/target
   - $HOME/perl5
   - $HOME/.cargo
   - $HOME/.pub-cache
@@ -137,7 +136,7 @@ script:
   # run integration tests defined in maven pom.xml
   # WARN: Travis will timeout after 10 minutes of no stdout/stderr activity, which is problematic with mvn --quiet.
   # show "error" only to reduce the log size
-  - ./mvnw -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -DskipTests -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - ./mvnw -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -DskipTests -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error 2>&1 | grep -i error
 after_success:
   # push to maven repo
   - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

CI/.drone.yml

@@ -0,0 +1,98 @@
+kind: pipeline
+type: docker
+name: java11-test
+steps:
+# test Java 11 HTTP client
+- name: java11-test
+  image: openjdk:11.0
+  commands:
+  - ./mvnw --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - ./mvnw --quiet verify -Psamples.droneio -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  # test java native client
+  - ./mvnw clean test -f samples/client/petstore/java/native/pom.xml
+  - ./mvnw clean test -f samples/client/petstore/java/native-async/pom.xml
+  - ./mvnw clean test -f samples/openapi3/client/petstore/java/native/pom.xml
+  # test all generators with fake petstore spec (2.0, 3.0)
+  - /bin/bash bin/utils/test-fake-petstore-for-all.sh
+  # generate test scripts
+  - /bin/bash bin/tests/run-all-test
+
+---
+kind: pipeline
+type: docker
+name: nim-client-test
+steps:
+# test nim client
+- name: nim-client-test
+  image: nimlang/nim
+  commands:
+  - (cd samples/client/petstore/nim/ && nim c sample_client.nim)
+
+---
+kind: pipeline
+type: docker
+name: protobuf-schema-test
+steps:
+# test protobuf schema generator
+- name: protobuf-schema-test
+  image: nanoservice/protobuf-go
+  commands:
+  - protoc --version
+  - mkdir /var/tmp/go/
+  - cd samples/config/petstore/protobuf-schema
+  - protoc --go_out=/var/tmp/go/ services/*
+  - protoc --go_out=/var/tmp/go/ models/*
+
+---
+kind: pipeline
+type: docker
+name: aspnetcore-test
+steps:
+# test aspnetcore 3.x
+- name: aspnetcore-test
+  image: mcr.microsoft.com/dotnet/core/sdk:3.1
+  commands:
+  - (cd samples/server/petstore/aspnetcore-3.1/ && /bin/sh build.sh)
+  - (cd samples/server/petstore/aspnetcore-3.0/ && /bin/sh build.sh)
+
+---
+kind: pipeline
+type: docker
+name: ocaml-test
+steps:
+# test ocaml petstore client
+- name: ocaml-test
+  image: ocaml/opam2:4.07
+  commands:
+  - sudo apt-get -y install m4
+  - cd samples/client/petstore/ocaml
+  - opam install ppx_deriving_yojson cohttp ppx_deriving cohttp-lwt-unix 
+  - opam pin add ocaml-migrate-parsetree 1.3.1
+  - eval $(opam env)
+  - sudo chmod -R 777 .
+  - dune build --build-dir=./_build
+
+---
+kind: pipeline
+type: docker
+name: haskell-client-test
+steps:
+# test haskell client
+- name: haskell-client-test
+  image: haskell:8.10.4
+  commands:
+  - (cd samples/client/petstore/haskell-http-client/ && stack --allow-different-user --install-ghc --no-haddock-deps haddock --fast && stack --allow-different-user test --fast)
+
+---
+kind: pipeline
+type: docker
+name: erlang
+steps:
+# test erlang client and server
+- name: erlang
+  image: erlang:alpine
+  commands:
+  - (cd samples/client/petstore/erlang-client && rebar3 compile)
+  - (cd samples/client/petstore/erlang-proper && rebar3 compile)
+  # comment out as the tests pass locally but not in the CI
+  #- (cd samples/server/petstore/erlang-server && rebar3 compile)

CI/.travis.yml.ios

@@ -0,0 +1,37 @@
+sudo: required
+language: objective-c
+osx_image: xcode10.3
+before_install:
+  - export SW=`pwd`
+  - rvm list
+  #- rvm use 2.3.3
+  - gem environment
+  - gem install bundler -N 
+  - gem install cocoapods -v 1.2.1 -N 
+  - gem install xcpretty -N 
+  - pod --version
+  # comment out below to avoid errors
+  #- pod repo update
+  #- pod setup --silent > /dev/null
+  #- mkdir -p ~/.local/bin
+  #- export PATH=$HOME/.local/bin:$PATH
+  ## start local petstore server
+  #- git clone -b docker --single-branch https://github.com/wing328/swagger-samples
+  #- cd swagger-samples/java/java-jersey-jaxrs
+  #- sudo mvn jetty:run &
+  #- cd $SW
+
+  # show host table to confirm petstore.swagger.io is mapped to localhost
+  - cat /etc/hosts
+  # show java version
+  - java -version
+  # show brew version
+  - brew --version
+  # show xcpretty version
+  - xcpretty -v
+  # show go version
+  - go version
+
+script:
+  # run integration tests defined in maven pom.xml
+  - mvn --no-snapshot-updates -q --batch-mode verify -Psamples.ios -Dmaven.javadoc.skip=true

CI/.travis.yml.jdk6

@@ -0,0 +1,29 @@
+dist: trusty
+sudo: required
+language: java
+addons:
+  apt:
+    packages:
+      - openjdk-6-jdk
+jdk: openjdk6
+
+cache:
+  directories:
+  - $HOME/.m2
+  - $HOME/.ivy2
+  - $HOME/.gradle/caches/
+  - $HOME/.gradle/wrapper/
+
+install:
+   - jdk_switcher use openjdk6 
+   - java -version
+   - curl -s "https://get.sdkman.io" | bash
+   - source "$HOME/.sdkman/bin/sdkman-init.sh"
+   - sdk version
+   - sdk install gradle 2.9
+   - sdk list gradle
+   - sdk version
+   - gradle --version
+
+script:
+  - cd samples/client/petstore/java/jersey2-java6 && gradle test

CI/circle_parallel.sh

@@ -9,17 +9,20 @@ set -e
 
 export NODE_ENV=test
 
+function cleanup {
+  # Show logs of 'petstore.swagger' container to troubleshoot Unit Test failures, if any.
+  if [ "$NODE_INDEX" != "4" ]; then
+    docker logs petstore.swagger # container name specified in circle.yml
+  fi
+}
+
+trap cleanup EXIT
+
 if [ "$NODE_INDEX" = "1" ]; then
-  echo "Running node $NODE_INDEX ..."
+  echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..."
   java -version
 
-  sudo apt-get -y install cpanminus
-
-  (cd samples/client/petstore/perl && /bin/bash ./test.bash)
-  (cd samples/client/petstore/ruby && mvn integration-test)
-  (cd samples/client/petstore/ruby-faraday && mvn integration-test)
-  (cd samples/client/petstore/ruby-httpx && mvn integration-test)
-  (cd samples/client/petstore/ruby-autoload && mvn integration-test)
+  ./mvnw --no-snapshot-updates --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 
 elif [ "$NODE_INDEX" = "2" ]; then
   echo "Running node $NODE_INDEX to test Go"
@@ -39,14 +42,20 @@ elif [ "$NODE_INDEX" = "2" ]; then
   export PATH="/usr/local/go1.18/go/bin:$PATH"
   go version
 
-  # run go integration tests
-  (cd samples/client/petstore/go && mvn integration-test)
-  (cd samples/openapi3/client/petstore/go && mvn integration-test)
-  (cd samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false && mvn integration-test)
-
+  # run integration tests
+  ./mvnw --no-snapshot-updates --quiet verify -Psamples.misc -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 elif [ "$NODE_INDEX" = "3" ]; then
 
-  echo "Running node $NODE_INDEX ... "
+  echo "Running node $NODE_INDEX to test 'samples.circleci.node3' defined in pom.xml ..."
+  #wget https://www.python.org/ftp/python/3.8.9/Python-3.8.9.tgz
+  #tar -xf Python-3.8.9.tgz
+  #cd Python-3.8.9
+  #./configure --enable-optimizations
+  #sudo make altinstall
+  pyenv install --list 
+  pyenv install 3.7.12
+  #pyenv install 2.7.14 #python2 no longer supported
+  pyenv global 3.7.12
 
   # Install node@stable (for angular 6)
   set +e
@@ -63,52 +72,23 @@ elif [ "$NODE_INDEX" = "3" ]; then
   echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
   echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
 
-  (cd samples/client/others/typescript-angular && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v12-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v13-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v14-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v15-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v16-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v17-provided-in-root && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/default && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/default && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/jquery && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/jquery && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/object_params && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/object_params && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/inversify && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/inversify && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/tests/deno && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/browser && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/browser && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/builds/default && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/builds/es6-target && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/builds/with-npm-version && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/tests/default && mvn integration-test)
-  (cd samples/client/petstore/typescript-node/npm && mvn integration-test)
-  (cd samples/client/petstore/typescript-rxjs/builds/with-npm-version && mvn integration-test)
-  (cd samples/client/petstore/typescript-axios/builds/with-npm-version && mvn integration-test)
-  (cd samples/client/petstore/typescript-axios/tests/default && mvn integration-test)
-  (cd samples/client/petstore/javascript-flowtyped && mvn integration-test)
-  (cd samples/client/petstore/javascript-es6 && mvn integration-test)
-  (cd samples/client/petstore/javascript-promise-es6 && mvn integration-test)
+  ./mvnw --no-snapshot-updates --quiet verify -Psamples.circleci.node3 -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+
+elif [ "$NODE_INDEX" = "4" ]; then
+  echo "Running node $NODE_INDEX to test 'samples.circleci.node4' defined in pom.xml ..."
+
+  #mvn --no-snapshot-updates --quiet verify -Psamples.circleci.node4 -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  #(cd samples/openapi3/client/petstore/python && make test)
+  # comment out due to ModuleNotFoundError: No module named 'urllib3.request'
+  #(cd samples/openapi3/client/petstore/python-prior && make test)
+  #(cd samples/openapi3/client/3_0_3_unit_test/python && make test)
 
 else
-  echo "Running node $NODE_INDEX ..."
+  echo "Running node $NODE_INDEX to test 'samples.circleci.others' defined in pom.xml ..."
   java -version
 
-  (cd samples/client/petstore/scala-akka && mvn integration-test)
-  (cd samples/client/petstore/scala-sttp && 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)
-  (cd samples/openapi3/client/petstore/java/jersey2-java8 && mvn integration-test)
-  (cd samples/client/petstore/java/jersey3 && mvn integration-test)
-  (cd samples/client/others/java/okhttp-gson-streaming && mvn integration-test)
-  (cd samples/client/petstore/java/okhttp-gson && mvn integration-test)
-  (cd samples/client/petstore/java/okhttp-gson-3.1 && mvn integration-test)
-  (cd samples/client/petstore/java/resteasy && mvn integration-test)
-  (cd samples/client/petstore/java-micronaut-client && mvn integration-test)
-  (cd samples/client/petstore/java/apache-httpclient && mvn integration-test)
-
+  ./mvnw --no-snapshot-updates --quiet verify -Psamples.circleci.others -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  ./mvnw --no-snapshot-updates --quiet javadoc:javadoc -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 fi
+
+

CONTRIBUTING.md

@@ -31,7 +31,7 @@ Please file the pull request against the correct branch, e.g. `master` for non-b
 
 All the code generators can be found in [modules/openapi-generator/src/main/java/org/openapitools/codegen/languages](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages)
 
-If you want to add a new generator, follow the [new-generator](https://openapi-generator.tech/docs/new-generator) guide.
+If you want to add a new generator, follow the [new-generator](https://openapi-generator.tech/docs/new-generator) guide. 
 
 ### Templates
 
@@ -84,26 +84,6 @@ For [Vendor Extensions](https://github.com/OAI/OpenAPI-Specification/blob/master
 - For language-specified vendor extension, put it in the form of `x-{lang}-{extension-name}`. e.g. `x-objc-operation-id`, `x-java-feign-retry-limit`
 - For a list of existing vendor extensions in use, please refer to https://github.com/openapitools/openapi-generator/wiki/Vendor-Extensions. If you've added new vendor extensions as part of your PR, please update the wiki page.
 
-### Building
-
-The `openapi-generator-cli` can be built using the following command. This will generate the `openapi-generator-cli.jar` in the `modules/openapi-generator-cli/target` directory without running the tests and generating the Javadocs.
-
-```shell
-./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
-```
-
-Or on Windows:
-
-```shell
-mvnw.cmd clean install -DskipTests -Dmaven.javadoc.skip=true
-```
-
-The binary can run via `java -jar`. For example:
-
-```shell
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help
-```
-
 ### Testing
 
 To add test cases (optional) covering the change in the code generator, please refer to [modules/openapi-generator/src/test/java/org/openapitools/codegen](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/test/java/org/openapitools/codegen)
@@ -132,5 +112,5 @@ See [OpenAPI Tools wiki](https://github.com/OpenAPITools/openapi-generator/wiki/
 - File a PR with meaningful title, description and commit messages
 - Make sure the option "Allow edits from maintainers" in the PR is selected so that the maintainers can update your PRs with minor fixes, if needed.
 - Recommended git settings
-   - `git config core.autocrlf input` to tell Git convert CRLF to LF on commit but not the other way around
+   - `git config core.autocrlf input` to tell Git convert CRLF to LF on commit but not the other way around 
 - To close an issue (e.g. issue 1542) automatically after a PR is merged, use keywords "fix", "close", "resolve" in the PR description, e.g. `fix #1542`. (Ref: [closing issues using keywords](https://help.github.com/articles/closing-issues-using-keywords/))

Dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3-eclipse-temurin-17
+FROM maven:3.6.3-jdk-11-openj9
 
 ENV GEN_DIR /opt/openapi-generator
 WORKDIR ${GEN_DIR}
@@ -20,7 +20,7 @@ COPY ./modules/openapi-generator ${GEN_DIR}/modules/openapi-generator
 COPY ./pom.xml ${GEN_DIR}
 
 # Pre-compile openapi-generator-cli
-RUN mvn -B -am -pl "modules/openapi-generator-cli" package
+RUN mvn -am -pl "modules/openapi-generator-cli" package
 
 # This exists at the end of the file to benefit from cached layers when modifying docker-entrypoint.sh.
 COPY docker-entrypoint.sh /usr/local/bin/

README.md

@@ -9,13 +9,13 @@
 [![Join the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/zt-12jxxd7p2-XUeQM~4pzsU9x~eGLQqX2g)
 [![Follow OpenAPI Generator Twitter account to get the latest update](https://img.shields.io/twitter/follow/oas_generator.svg?style=social&label=Follow)](https://twitter.com/oas_generator)
 [![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/OpenAPITools/openapi-generator)
-[![Conan Center](https://shields.io/conan/v/openapi-generator)](https://conan.io/center/recipes/openapi-generator)
-[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.openapi-generator.tech/scans)
+[![Conan Center](https://shields.io/conan/v/openapi-generator)](https://conan.io/center/openapi-generator)
+[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.openapi-generator.tech/scans)
 </div>
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.6.0`):
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.0.0`):
 [![Build Status](https://api.travis-ci.com/OpenAPITools/openapi-generator.svg?branch=master&status=passed)](https://app.travis-ci.com/github/OpenAPITools/openapi-generator/builds)
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator)
@@ -25,7 +25,7 @@
 
 <div align="center">
 
-:star::star::star: If you would like to contribute, please refer to [guidelines](CONTRIBUTING.md) and a list of [open tasks](https://github.com/openapitools/openapi-generator/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22). :star::star::star:
+:star::star::star: If you would like to contribute, please refer to [guidelines](CONTRIBUTING.md) and a list of [open tasks](https://github.com/openapitools/openapi-generator/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).:star::star::star:
 
 :bangbang: To migrate from Swagger Codegen to OpenAPI Generator, please refer to the [migration guide](docs/migration-from-swagger-codegen.md) :bangbang:
 
@@ -60,35 +60,24 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [<img src="https://openapi-generator.tech/img/companies/finbourne.png" width="128" height="128">](https://www.finbourne.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/bumpsh.png" width="128" height="128">](https://bump.sh/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/bileto.png" width="128" height="128">](https://www.bileto.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/bairesdev.png" width="128" height="128">](https://www.bairesdev.com/sponsoring-open-source-projects/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/dmtech.jpeg" width="128" height="128">](https://www.dmtech.de/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/adyen.png" width="128" height="128">](https://adyen.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/fornex.png" width="128" height="128">](https://fornex.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/alloyautomation.png" width="128" height="128">](https://runalloy.com/signup?utm_source=github&utm_medium=referral&utm_campaign=1524_openapigenerator)
-[<img src="https://openapi-generator.tech/img/companies/ssstwitter.png" width="128" height="128">](https://ssstwitter.com/?utm_source=github&utm_medium=referral&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/svix.png" width="128" height="128">](https://www.svix.com/?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
-[<img src="https://openapi-generator.tech/img/companies/litslink.png" width="128" height="128">](https://litslink.com/services/artificial-intelligence?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
-[<img src="https://openapi-generator.tech/img/companies/designli.jpg" width="128" height="128">](https://designli.co?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
 
-
-#### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS, Checkly for sponsoring the API monitoring and Gradle for sponsoring Develocity
+#### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS and Checkly for sponsoring the API monitoring
 
 [<img src="https://openapi-generator.tech/img/companies/godaddy.png" width="150">](https://www.godaddy.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [![Linode](https://www.linode.com/media/images/logos/standard/light/linode-logo_standard_light_small.png)](https://www.linode.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcRAhEYadUyZYzGUotZiSdXkVMqqLGuohyixLl4eUpUV6pAbUULL" width="150">](https://checklyhq.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cb/Gradle_logo.png/320px-Gradle_logo.png" width="150">](https://gradle.org?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+
 
 ## Overview
-
 OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs,  documentation and configuration automatically given an [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification) (both 2.0 and 3.0 are supported). Currently, the following languages/frameworks are supported:
 
 |                                  | Languages/Frameworks                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | -------------------------------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient 4.x, Apache HttpClient 5.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **Jetbrains HTTP Client**, **Julia**, **k6**, **Kotlin**, **Lua**, **N4JS**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient, pekko), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (9.x - 17.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs), **XoJo**, **Zapier** |
-| **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/), [Helidon](https://helidon.io/)), **Julia**, **Kotlin** (Spring Boot, [Ktor](https://github.com/ktorio/ktor), [Vert.x](https://vertx.io/)), **PHP** ([Flight](https://docs.flightphp.com/), Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), [Cask](https://github.com/com-lihaoyi/cask), Scalatra)                                                                                                                                                                                                                                               |
+| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient 4.x, Apache HttpClient 5.x, Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **Jetbrains HTTP Client**, **Julia**, **k6**, **Kotlin**, **Lua**, **N4JS**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (9.x - 16.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs), **XoJo** |
+| **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/), [Helidon](https://helidon.io/)), **Julia**, **Kotlin** (Spring Boot, [Ktor](https://github.com/ktorio/ktor), [Vert.x](https://vertx.io/)), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                                                                               |
 | **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Postman Collection**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 
 ## Table of contents
 
@@ -126,15 +115,12 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 7.6.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.6.0-SNAPSHOT/) | 17.54.2024   | Minor release with breaking changes (with fallback) |
-| [7.5.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.5.0) (latest stable release)                                                    | 17.04.2024   | Minor release with breaking changes (with fallback) |
-| [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)                                                    | 11.05.2023   | Minor release with breaking changes (with fallback) |
+| 7.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.0.0-SNAPSHOT/) | May/Jun 2023   | Major release with breaking changes (no fallback) |
+| [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0) (latest stable release)                                                    | 11.05.2023   | Minor release with breaking changes (with fallback) |
 | [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0)                                                    | 31.01.2022   | Minor release with breaking changes (with fallback) |
 | [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |
 
-OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0, 3.1 (beta support)
-
-(We do not publish daily/nightly build. Please use SNAPSHOT instead)
+OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0
 
 For old releases, please refer to the [**Release**](https://github.com/OpenAPITools/openapi-generator/releases) page.
 
@@ -190,16 +176,16 @@ See the different versions of the [openapi-generator-cli](https://search.maven.o
 <!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 11 runtime at a minimum):
 
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.5.0/openapi-generator-cli-7.5.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.6.0/openapi-generator-cli-6.6.0.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.5.0/openapi-generator-cli-7.5.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.6.0/openapi-generator-cli-6.6.0.jar -O openapi-generator-cli.jar
 ```
 
 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 ```
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.5.0/openapi-generator-cli-7.5.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.6.0/openapi-generator-cli-6.6.0.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -262,7 +248,7 @@ To build from source, you need the following installed and available in your `$P
 
 * [Apache Maven 3.3.4 or greater](https://maven.apache.org/) (optional)
 
-After cloning the project, you can build it from source using [maven wrapper](https://maven.apache.org/wrapper/):
+After cloning the project, you can build it from source using [maven wrapper](https://github.com/takari/maven-wrapper):
 
 - Linux: `./mvnw clean install`
 - Windows: `mvnw.cmd clean install`
@@ -434,7 +420,7 @@ openapi-generator-cli version
 To use a specific version of "openapi-generator-cli"
 
 ```sh
-openapi-generator-cli version-manager set 7.0.1
+openapi-generator-cli version-manager set 6.6.0
 ```
 
 Or install it as dev-dependency:
@@ -458,7 +444,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
 (if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`)
 
 <!-- RELEASE_VERSION -->
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.1/openapi-generator-cli-7.0.1.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.6.0/openapi-generator-cli-6.6.0.jar)
 <!-- /RELEASE_VERSION -->
 
 To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`
@@ -483,7 +469,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
   -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
   -g java \
   -t modules/openapi-generator/src/main/resources/Java \
-  --additional-properties artifactId=petstore-okhttp-gson,hideGenerationTimestamp=true \
+  --additional-properties artifactId=petstore-okhttp-gson,hideGenerationTimestamp:true \
   -o samples/client/petstore/java/okhttp-gson
 ```
 
@@ -623,13 +609,10 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [California State University, Northridge](https://www.csun.edu)
 - [CAM](https://www.cam-inc.co.jp/)
 - [Camptocamp](https://www.camptocamp.com/en)
-- [Carlsberg Group](https://www.carlsberggroup.com/)
-- [Christopher Queen Consulting](https://www.christopherqueenconsulting.com/)
 - [Cisco](https://www.cisco.com/)
 - [codecentric AG](https://www.codecentric.de/)
 - [CoinAPI](https://www.coinapi.io/)
 - [Commencis](https://www.commencis.com/)
-- [cronn GmbH](https://www.cronn.de/)
 - [Crossover Health](https://crossoverhealth.com/)
 - [Cupix](https://www.cupix.com/)
 - [Datadog](https://www.datadoghq.com)
@@ -665,7 +648,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Klarna](https://www.klarna.com/)
 - [Kronsoft Development](https://www.kronsoft.ro/home/)
 - [Kubernetes](https://kubernetes.io)
-- [Landeshauptstadt München - it@M](https://muenchen.digital/it-at-m/)
 - [Linode](https://www.linode.com/)
 - [Logicdrop](https://www.logicdrop.com)
 - [Lumeris](https://www.lumeris.com)
@@ -703,15 +685,12 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [RedHat](https://www.redhat.com)
 - [RepreZen API Studio](https://www.reprezen.com/swagger-openapi-code-generation-api-first-microservices-enterprise-development)
 - [REST United](https://restunited.com)
-- [Robocorp](https://www.robocorp.com)
 - [Robotinfra](https://www.robotinfra.com)
-- [SearchApi](https://www.searchapi.io/)
 - [SmartHR](https://smarthr.co.jp/)
 - [Sony Interactive Entertainment](https://www.sie.com/en/index.html)
 - [Splitit](https://www.splitit.com/)
 - [Stingray](http://www.stingray.com)
 - [Suva](https://www.suva.ch/)
-- [Svix](https://www.svix.com/)
 - [Telstra](https://dev.telstra.com)
 - [Tencent](https://www.tencent.com)
 - [The University of Aizu](https://www.u-aizu.ac.jp/en/)
@@ -906,7 +885,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2022-04-06 - [Effective Software Development using OpenAPI Generator](https://apexlabs.ai/post/openapi-generator) by Ajil Oommen (Senior Flutter Developer)
 - 2022-05-13 - [A Path From an API To Client Libraries](https://www.youtube.com/watch?v=XC8oVn_efTw) by [Filip Srnec](https://www.devoxx.co.uk/talk/?id=11211) at Infobip
 - 2022-06-01 - [API First, using OpenAPI and Spring Boot](https://medium.com/xgeeks/api-first-using-openapi-and-spring-boot-2602c04bb0d3) by [Micael Estrázulas Vianna](https://estrazulas.medium.com/)
-- 2022-06-10 - [Autogenerating Clients with FastAPI and Github Actions](https://www.propelauth.com/post/autogenerating-clients-with-fastapi-and-github-actions) by [Andrew Israel](https://www.propelauth.com/author/andrew)
 - 2022-06-12 - [Mustache templates with OpenAPI specs](https://medium.com/geekculture/mustache-templates-with-openapi-specs-f24711c67dec) by [Beppe Catanese](https://github.com/gcatanese)
 - 2022-07-01 - [Generate API contract using OpenAPI Generator Maven plugin](https://huongdanjava.com/generate-api-contract-using-openapi-generator-maven-plugin.html) by [Khanh Nguyen](https://huongdanjava.com/)
 - 2022-07-22 - [使用OpenAPI Generator Maven plugin开发api优先的java客户端和服务端代码](https://blog.roccoshi.top/2022/java/openapi-generator%E7%9A%84%E4%BD%BF%E7%94%A8/) by [Lincest](https://github.com/Lincest)
@@ -927,12 +905,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2023-04-27 - [Create an Angular Client using OpenAPI Specifications](Create an Angular Client using OpenAPI Specifications) by [Patric](https://pguso.medium.com/)
 - 2023-05-16 - [Adyen for Java developers](https://www.adyen.com/blog/adyen-java-library) by [Beppe Catanese, Developer Advocate, Adyen](https://github.com/gcatanese)
 - 2023-05-18 - [如何基于 Swagger 使用 OpenAPI Generator 生成 JMeter 脚本？](https://blog.51cto.com/u_15181572/6294974) by [高楼（Zee)](https://blog.51cto.com/u_15181572)
-- 2023-06-28 - [Generate API contract using OpenAPI Generator Maven plugin](https://huongdanjava.com/generate-api-contract-using-openapi-generator-maven-plugin.html) by [Khanh Nguyen](https://huongdanjava.com/)
-- 2023-06-30 - [Generate Client SDKs with OpenApi Generator in Springboot](https://medium.com/@ramavathvinayak/generate-client-sdks-with-openapi-generator-in-springboot-f9f012e73c0b) by [Vinayak Ramavath](https://medium.com/@ramavathvinayak)
-- 2023-12-10 - [UnityでOpenAPI Generatorを使う](https://www.youtube.com/watch?v=CbNwKVV5LRM) by [Soup Tori](https://www.youtube.com/@souptori8417)
-- 2024-03-04 - [Generating TypeScript Types with OpenAPI for REST API Consumption](https://www.pullrequest.com/blog/generating-typescript-types-with-openapi-for-rest-api-consumption/) by [PullRequest](https://www.pullrequest.com/)
-- 2024-03-07 - [Fully typed Web Apps with OpenAPI (Part 1)](https://medium.com/@gfox1984/fully-typed-web-apps-with-openapi-part-1-595d55766670) by [Guillaume Renard](https://medium.com/@gfox1984)
-- 2024-03-08 - [Laravel OpenAPIによる "辛くない" スキーマ駆動開発](https://fortee.jp/phperkaigi-2024/proposal/9e2e6c38-d078-4efa-99b4-83ebf9033b34) by [KentarouTakeda](https://twitter.com/KentarouTakeda)
 
 ## [6 - About Us](#table-of-contents)
 
@@ -950,9 +922,12 @@ OpenAPI Generator core team members are contributors who have been making signif
 * [@cbornet](https://github.com/cbornet) (2016/05)
 * [@jmini](https://github.com/jmini) (2018/04)  [:heart:](https://www.patreon.com/jmini)
 * [@etherealjoy](https://github.com/etherealjoy) (2019/06)
+* [@spacether](https://github.com/spacether) (2020/05) [:heart:][spacether sponsorship]
 
 :heart: = Link to support the contributor directly
 
+[spacether sponsorship]: https://github.com/sponsors/spacether/
+
 #### Template Creator
 
 **NOTE**: Embedded templates are only supported in _Mustache_ format. Support for all other formats is experimental and subject to change at any time.
@@ -1012,7 +987,6 @@ Here is a list of template creators:
    * Kotlin (MultiPlatform): @andrewemery
    * Kotlin (Volley): @alisters
    * Kotlin (jvm-spring-webclient): @stefankoppier
-   * Kotlin (jvm-spring-restclient): @stefankoppier
    * Lua: @daurnimator
    * N4JS: @mmews-n4
    * Nim: @hokamoto
@@ -1024,17 +998,14 @@ Here is a list of template creators:
    * PowerShell (refactored in 5.0.0): @wing328
    * Python: @spacether [:heart:][spacether sponsorship]
    * Python-Experimental: @spacether [:heart:][spacether sponsorship]
-   * Python (refactored in 7.0.0): @wing328
    * R: @ramnov
    * Ruby (Faraday): @meganemura @dkliban
-   * Ruby (HTTPX): @honeyryderchuck
    * Rust: @farcaller
    * Rust (rust-server): @metaswitch
    * Scala (scalaz & http4s): @tbrown1979
    * Scala (Akka): @cchafer
    * Scala (sttp): @chameleon82
    * Scala (sttp4): @flsh86
-   * Scala (Pekko): @mickaelmagniez
    * Swift: @tkqubo
    * Swift 3: @hexelon
    * Swift 4: @ehyche
@@ -1053,7 +1024,6 @@ Here is a list of template creators:
    * TypeScript (Rxjs): @denyo
    * TypeScript (redux-query): @petejohansonxo
    * Xojo: @Topheee
-   * Zapier: @valmoz, @emajo
  * Server Stubs
    * Ada: @stcarrez
    * C# ASP.NET 5: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
@@ -1092,7 +1062,6 @@ Here is a list of template creators:
    * Kotlin (Vertx): @Wooyme
    * Kotlin (JAX-RS): @anttileppa
    * NodeJS Express: @YishTish
-   * PHP Flight: @daniel-sc
    * PHP Laravel: @renepardon
    * PHP Lumen: @abcsun
    * PHP Mezzio (with Path Handler): @Articus
@@ -1105,7 +1074,6 @@ Here is a list of template creators:
    * Ruby on Rails 5: @zlx
    * Rust (rust-server): @metaswitch
    * Scala Akka: @Bouillie
-   * Scala Cask: @aaronp
    * Scala Finch: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
    * Scala Lagom: @gmkumar2005
    * Scala Play: @adigerber
@@ -1122,9 +1090,8 @@ Here is a list of template creators:
    * GraphQL: @wing328 [:heart:](https://www.patreon.com/wing328)
    * Ktorm: @Luiz-Monad
    * MySQL: [@ybelenko](https://github.com/ybelenko)
-   * Postman Collection: @gcatanese
    * Protocol Buffer: @wing328
-   * WSDL: @adessoDpd
+   * WSDL @adessoDpd
 
 :heart: = Link to support the contributor directly
 
@@ -1166,7 +1133,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Bash                  | @frol (2017/07) @bkryza (2017/08) @kenjones-cisco (2017/09)                                                                                                                                                                                           |
 | C                     | @zhemant (2018/11) @ityuhui (2019/12) @michelealbano (2020/03)                                                                                                                                                                                        |
 | C++                   | @ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @martindelille (2018/03) @muttleyxd (2019/08)                                                                                                                                         |
-| C#                    | @mandrean (2017/08) @shibayan (2020/02) @Blackclaws (2021/03) @lucamazzanti (2021/05) @iBicha (2023/07)                                                                                                                                          |
+| C#                    | @mandrean (2017/08) @frankyjuang (2019/09) @shibayan (2020/02) @Blackclaws (2021/03) @lucamazzanti (2021/05)                                                                                                                                          |
 | Clojure               |                                                                                                                                                                                                                                                       |
 | Crystal               | @cyangle (2021/01)                                                                                                                                                                                                                                    |
 | Dart                  | @jaumard (2018/09) @josh-burton (2019/12) @amondnet (2019/12) @sbu-WBT (2020/12) @kuhnroyal (2020/12) @agilob (2020/12) @ahmednfwela (2021/08)                                                                                                        |
@@ -1179,8 +1146,8 @@ If you want to join the committee, please kindly apply by sending an email to te
 | GraphQL               | @renepardon (2018/12)                                                                                                                                                                                                                                 |
 | Groovy                |                                                                                                                                                                                                                                                       |
 | Haskell               |                                                                                                                                                                                                                                                       |
-| Java                  | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @martin-mfg (2023/08)                                                                 |
-| Java Spring           | @cachescrubber (2022/02) @welshm (2022/02) @MelleD (2022/02) @atextor (2022/02) @manedev79 (2022/02) @javisst (2022/02) @borsch (2022/02) @banlevente (2022/02) @Zomzog (2022/09) @martin-mfg (2023/08)                                                                     |
+| Java                  | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10)                                                                 |
+| Java Spring           | @cachescrubber (2022/02) @welshm (2022/02) @MelleD (2022/02) @atextor (2022/02) @manedev79 (2022/02) @javisst (2022/02) @borsch (2022/02) @banlevente (2022/02) @Zomzog (2022/09)                                                                     |
 | JMeter                | @kannkyo (2021/01)                                                                                                                                                                                                                                    |
 | Jetbrains HTTP Client | @jlengrand (2023/01)                                                                                                                                                                                                                                  |
 | Julia                 | @tanmaykm (2023/01)                                                                                                                                                                                                                                   |
@@ -1194,7 +1161,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Perl                  | @wing328 (2017/07) [:heart:](https://www.patreon.com/wing328) @yue9944882 (2019/06)                                                                                                                                                                   |
 | PHP                   | @jebentier (2017/07), @dkarlovi (2017/07), @mandrean (2017/08), @jfastnacht (2017/09), [@ybelenko](https://github.com/ybelenko) (2018/07), @renepardon (2018/12)                                                                                      |
 | PowerShell            | @wing328 (2020/05)                                                                                                                                                                                                                                    |
-| Python                | @cbornet (2017/09) @tomplus (2018/10) @krjakbrjak (2023/02) @fa0311 (2023/10) @multani (2023/10) |
+| Python                | @spacether (2019/11) [:heart:][spacether sponsorship] @krjakbrjak (2023/02)                                                                                                                                                                                                 |
 | R                     | @Ramanth (2019/07) @saigiridhar21 (2019/07)                                                                                                                                                                                                           |
 | Ruby                  | @cliffano (2017/07) @zlx (2017/09) @autopp (2019/02)                                                                                                                                                                                                  |
 | Rust                  | @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05) @jacob-pro (2022/10)                                                                                                                                                |
@@ -1287,3 +1254,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 ---
+

appveyor.yml

@@ -13,7 +13,7 @@ install:
   - cmd: docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore 
   - ps: Start-Sleep -s 120
   - ps: $PSVersionTable.PSVersion
-  - ps: Install-Module -Name Pester -Force -Scope CurrentUser -SkipPublisherCheck
+  - ps: Install-Module -Name Pester -Force -Scope CurrentUser
 build_script:
   - dotnet --info
   # build C# aspnetcore 5.0 server
@@ -43,30 +43,23 @@ build_script:
   #- dotnet build samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
 
 test_script:
-  - dotnet test samples\client\petstore\csharp\generichost\net8\AllOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\AnyOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\AnyOfNoCompare\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\FormModels\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\ManualSourceGenerationTests\ManualTests.Latest.UseSourceGeneration\ManualTests.Latest.UseSourceGeneration.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\ManualPetstoreTests\OpenAPIClient-generichost-manual-tests\OpenAPIClient-generichost-manual-tests.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\NullReferenceTypes\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\OneOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\SourceGeneration\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\UseDateTimeForDate\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\standard2.0\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-
-  - dotnet test samples\client\petstore\csharp\httpclient\standard2.0\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-
-  - dotnet test samples\client\petstore\csharp\restsharp\net4.7\MultipleFrameworks\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net4.7\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net4.8\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net6\ParameterMappings\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net7\EnumMappings\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net7\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net7\UseDateTimeForDate\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\standard2.0\ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\standard2.0\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  # test c# API client (multiple frameworks)
+  - dotnet test samples\client\petstore\csharp\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  # test c# API client (httpclient)
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  # test c# API client (generichost)
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-generichost-netstandard2.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  # test c# API client (netcore)
+  - dotnet test samples\client\petstore\csharp\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  #- dotnet test samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  # test C# API client (.net framework 4.7)
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  # test C# API client (.net framework 4.8)
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-net48\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  # test C# API client (.net 5.0)
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  # test C# API Client using conditional-serialization
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
 
 ### TODO: Execute all generators via powershell or other
   # generate all petstore clients

bin/configs/ada.yaml

@@ -1,17 +0,0 @@
-generatorName: ada
-outputDir: samples/client/petstore/ada
-inputSpec: modules/openapi-generator/src/test/resources/3_0/ada/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Ada
-nameMappings:
-  _type: P_UnderscoreType
-  type_: P_TypeWithUnderscore
-  http_debug_operation: P_HTTPDebugOperation
-parameterNameMappings:
-  _type: UnderscoreType
-  type_: TypeWithUnderscore
-  http_debug_operation: HttpDebugOperation 
-additionalProperties:
-  modelPackage: Samples.Petstore
-  projectName: Petstore
-enumNameMappings:
-  sold: UNAVAILABLE

bin/configs/c-useJsonUnformatted.yaml

@@ -1,9 +0,0 @@
-generatorName: c
-outputDir: samples/client/petstore/c-useJsonUnformatted
-inputSpec: modules/openapi-generator/src/test/resources/2_0/c/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/C-libcurl
-additionalProperties:
-  useJsonUnformatted: true
-modelNameMappings:
-  another_model: MappedModel
-  another_property: mappedProperty

bin/configs/c.yaml

@@ -2,6 +2,3 @@ generatorName: c
 outputDir: samples/client/petstore/c
 inputSpec: modules/openapi-generator/src/test/resources/2_0/c/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/C-libcurl
-modelNameMappings:
-  another_model: MappedModel
-  another_property: mappedProperty

bin/configs/crystal.yaml

@@ -7,12 +7,3 @@ additionalProperties:
   moduleName: Petstore
   shardName: petstore
 strictSpecBehavior: false
-modelNameMappings:
-  PropertyNameMapping: AnotherPropertyNameMapping
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-  type-: type_with_dash
-parameterNameMappings:
-  _type: underscore_type
-  type_: type_with_underscore

bin/configs/csharp-generichost-latest-allOf.yaml

@@ -0,0 +1,11 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: true

bin/configs/csharp-generichost-latest-anyOf.yaml

@@ -0,0 +1,11 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: true

bin/configs/csharp-generichost-latest-nrt.yaml

@@ -0,0 +1,11 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: true

bin/configs/csharp-generichost-latest-oneOf.yaml

@@ -0,0 +1,11 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: true

bin/configs/csharp-generichost-latest.yaml

@@ -0,0 +1,11 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: false

bin/configs/csharp-generichost-net8-allOf.yaml

@@ -1,13 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/net8/AllOf
-inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  nullableReferenceTypes: true
-  equatable: true
-  targetFramework: net8.0

bin/configs/csharp-generichost-net8-anyOf.yaml

@@ -1,13 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/net8/AnyOf
-inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  nullableReferenceTypes: true
-  equatable: true
-  targetFramework: net8.0

bin/configs/csharp-generichost-net8-anyOfNoCompare.yaml

@@ -1,13 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
-inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: false
-  disallowAdditionalPropertiesIfNotPresent: false
-  nullableReferenceTypes: true
-  equatable: true
-  targetFramework: net8.0

bin/configs/csharp-generichost-net8-formModels.yaml

@@ -1,16 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/net8/FormModels
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  nullableReferenceTypes: false
-  equatable: true
-  targetFramework: net8.0
-  skipFormModel: false
-inlineSchemaOptions:
-  RESOLVE_INLINE_ENUMS: true

bin/configs/csharp-generichost-net8-nrt-useSourceGeneration.yaml

@@ -1,13 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/net8/SourceGeneration
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useSourceGeneration: true
-  equatable: true
-  targetFramework: net8.0

bin/configs/csharp-generichost-net8-nrt.yaml

@@ -1,13 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/net8/NullReferenceTypes
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  nullableReferenceTypes: true
-  equatable: true
-  targetFramework: net8.0

bin/configs/csharp-generichost-net8-oneOf.yaml

@@ -1,13 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/net8/OneOf
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  nullableReferenceTypes: true
-  equatable: true
-  targetFramework: net8.0

bin/configs/csharp-generichost-net8-useDateTimeForDate.yaml

@@ -1,10 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/dates-api.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{2E60EF87-DB0B-4D01-A36E-F5E90F7EC757}'
-  useDateTimeForDate: true
-  targetFramework: net8.0

bin/configs/csharp-generichost-net8.yaml

@@ -1,13 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/net8/Petstore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  nullableReferenceTypes: false
-  equatable: true
-  targetFramework: net8.0

bin/configs/csharp-generichost-netstandard2.0.yaml

@@ -1,6 +1,6 @@
 # for csharp generichost
 generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/standard2.0/Petstore
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
 inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
 library: generichost
 templateDir: modules/openapi-generator/src/main/resources/csharp
@@ -9,4 +9,3 @@ additionalProperties:
   useCompareNetObjects: true 
   disallowAdditionalPropertiesIfNotPresent: false
   targetFramework: netstandard2.0
-  equatable: true

bin/configs/csharp-httpclient-netstandard2.0.yaml

@@ -1,6 +1,6 @@
 # for .net standard httpclient
 generatorName: csharp
-outputDir: samples/client/petstore/csharp/httpclient/standard2.0/Petstore
+outputDir: samples/client/petstore/csharp/OpenAPIClient-httpclient
 inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
 templateDir: modules/openapi-generator/src/main/resources/csharp
 library: httpclient
@@ -10,4 +10,3 @@ additionalProperties:
   disallowAdditionalPropertiesIfNotPresent: false
   useOneOfDiscriminatorLookup: true
   targetFramework: netstandard2.0
-  equatable: true