Merge branch 'master' of https://github.com/jpfinne/openapi-generator

# Conflicts:
#	modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java

Author: jpfinne

.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/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.13.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.13.0
         with:
           java-version: 11
           maven-version: 3.8.8

.github/workflows/openapi-generator.yaml

@@ -151,7 +151,24 @@ jobs:
           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

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

@@ -27,7 +27,7 @@ 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 }}

.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-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-java-client-jdk11.yaml

@@ -15,6 +15,7 @@ on:
       - samples/client/others/java/webclient-useAbstractionForFiles/**
       - samples/client/others/java/jersey2-oneOf-duplicates/**
       - samples/client/others/java/jersey2-oneOf-Mixed/**
+      - samples/client/others/java/resttemplate-list-schema-validation/**
   pull_request:
     paths:
       - 'samples/client/petstore/java/**'
@@ -29,6 +30,7 @@ on:
       - samples/client/others/java/webclient-useAbstractionForFiles/**
       - samples/client/others/java/jersey2-oneOf-duplicates/**
       - samples/client/others/java/jersey2-oneOf-Mixed/**
+      - samples/client/others/java/resttemplate-list-schema-validation/**
 jobs:
   build:
     name: Build Java Client JDK11
@@ -78,6 +80,7 @@ jobs:
           - samples/client/others/java/webclient-useAbstractionForFiles/
           - samples/client/others/java/jersey2-oneOf-duplicates/
           - samples/client/others/java/jersey2-oneOf-Mixed/
+          - samples/client/others/java/resttemplate-list-schema-validation/
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

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

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

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

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