Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/openapi-generator-cli/pom.xml
#	modules/openapi-generator-core/pom.xml
#	modules/openapi-generator-gradle-plugin/pom.xml
#	modules/openapi-generator-maven-plugin/pom.xml
#	modules/openapi-generator-online/pom.xml
#	modules/openapi-generator/pom.xml
#	modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
#	pom.xml

Author: Jean-Paul Finne

.circleci/config.yml

@@ -192,20 +192,6 @@ jobs:
       - checkout
       - command_build_and_test:
           nodeNo: "3"
-  node4:
-    machine:
-      image: ubuntu-2004:202201-02
-    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_build_and_test:
-          nodeNo: "4"
 workflows:
   version: 2
   build:
@@ -214,4 +200,3 @@ workflows:
       - node1
       - node2
       - node3
-      - node4

.github/CODEOWNERS

@@ -28,6 +28,14 @@ modules/openapi-generator-cli/**/* @jimschubert
 modules/openapi-generator-gradle-plugin/**/* @jimschubert
 modules/openapi-generator-maven-plugin/**/* @jimschubert
 
-# Martin Delille
+# 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

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

@@ -20,7 +20,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/gradle-test.yaml

@@ -37,14 +37,14 @@ jobs:
           java-version: 11
       # Cache Gradle Dependencies
       - name: Setup Gradle Dependencies Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
 
       # Cache Gradle Wrapper
       - name: Setup Gradle Wrapper Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

.github/workflows/linux.yaml

@@ -28,14 +28,14 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -57,7 +57,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
       - name: Upload Maven build artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: matrix.java == '11' && matrix.os == 'ubuntu-latest'
         with:
           name: artifact
@@ -92,7 +92,7 @@ jobs:
           java-version: 11
           maven-version: 3.8.8
       - name: Download build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: artifact
       - name: Run Ensures Script

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

@@ -20,7 +20,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/openapi-generator.yaml

@@ -22,7 +22,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         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@v3
+        uses: actions/upload-artifact@v4
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -60,7 +60,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         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@v3
+        uses: actions/upload-artifact@v4
         with:
           name: surefire-test-results
           path: '**/surefire-reports/TEST-*.xml'
@@ -97,7 +97,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
@@ -136,7 +136,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target

.github/workflows/samples-dart.yaml

@@ -24,7 +24,7 @@ jobs:
           java-version: 11
           cache: maven
       - name: Cache test dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: pub-cache
         with:

.github/workflows/samples-dotnet.yaml

@@ -4,6 +4,7 @@ on:
   push:
     paths:
       - 'samples/client/petstore/csharp/**net6.0**/'
+      - 'samples/client/petstore/csharp/**net7.0**/'
       - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
       - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**'
       - 'samples/server/petstore/aspnetcore-6.0/**'
@@ -12,6 +13,7 @@ on:
   pull_request:
     paths:
       - 'samples/client/petstore/csharp/**net6.0**/'
+      - 'samples/client/petstore/csharp/**net7.0**/'
       - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
       - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**'
       - 'samples/server/petstore/aspnetcore-6.0/**'
@@ -35,6 +37,8 @@ jobs:
           - 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/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate
+          - samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate
           - samples/server/petstore/aspnetcore-6.0
           - samples/server/petstore/aspnetcore-6.0-pocoModels
           - samples/server/petstore/aspnetcore-6.0-project4Models

.github/workflows/samples-groovy.yaml

@@ -27,7 +27,7 @@ jobs:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with: