Merge branch 'OpenAPITools:master' into master

.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/workflows/linux.yaml

@@ -45,7 +45,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.13.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.13.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/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,9 @@ jobs:
     name: Build cpp qt client
     strategy:
       matrix:
-        qt-version:
-          - '5.15.2'
-          - '6.5.3'
+        sample:
+          - samples/client/petstore/cpp-qt
+          - samples/client/petstore/cpp-qt-addDownloadProgress
         os:
           - ubuntu-latest
           - macOS-latest
@@ -29,8 +29,8 @@ jobs:
       - name: Install Qt
         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 .
+        working-directory: ${{ matrix.sample }}
+        run: cmake . && cmake --build . --verbose

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

@@ -28,7 +28,7 @@ jobs:
           # - 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

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

@@ -18,7 +18,7 @@ jobs:
           - 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-erlang.yaml

@@ -3,33 +3,33 @@ name: Samples Erlang
 on:
   push:
     paths:
-      # comment out due to errors
-      # ===> Compiling src/openapi_pet_handler.erl failed
-      # src/openapi_pet_handler.erl:278: function is_authorized/2 already defined
-      #- samples/server/petstore/erlang-server/**
+      - samples/server/echo_api/erlang-server/**
+      - samples/server/petstore/erlang-server/**
       - samples/client/petstore/erlang-client/**
       - samples/client/petstore/erlang-proper/**
   pull_request:
     paths:
-      #- samples/server/petstore/erlang-server/**
+      - samples/server/echo_api/erlang-server/**
+      - samples/server/petstore/erlang-server/**
       - samples/client/petstore/erlang-client/**
       - samples/client/petstore/erlang-proper/**
 jobs:
   build:
     name: Build Erlang projects
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         sample:
-          #- samples/server/petstore/erlang-server/
+          - samples/server/echo_api/erlang-server/
+          - samples/server/petstore/erlang-server/
           - samples/client/petstore/erlang-client/
           - samples/client/petstore/erlang-proper/
     steps:
       - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: '22.2'
-          rebar3-version: '3.14.3'
+          otp-version: '27'
+          rebar3-version: '3.23.0'
       - run: rebar3 compile
         working-directory: ${{ matrix.sample }}

.github/workflows/samples-haskell.yaml

@@ -5,11 +5,13 @@ on:
     paths:
       - samples/server/petstore/haskell-yesod/**
       - samples/server/petstore/haskell-servant/**
+      - samples/server/others/haskell-servant-ping/**
       - samples/client/petstore/haskell-http-client/**
   pull_request:
     paths:
       - samples/server/petstore/haskell-yesod/**
       - samples/server/petstore/haskell-servant/**
+      - samples/server/others/haskell-servant-ping/**
       - samples/client/petstore/haskell-http-client/**
 jobs:
   build:
@@ -22,6 +24,7 @@ jobs:
           # servers
           - samples/server/petstore/haskell-yesod/
           - samples/server/petstore/haskell-servant/
+          - samples/server/others/haskell-servant-ping/
           - samples/client/petstore/haskell-http-client/
     steps:
       - uses: actions/checkout@v4

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

@@ -3,10 +3,10 @@ name: Java Client (Echo API) JDK17
 on:
   push:
     paths:
-      - samples/client/echo_api/java/restclient
+      - samples/client/echo_api/java/**
   pull_request:
     paths:
-      - samples/client/echo_api/java/restclient
+      - samples/client/echo_api/java/**
 jobs:
   build:
     name: Build Java Client JDK17
@@ -16,6 +16,11 @@ jobs:
       matrix:
         sample:
           # clients
+          - samples/client/echo_api/java/apache-httpclient
+          - samples/client/echo_api/java/native
+          - samples/client/echo_api/java/feign-gson
+          - samples/client/echo_api/java/resttemplate
+          - samples/client/echo_api/java/resteasy
           - samples/client/echo_api/java/restclient
     steps:
       - uses: actions/checkout@v4

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

@@ -10,7 +10,7 @@ on:
     paths:
       - samples/client/petstore/java/resttemplate-jakarta/**
       - samples/client/petstore/java/webclient-jakarta/**
-      - samples/client/petstore/java/restclient-*/** 
+      - samples/client/petstore/java/restclient-*/**
 jobs:
   build:
     name: Build Java Client JDK17
@@ -25,6 +25,7 @@ jobs:
           - samples/client/petstore/java/restclient
           - samples/client/petstore/java/restclient-nullable-arrays
           - samples/client/petstore/java/restclient-swagger2
+          - samples/client/petstore/java/restclient-useSingleRequestParameter
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

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

@@ -5,10 +5,12 @@ on:
     paths:
       - samples/client/petstore/java-helidon-client/v3/**
       - samples/server/petstore/java-helidon-server/v3/**
+      - samples/server/others/java-helidon-server/v3/**
   pull_request:
     paths:
       - samples/client/petstore/java-helidon-client/v3/**
       - samples/server/petstore/java-helidon-server/v3/**
+      - samples/server/others/java-helidon-server/v3/**
 jobs:
   build:
     name: Build Java Helidon 
@@ -21,6 +23,7 @@ jobs:
           - samples/client/petstore/java-helidon-client/v3/se
           - samples/server/petstore/java-helidon-server/v3/mp
           - samples/server/petstore/java-helidon-server/v3/se
+          - samples/server/others/java-helidon-server/v3/mp-format-test
         version: [17]
     steps:
       - uses: actions/checkout@v4

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

@@ -5,10 +5,12 @@ on:
     paths:
       - samples/client/petstore/java-helidon-client/v4/**
       - samples/server/petstore/java-helidon-server/v4/**
+      - samples/server/others/java-helidon-server/v4/**
   pull_request:
     paths:
       - samples/client/petstore/java-helidon-client/v4/**
       - samples/server/petstore/java-helidon-server/v4/**
+      - samples/server/others/java-helidon-server/v4/**
 jobs:
   build:
     name: Build Java Helidon 
@@ -18,7 +20,11 @@ jobs:
       matrix:
         sample:
           - samples/client/petstore/java-helidon-client/v4/mp
+          - samples/client/petstore/java-helidon-client/v4/se
           - samples/server/petstore/java-helidon-server/v4/mp
+          - samples/server/petstore/java-helidon-server/v4/se
+          - samples/server/petstore/java-helidon-server/v4/se-uac
+          - samples/server/others/java-helidon-server/v4/mp-format-test
         version: [21]
     steps:
       - uses: actions/checkout@v4

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

@@ -3,8 +3,6 @@ name: Samples Java Server
 on:
   push:
     paths:
-      # java-camel is tested locally for the time being
-      #- 'samples/server/petstore/java-camel/**'
       - 'samples/server/petstore/java-vertx-web/**'
       - 'samples/server/petstore/java-inflector/**'
       - 'samples/server/petstore/java-pkmst/**'
@@ -13,7 +11,6 @@ on:
       - 'samples/server/petstore/java-microprofile/**'
   pull_request:
     paths:
-      #- 'samples/server/petstore/java-camel/**'
       - 'samples/server/petstore/java-vertx-web/**'
       - 'samples/server/petstore/java-inflector/**'
       - 'samples/server/petstore/java-pkmst/**'
@@ -28,7 +25,6 @@ jobs:
       matrix:
         sample:
           # servers
-          #- samples/server/petstore/java-camel/
           - samples/server/petstore/java-vertx-web/
           - samples/server/petstore/java-inflector/
           - samples/server/petstore/java-pkmst/

.github/workflows/samples-jdk17.yaml

@@ -9,8 +9,10 @@ on:
       - samples/client/petstore/spring-http-interface-reactive/**
       - samples/client/petstore/spring-http-interface/**
       - samples/client/petstore/java/webclient-jakarta/**
+      - samples/client/petstore/java/microprofile-rest-client-outer-enum/**
       # servers
       - samples/openapi3/server/petstore/springboot-3/**
+      - samples/server/petstore/java-camel/**
       - samples/server/petstore/java-helidon-server/v3/mp/**
       - samples/server/petstore/java-helidon-server/v3/se/**
   pull_request:
@@ -22,8 +24,10 @@ on:
       - samples/client/petstore/spring-http-interface-reactive/**
       - samples/client/petstore/spring-http-interface/**
       - samples/client/petstore/java/webclient-jakarta/**
+      - samples/client/petstore/java/microprofile-rest-client-outer-enum/**
       # servers
       - samples/openapi3/server/petstore/springboot-3/**
+      - samples/server/petstore/java-camel/**
       - samples/server/petstore/java-helidon-server/v3/mp/**
       - samples/server/petstore/java-helidon-server/v3/se/**
 jobs:
@@ -41,8 +45,10 @@ jobs:
           - samples/client/petstore/spring-http-interface-reactive
           - samples/client/petstore/spring-http-interface
           - samples/client/petstore/java/webclient-jakarta
+          - samples/client/petstore/java/microprofile-rest-client-outer-enum
           # servers
           - samples/openapi3/server/petstore/springboot-3
+          - samples/server/petstore/java-camel/
           - samples/server/petstore/java-helidon-server/v3/mp/
           - samples/server/petstore/java-helidon-server/v3/se
           - samples/client/petstore/spring-http-interface-reactive