Sync with upstream

.circleci/config.yml

@@ -141,7 +141,7 @@ commands: # a reusable command with parameters
 jobs:
   node0:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -154,7 +154,7 @@ jobs:
           nodeNo: "0"
   node1:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -167,7 +167,7 @@ jobs:
           nodeNo: "1"
   node2:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -180,7 +180,7 @@ jobs:
           nodeNo: "2"
   node3:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:

.devcontainer/devcontainer.json

@@ -26,8 +26,8 @@
         "java.configuration.runtimes": [
           {
             "name": "JavaSE-11",
-            "path": "/usr/local/sdkman/candidates/java/11.0.16.1-ms",
-            "sources": "/usr/local/sdkman/candidates/java/11.0.16.1-ms/lib/src.zip",
+            "path": "/usr/local/sdkman/candidates/java/current",
+            "sources": "/usr/local/sdkman/candidates/java/current/lib/src.zip",
             "javadoc": "https://docs.oracle.com/en/java/javase/11/docs/api",
             "default": true
           }
@@ -50,4 +50,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

@@ -12,22 +12,11 @@ modules/openapi-generator-core/**/* @OpenAPITools/generator-core-team
 # No need for auto-generated subdirectories (reduces noise)
 docs/ @OpenAPITools/generator-core-team
 
-## Individual interests
-.github/**/* @jimschubert
-scripts/**/* @jimschubert
-website/**/* @jimschubert
-bin/ci/**/* @jimschubert
-
 ## Build related
 CI/**/* @OpenAPITools/build
 .mvn/**/* @OpenAPITools/build
 bin/utils/**/* @OpenAPITools/build
 
-## Module-specific
-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

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,5 +17,5 @@
   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)
+- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming 7.6.0 minor release - breaking changes with fallbacks), `8.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/gradle-test.yaml

@@ -10,7 +10,7 @@ on:
       - 'samples/client/petstore/java/**'
       - 'samples/openapi3/client/petstore/java/**'
 env:
-  GRADLE_VERSION: 7.2
+  GRADLE_VERSION: 8.7
 
 jobs:
   build:

.github/workflows/linux.yaml

@@ -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.14.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8
@@ -87,7 +87,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.12.0
+        uses: s4u/setup-maven-action@v1.14.0
         with:
           java-version: 11
           maven-version: 3.8.8

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

@@ -39,6 +39,7 @@ jobs:
         run: |
           ./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+          ./mvnw --no-snapshot-updates --quiet clean install -f modules/openapi-generator-maven-plugin/examples/multi-module/sample-external-ref-schema/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error

.github/workflows/openapi-generator.yaml

@@ -140,8 +140,40 @@ jobs:
         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
+
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/AllOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/AnyOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/FormModels
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/OneOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/Petstore
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate
+
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/AllOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/AnyOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/FormModels
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/OneOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/Petstore
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate
       - name: Generate samples
-        run: bash bin/generate-samples.sh
+        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
       - name: Verify git status
         run: |
           if [[ "$(git status --porcelain)" != "" ]]; then

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

@@ -3,10 +3,10 @@ name: Samples cpp qt client
 on:
   push:
     branches:
-      - 'samples/client/petstore/cpp-qt/**'
+      - "samples/client/petstore/cpp-qt/**"
   pull_request:
     paths:
-      - 'samples/client/petstore/cpp-qt/**'
+      - "samples/client/petstore/cpp-qt/**"
 
 env:
   GRADLE_VERSION: 6.9
@@ -16,9 +16,6 @@ jobs:
     name: Build cpp qt client
     strategy:
       matrix:
-        qt-version:
-          - '5.15.2'
-          - '6.5.3'
         os:
           - ubuntu-latest
           - macOS-latest
@@ -27,10 +24,10 @@ jobs:
     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 }}
+          version: "6.7.1"
+          target: "desktop"
       - name: Build
         working-directory: "samples/client/petstore/cpp-qt"
         run: cmake . && cmake --build .

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

@@ -0,0 +1,42 @@
+name: Samples C# .Net Framework Clients
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/csharp/generichost/net4.7/**
+      - samples/client/petstore/csharp/generichost/net4.8/**
+  pull_request:
+    paths:
+      - samples/client/petstore/csharp/generichost/net4.7/**
+      - samples/client/petstore/csharp/generichost/net4.8/**
+jobs:
+  build:
+    name: Build .Net projects
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/csharp/generichost/net4.7/AllOf
+          - samples/client/petstore/csharp/generichost/net4.7/AnyOf
+          - samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare
+          - samples/client/petstore/csharp/generichost/net4.7/FormModels
+          - samples/client/petstore/csharp/generichost/net4.7/OneOf
+          - samples/client/petstore/csharp/generichost/net4.7/Petstore
+          - samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate
+
+          - samples/client/petstore/csharp/generichost/net4.8/AllOf
+          - samples/client/petstore/csharp/generichost/net4.8/AnyOf
+          - samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare
+          - samples/client/petstore/csharp/generichost/net4.8/FormModels
+          - samples/client/petstore/csharp/generichost/net4.8/OneOf
+          - samples/client/petstore/csharp/generichost/net4.8/Petstore
+          - samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: dotnet build Org.OpenAPITools.sln
+      - name: Test
+        working-directory: ${{ matrix.sample }}
+        run: dotnet test Org.OpenAPITools.sln

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

@@ -21,14 +21,14 @@ jobs:
       fail-fast: false
       matrix:
         sample:
-          - samples/client/petstore/csharp/generichost/standard2.0/OpenAPIClient-generichost-netstandard2.0/
-          - samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/
-          - samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/
-          - samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/
-          - samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/
+          - 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/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
         with:
           dotnet-version: 3.1.*
       - name: Build

.github/workflows/samples-dotnet.yaml

@@ -21,17 +21,20 @@ jobs:
       fail-fast: false
       matrix:
         sample:
-          - samples/client/petstore/csharp/generichost/net8/ManualTests
-          - samples/client/petstore/csharp/generichost/net8/Petstore
-          - samples/client/petstore/csharp/generichost/net8/NullReferenceTypes
-          - samples/client/petstore/csharp/generichost/net8/SourceGeneration
-          - samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
           - 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
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
         with:
           dotnet-version: '8.0.x'
       - name: Build

.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/[email protected].0
+      - uses: actions/[email protected].1
         with:
           dotnet-version: '6.0.x'
       - name: Run echo server

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

@@ -15,10 +15,10 @@ jobs:
       fail-fast: false
       matrix:
         sample:
-          - samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/
+          - samples/client/petstore/csharp/restsharp/net6/ParameterMappings/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
         with:
           dotnet-version: '6.0.x'
       - name: Build

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

@@ -25,7 +25,7 @@ jobs:
           - samples/server/petstore/aspnetcore-6.0-useSwashBuckle
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
         with:
           dotnet-version: '6.0.x'
       - name: Build

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

@@ -0,0 +1,36 @@
+name: Samples C# .Net 8 Server
+
+on:
+  push:
+    paths:
+      - samples/server/petstore/aspnetcore-8.0/**
+      - samples/server/petstore/aspnetcore-8.0-*/**
+  pull_request:
+    paths:
+      - samples/server/petstore/aspnetcore-8.0/**
+      - samples/server/petstore/aspnetcore-8.0-*/**
+jobs:
+  build:
+    name: Build .Net 8 servers
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/server/petstore/aspnetcore-8.0
+          - samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse
+          - samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes
+          - samples/server/petstore/aspnetcore-8.0-pocoModels
+          - samples/server/petstore/aspnetcore-8.0-project4Models
+          - samples/server/petstore/aspnetcore-8.0-useSwashBuckle
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/[email protected]
+        with:
+          dotnet-version: '8.0.x'
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: dotnet build Org.OpenAPITools.sln
+      - name: Test
+        working-directory: ${{ matrix.sample }}
+        run: dotnet test Org.OpenAPITools.sln

.github/workflows/samples-elm.yaml

@@ -22,7 +22,7 @@ jobs:
           - samples/openapi3/client/elm
     steps:
       - uses: actions/checkout@v4
-      - uses: jorelali/setup-elm@v5
+      - uses: jorelali/setup-elm@v6
         with:
           elm-version: 0.19.1
       - name: Build

.github/workflows/samples-go.yaml

@@ -1,20 +1,22 @@
-name: Samples Go 
+name: Samples Go
 
 on:
   push:
     paths:
       - 'samples/server/petstore/go-echo-server/**'
       - 'samples/server/petstore/go-api-server/**'
       - 'samples/server/petstore/go-chi-server/**'
+      - 'samples/server/others/go-server/no-body-path-params/**'
   pull_request:
     paths:
       - 'samples/server/petstore/go-echo-server/**'
       - 'samples/server/petstore/go-api-server/**'
       - 'samples/server/petstore/go-chi-server/**'
+      - 'samples/server/others/go-server/no-body-path-params/**'
 
 jobs:
   build:
-    name: Build Go 
+    name: Build Go
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -23,6 +25,7 @@ jobs:
           - samples/server/petstore/go-echo-server/
           - samples/server/petstore/go-api-server/
           - samples/server/petstore/go-chi-server/
+          - samples/server/others/go-server/no-body-path-params/
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5