Merge branch 'fix_issue17024' of https://github.com/elonmallin/openapi-generator into elonmallin-fix_issue17024

.circleci/config.yml

@@ -57,43 +57,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

.devcontainer/devcontainer.json

@@ -9,12 +9,7 @@
     "ghcr.io/devcontainers/features/node:1": {
       "version": "lts"
     },
-    "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": {
@@ -49,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"
-}
+}

.github/CODEOWNERS

@@ -29,5 +29,7 @@ modules/openapi-generator-gradle-plugin/**/* @jimschubert
 modules/openapi-generator-maven-plugin/**/* @jimschubert
 
 # Martin Delille
-modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @martindelille
-samples/client/petstore/cpp-qt/**/* @martindelille
+/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/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,8 +15,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
 jobs:
   build:
     name: 'Build: Docker'
@@ -32,7 +27,7 @@ jobs:
         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

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: 'temurin'

.github/workflows/gradle-test.yaml

@@ -31,7 +31,7 @@ jobs:
           - samples/client/petstore/java/webclient-swagger2
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11

.github/workflows/linux.yaml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -45,7 +45,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.11.0
+        uses: s4u/setup-maven-action@v1.10.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
@@ -87,12 +87,12 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.11.0
+        uses: s4u/setup-maven-action@v1.10.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

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: 'temurin'

.github/workflows/openapi-generator.yaml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: 'temurin'
@@ -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
@@ -55,7 +55,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: 'temurin'
@@ -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'
@@ -92,12 +92,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - 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
@@ -131,12 +131,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - 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

.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: jurplel/install-qt-action@v4
         with:
           version: ${{ matrix.qt-version }}
           tools: ${{ matrix.tools }}

.github/workflows/samples-dart.yaml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11

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

@@ -19,7 +19,7 @@ jobs:
           - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.0
+      - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: 3.1.*
       - name: Build

.github/workflows/samples-dotnet.yaml

@@ -43,9 +43,9 @@ jobs:
           - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.0
+      - 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

@@ -19,7 +19,7 @@ jobs:
           - samples/client/echo_api/csharp-restsharp/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.0
+      - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: '6.0.x'
       - name: Run echo server

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

@@ -73,7 +73,7 @@ jobs:
           - samples/client/petstore/csharp-restsharp-name-parameter-mappings
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.0
+      - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: '6.0.x'
       - name: Build

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

@@ -30,7 +30,7 @@ jobs:
           - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.0
+      - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: '6.0.x'
       - name: Build

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

@@ -17,7 +17,7 @@ jobs:
           - samples/client/echo_api/go
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v4
         with:
           go-version: "stable"
       - name: Setup node.js

.github/workflows/samples-go.yaml

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

.github/workflows/samples-groovy.yaml

@@ -22,7 +22,7 @@ jobs:
           - samples/client/petstore/groovy
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8

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

@@ -19,10 +19,9 @@ 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
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11

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

@@ -6,13 +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/**
   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/resttemplate/**
 jobs:
   build:
     name: Build Java Client JDK8
@@ -25,10 +23,9 @@ 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
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8

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

@@ -56,7 +56,6 @@ jobs:
           - 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
@@ -73,7 +72,7 @@ jobs:
           - samples/client/others/java/webclient-useAbstractionForFiles/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11

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

@@ -22,7 +22,7 @@ jobs:
           - samples/client/petstore/java/webclient-jakarta
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17

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

@@ -24,7 +24,7 @@ jobs:
         version: [17]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.version }}

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

@@ -30,7 +30,7 @@ jobs:
           - samples/server/petstore/java-play-framework-no-wrap-calls
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11

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

@@ -33,7 +33,7 @@ jobs:
           #- samples/server/petstore/java-undertow/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8

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

@@ -19,7 +19,7 @@ jobs:
           - samples/server/petstore/jaxrs/jersey3
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11

.github/workflows/samples-jaxrs.yaml

@@ -39,7 +39,7 @@ jobs:
           - samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8

.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
@@ -49,7 +46,7 @@ jobs:
           - samples/client/petstore/spring-http-interface
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17

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

@@ -31,17 +31,14 @@ jobs:
           - 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
@@ -64,13 +61,12 @@ 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/petstore/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/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8

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

@@ -29,7 +29,7 @@ jobs:
           # - samples/server/petstore/kotlin-spring-default/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17

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

@@ -44,7 +44,7 @@ jobs:
           #- samples/server/petstore/kotlin-vertx-modelMutable
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8

.github/workflows/samples-postman.yaml

@@ -1,32 +0,0 @@
-name: Samples Postman
-
-on:
-  pull_request:
-    paths:
-      - samples/schema/postman-collection/python/**
-      - .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

@@ -24,7 +24,7 @@ jobs:
           - "3.11"
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Setup node.js

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

@@ -33,7 +33,7 @@ jobs:
           SWAGGER_BASE_PATH: /v2
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         id: py
         with:
           python-version: ${{ matrix.python-version }}

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

@@ -24,7 +24,7 @@ jobs:
           - "3.11"
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Setup node.js

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

@@ -33,7 +33,7 @@ jobs:
           SWAGGER_BASE_PATH: /v2
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         id: py
         with:
           python-version: ${{ matrix.python-version }}

.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/setup-python@v4
         with:
           python-version: '3.7'
       - name: Test

.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-scala.yaml

@@ -22,7 +22,6 @@ 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
@@ -33,7 +32,7 @@ jobs:
           - samples/server/petstore/scala-finch # cannot be tested with jdk11
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8

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

@@ -19,7 +19,7 @@ jobs:
           - samples/openapi3/client/petstore/spring-cloud-3-with-optional
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17

.github/workflows/samples-spring.yaml

@@ -28,7 +28,6 @@ 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
@@ -59,7 +58,7 @@ jobs:
           - samples/server/petstore/springboot-spring-provide-args
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8

.github/workflows/sonar.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: 11

.github/workflows/windows.yaml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
@@ -39,7 +39,7 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.11.0
+        uses: s4u/setup-maven-action@v1.10.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8

.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

.mvn/extensions.xml

@@ -3,11 +3,11 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>gradle-enterprise-maven-extension</artifactId>
-        <version>1.20</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

@@ -46,8 +46,7 @@
         </credentials>
       </server>
       <enabled>true</enabled>                                   <!-- must be true for this experiment -->
-      <!-- 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_CACHE_USERNAME']) and isTrue(env['GRADLE_ENTERPRISE_CACHE_PASSWORD'])}</storeEnabled>
+      <storeEnabled>#{env['CI'] != null}</storeEnabled>  <!-- adjust to an env var that is always present only in your CI environment -->
     </remote>
   </buildCache>
 </gradleEnterprise>

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

@@ -10,13 +10,10 @@ set -e
 export NODE_ENV=test
 
 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
 
-  (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"
@@ -36,14 +33,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
@@ -60,71 +63,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/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 ..."
+  echo "Running node $NODE_INDEX to test 'samples.circleci.node4' 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
-
-  (cd samples/openapi3/client/petstore/python && mvn integration-test)
-  (cd samples/openapi3/client/petstore/python-pydantic-v1 && mvn integration-test)
-  (cd samples/openapi3/client/petstore/python-aiohttp && mvn integration-test)
-  (cd samples/openapi3/client/petstore/python-pydantic-v1-aiohttp && mvn integration-test)
+  #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
 
 

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

@@ -15,7 +15,7 @@
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.2.0`):
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.1.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)
@@ -78,7 +78,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
 
 |                                  | Languages/Frameworks                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | -------------------------------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient 4.x, Apache HttpClient 5.x, 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 - 16.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs), **XoJo**, **Zapier** |
+| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient 4.x, Apache HttpClient 5.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **Jetbrains HTTP Client**, **Julia**, **k6**, **Kotlin**, **Lua**, **N4JS**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (9.x - 16.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs), **XoJo**, **Zapier** |
 | **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/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
@@ -120,8 +120,8 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 7.2.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.2.0-SNAPSHOT/) | 15.12.2023   | Minor release with breaking changes (with fallback) |
-| [7.1.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.1.0) (latest stable release)                                                    | 13.11.2023   | Minor release with breaking changes (with fallback) |
+| 7.1.0 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.1.0-SNAPSHOT/) | 18.10.2023   | Minor release with breaking changes (with fallback) |
+| [7.0.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.0.1) (latest stable release)                                                    | 18.09.2023   | Patch release (enhancements, bug fixes, etc) |
 | [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)                                                    | 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)                       |
@@ -184,16 +184,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.1.0/openapi-generator-cli-7.1.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.1/openapi-generator-cli-7.0.1.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.1.0/openapi-generator-cli-7.1.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.1/openapi-generator-cli-7.0.1.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.1.0/openapi-generator-cli-7.1.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.1/openapi-generator-cli-7.0.1.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -256,7 +256,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`
@@ -621,7 +621,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [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)
@@ -997,7 +996,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
@@ -1019,7 +1017,6 @@ Here is a list of template creators:
    * Scala (Akka): @cchafer
    * Scala (sttp): @chameleon82
    * Scala (sttp4): @flsh86
-   * Scala (Pekko): @mickaelmagniez
    * Swift: @tkqubo
    * Swift 3: @hexelon
    * Swift 4: @ehyche

bin/configs/ada.yaml

@@ -13,5 +13,3 @@ parameterNameMappings:
 additionalProperties:
   modelPackage: Samples.Petstore
   projectName: Petstore
-enumNameMappings:
-  sold: UNAVAILABLE

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

@@ -9,4 +9,3 @@ additionalProperties:
   useCompareNetObjects: true 
   disallowAdditionalPropertiesIfNotPresent: false
   nullableReferenceTypes: true
-  equatable: true

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

@@ -9,4 +9,3 @@ additionalProperties:
   useCompareNetObjects: true 
   disallowAdditionalPropertiesIfNotPresent: false
   nullableReferenceTypes: true
-  equatable: true

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

@@ -10,4 +10,3 @@ additionalProperties:
   disallowAdditionalPropertiesIfNotPresent: false
   useSourceGeneration: true
   packageName: UseSourceGeneration
-  equatable: true

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

@@ -9,4 +9,3 @@ additionalProperties:
   useCompareNetObjects: true 
   disallowAdditionalPropertiesIfNotPresent: false
   nullableReferenceTypes: true
-  equatable: true

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

@@ -9,4 +9,3 @@ additionalProperties:
   useCompareNetObjects: true 
   disallowAdditionalPropertiesIfNotPresent: false
   nullableReferenceTypes: true
-  equatable: true

bin/configs/csharp-generichost-latest.yaml

@@ -9,4 +9,3 @@ additionalProperties:
   useCompareNetObjects: true 
   disallowAdditionalPropertiesIfNotPresent: false
   nullableReferenceTypes: false
-  equatable: true

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

@@ -9,4 +9,3 @@ additionalProperties:
   useCompareNetObjects: true 
   disallowAdditionalPropertiesIfNotPresent: false
   targetFramework: netstandard2.0
-  equatable: true

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

@@ -10,4 +10,3 @@ additionalProperties:
   disallowAdditionalPropertiesIfNotPresent: false
   useOneOfDiscriminatorLookup: true
   targetFramework: netstandard2.0
-  equatable: true

bin/configs/csharp-restsharp-echo-api.yaml

@@ -7,4 +7,3 @@ additionalProperties:
   targetFramework: net6.0
   setCompareNetObjects: "true"
   hideGenerationTimestamp: "true"
-  equatable: true

bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml

@@ -6,4 +6,3 @@ additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   targetFramework: netstandard2.1;net47
   useCompareNetObjects: "true"
-  equatable: true

bin/configs/csharp-restsharp-net4.7.yaml

@@ -10,4 +10,3 @@ additionalProperties:
   useOneOfDiscriminatorLookup: true
   targetFramework: net47
   skipOneOfAnyOfGetter: true
-  equatable: true

bin/configs/csharp-restsharp-net4.8.yaml

@@ -9,4 +9,3 @@ additionalProperties:
   disallowAdditionalPropertiesIfNotPresent: false
   useOneOfDiscriminatorLookup: true
   targetFramework: net48
-  equatable: true

bin/configs/csharp-restsharp-net6.0-name-mappings.yaml

@@ -16,4 +16,3 @@ additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   hideGenerationTimestamp: "true"
   targetFramework: net6.0
-  equatable: true

bin/configs/csharp-restsharp-net7.0-compareNetObjects.yaml

@@ -6,4 +6,3 @@ additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   targetFramework: net7.0
   useCompareNetObjects: "true"
-  equatable: true

bin/configs/csharp-restsharp-net7.0.yaml

@@ -9,6 +9,3 @@ additionalProperties:
   disallowAdditionalPropertiesIfNotPresent: false
   useOneOfDiscriminatorLookup: true
   targetFramework: net7.0
-  equatable: true
-enumNameMappings:
-  delivered: Shipped

bin/configs/csharp-restsharp-netstandard2.0-complexfiles.yaml

@@ -6,6 +6,5 @@ additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   targetFramework: netstandard2.0
   useCompareNetObjects: "true"
-  equatable: true
 globalProperties:
   skipFormModel: "false"

bin/configs/csharp-restsharp-netstandard2.0-conditionalSerialization.yaml

@@ -10,4 +10,3 @@ additionalProperties:
   useOneOfDiscriminatorLookup: true
   targetFramework:  netstandard2.0
   conditionalSerialization: true
-  equatable: true

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

@@ -9,4 +9,3 @@ additionalProperties:
   disallowAdditionalPropertiesIfNotPresent: false
   useOneOfDiscriminatorLookup: true
   targetFramework: netstandard2.0
-  equatable: true

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

@@ -6,4 +6,3 @@ templateDir: modules/openapi-generator/src/main/resources/csharp
 library: unityWebRequest
 additionalProperties:
   targetFramework: netstandard2.0
-  equatable: true

bin/configs/dart-petstore-client-lib.yaml

@@ -4,5 +4,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/dart2
 additionalProperties:
   hideGenerationTimestamp: "true"
-enumNameMappings:
-  delivered: shipped

bin/configs/go-petstore.yaml

@@ -15,6 +15,4 @@ additionalProperties:
   packageName: petstore
   disallowAdditionalPropertiesIfNotPresent: false
   generateInterfaces: true
-enumNameMappings:
-  delivered: SHIPPED
 

bin/configs/java-microprofile-rest-client-with-useSingleRequestParameter.yaml

@@ -1,10 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter
-library: microprofile
-inputSpec: modules/openapi-generator/src/test/resources/3_1/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: microprofile-rest-client
-  configKey: petstore
-  useSingleRequestParameter: true
-  microprofileRestClientVersion:  "3.0"

bin/configs/java-okhttp-gson.yaml

@@ -14,6 +14,3 @@ additionalProperties:
   hideGenerationTimestamp: "true"
   useOneOfDiscriminatorLookup: "true"
   disallowAdditionalPropertiesIfNotPresent: false
-enumNameMappings:
-  s: LOWER_CASE_S
-  S: UPPER_CASE_S

bin/configs/java-resteasy-echo.yaml

@@ -1,8 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/resteasy-echo
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-echo.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-resteasy-echo
-  hideGenerationTimestamp: "true"
-  library: resteasy

bin/configs/java-resttemplate-echo-api.yaml

@@ -1,10 +0,0 @@
-generatorName: java
-outputDir: samples/client/echo_api/java/resttemplate
-library: resttemplate
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: echo-api-resttemplate
-  hideGenerationTimestamp: "true"
-  java8: true
-  containerDefaultToNull: true

bin/configs/kotlin-array-simple-string-multiplatform.yaml

@@ -5,4 +5,3 @@ templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-array-simple-string-multiplatform
   library: multiplatform
-  dateLibrary: kotlinx-datetime

bin/configs/kotlin-bigdecimal-default-multiplatform.yaml

@@ -5,4 +5,3 @@ templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-bigdecimal-default-multiplatform
   library: multiplatform
-  dateLibrary: kotlinx-datetime

bin/configs/kotlin-default-values-multiplatform.yaml

@@ -5,5 +5,4 @@ templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-default-values-multiplatform
   library: multiplatform
-  dateLibrary: kotlinx-datetime
   sortParamsByRequiredFlag: false

bin/configs/kotlin-enum-default-value.yaml

@@ -7,5 +7,3 @@ additionalProperties:
   serializableModel: "true"
   dateLibrary: java8
   enumUnknownDefaultCase: true
-enumNameMappings:
-  CHRISTMAS_DAY: XMAS_DAY

bin/configs/kotlin-jvm-retrofit2-jackson.yaml

@@ -1,10 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/petstore/kotlin-retrofit2-jackson
-library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  serializationLibrary: jackson
-  artifactId: kotlin-petstore-retrofit2-jackson
-  enumPropertyNaming: UPPERCASE
-  serializableModel: "true"

bin/configs/kotlin-jvm-spring-3-restclient.yaml

@@ -1,10 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/petstore/kotlin-jvm-spring-3-restclient
-library: jvm-spring-restclient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  artifactId: kotlin-petstore-spring-restclient
-  enumUnknownDefaultCase: true
-  serializationLibrary: jackson
-  useSpringBoot3: true

bin/configs/kotlin-kotlinx-datetime.yaml

@@ -1,7 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/petstore/kotlin-kotlinx-datetime
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  artifactId: kotlin-petstore-threetenbp
-  dateLibrary: kotlinx-datetime

bin/configs/kotlin-multiplatform-kotlinx-datetime.yaml

@@ -1,8 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/petstore/kotlin-multiplatform-kotlinx-datetime
-library: multiplatform
-dateLibrary: kotlinx-datetime
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  artifactId: kotlin-client-petstore-multiplatform-kotlinx-datetime

bin/configs/kotlin-multiplatform.yaml

@@ -1,7 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-multiplatform
 library: multiplatform
-dateLibrary: kotlinx-datetime
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:

bin/configs/php-nextgen.yaml

@@ -2,5 +2,3 @@ generatorName: php-nextgen
 outputDir: samples/client/petstore/php-nextgen/OpenAPIClient-php
 inputSpec: modules/openapi-generator/src/test/resources/3_0/php-nextgen/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/php-nextgen
-enumNameMappings:
-  delivered: SHIPPED

bin/configs/ruby-faraday-echo-api.yaml

@@ -1,7 +0,0 @@
-generatorName: ruby
-outputDir: samples/client/echo_api/ruby-faraday
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
-library: faraday
-additionalProperties:
-  hideGenerationTimestamp: "true"

bin/configs/ruby-typhoeus-echo-api.yaml

@@ -1,7 +0,0 @@
-generatorName: ruby
-outputDir: samples/client/echo_api/ruby-typhoeus
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
-library: typhoeus
-additionalProperties:
-  hideGenerationTimestamp: "true"

bin/configs/rust-reqwest-petstore.yaml

@@ -6,5 +6,3 @@ templateDir: modules/openapi-generator/src/main/resources/rust
 additionalProperties:
   supportAsync: false
   packageName: petstore-reqwest
-enumNameMappings:
-  delivered: shipped

bin/configs/scala-pekko.yaml

@@ -1,6 +0,0 @@
-generatorName: scala-pekko
-outputDir: samples/client/petstore/scala-pekko
-inputSpec: modules/openapi-generator/src/test/resources/3_0/scala-pekko/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-pekko-client
-additionalProperties:
-  artifactId: scala-pekko-petstore-client

bin/configs/spring-cloud-http-basic-only.yaml

@@ -1,13 +0,0 @@
-generatorName: spring
-library: spring-cloud
-outputDir: samples/openapi3/client/petstore/spring-cloud-http-basic
-inputSpec: modules/openapi-generator/src/test/resources/3_0/http-basic-test.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  groupId: org.openapitools.openapi3
-  documentationProvider: springdoc
-  artifactId: spring-cloud-http-basic
-  interfaceOnly: "true"
-  singleContentTypes: "true"
-  hideGenerationTimestamp: "true"
-  useTags: "true"

bin/configs/swift-combine-petstore-new.yaml

@@ -5,5 +5,3 @@ templateDir: modules/openapi-generator/src/main/resources/swift-combine
 additionalProperties:
   hideGenerationTimestamp: "true"
   projectName: "PetstoreOpenAPI"
-enumNameMappings:
-  delivered: shipped

bin/configs/swift5-default.yaml

@@ -8,5 +8,3 @@ additionalProperties:
   podSummary: PetstoreClient
   projectName: PetstoreClient
   podHomepage: https://github.com/openapitools/openapi-generator
-enumNameMappings:
-  delivered: shipped