Merge branch 'master' into feature/normalizer_REPLACE_ONE_OF_BY_DISCRIMINATOR_MAPPING

Author: jpfinne

.github/workflows/maven-release.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - master
+    tags:
+      - 'v*'
+
 jobs:
   build:
     name: Build
@@ -12,17 +15,20 @@ jobs:
       - uses: actions/checkout@v5
         with:
           fetch-depth: 0
+
       - name: Set up JDK 11
         uses: actions/setup-java@v5
         with:
           java-version: 11
           distribution: 'zulu'
+
       - name: Cache Maven packages
         uses: actions/cache@v5
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
+
       - name: Build
         run: ./mvnw clean install -DskipTests=true
         #run: ./mvnw clean install
@@ -38,7 +44,7 @@ jobs:
       - uses: actions/checkout@v5
         with:
           fetch-depth: 0
- 
+
       - id: install-secret-key
         name: Install gpg secret key
         run: |
@@ -58,4 +64,48 @@ jobs:
         run: ./mvnw -DskipTests=true --batch-mode -P release -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy
         env:
           MAVEN_USERNAME: ${{ secrets.OSS_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSS_PASSWORD }}
+          MAVEN_PASSWORD: ${{ secrets.OSS_PASSWORD }}
+
+  upload-release-asset:
+    runs-on: ubuntu-latest
+    name: Upload CLI JAR to GitHub Release
+    needs: publish
+    if: startsWith(github.ref, 'refs/tags/')
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v5
+        with:
+          java-version: 11
+          distribution: 'zulu'
+
+      - name: Cache Maven packages
+        uses: actions/cache@v5
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Build CLI JAR
+        run: ./mvnw clean package -pl modules/openapi-generator-cli -am -DskipTests=true
+
+      - name: Get project version
+        id: get_version
+        run: |
+          VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Upload JAR as GitHub Release asset
+        run: |
+          VERSION="${{ steps.get_version.outputs.version }}"
+          JAR="modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+          ASSET="openapi-generator-cli-${VERSION}.jar"
+          cp "$JAR" "$ASSET"
+          gh release upload "${{ github.ref_name }}" "$ASSET" --clobber
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/samples-dotnet10.yaml

@@ -27,6 +27,7 @@ jobs:
           - samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf
           - samples/client/petstore/csharp/generichost/latest/Tags
           - samples/client/petstore/csharp/generichost/latest/HelloWorld
+          - samples/client/petstore/csharp/generichost/latest/NullTypes
           - samples/client/petstore/csharp/generichost/latest/OneOfList
           - samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset
           - samples/client/petstore/csharp/generichost/net10/AllOf

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

@@ -73,6 +73,7 @@ jobs:
           - samples/client/petstore/java/webclient-swagger2
           - samples/client/petstore/java/webclient-useSingleRequestParameter
           - samples/client/petstore/java/vertx
+          - samples/client/petstore/java/vertx5
           - samples/client/petstore/java/vertx-no-nullable
           - samples/client/petstore/java/vertx-supportVertxFuture
           - samples/client/petstore/java/jersey2-java8-localdatetime

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

@@ -8,6 +8,7 @@ on:
       - samples/client/petstore/java/webclient-jakarta/**
       - samples/client/petstore/java/restclient-*/**
       - samples/client/petstore/java/native-jackson3/**
+      - samples/client/petstore/java/apache-httpclient-jackson3/**
       - samples/client/petstore/java/native-jackson3-jspecify/**
       - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/**
       - samples/client/others/java/webclient-sealedInterface/**
@@ -23,6 +24,7 @@ on:
       - samples/client/petstore/java/webclient-jakarta/**
       - samples/client/petstore/java/restclient-*/**
       - samples/client/petstore/java/native-jackson3/**
+      - samples/client/petstore/java/apache-httpclient-jackson3/**
       - samples/client/petstore/java/native-jackson3-jspecify/**
       - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/**
       - samples/client/others/java/webclient-sealedInterface/**
@@ -54,6 +56,7 @@ jobs:
           - samples/client/petstore/java/restclient-useSingleRequestParameter
           - samples/client/petstore/java/restclient-useSingleRequestParameter-static
           - samples/client/petstore/java/native-jackson3
+          - samples/client/petstore/java/apache-httpclient-jackson3
           - samples/client/others/java/webclient-sealedInterface
           - samples/client/others/java/webclient-sealedInterface_3_1
           - samples/client/petstore/java/webclient-springBoot4-jackson3

.github/workflows/samples-julia.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: julia-actions/setup-julia@v2
+      - uses: julia-actions/setup-julia@v3
         with:
           version: 1.8
           arch: x64

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

@@ -6,12 +6,14 @@ on:
       - 'samples/client/petstore/kotlin*/**'
       - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'
       - samples/client/others/kotlin-integer-enum/**
+      - samples/client/others/kotlin-jvm-spring-3-restclient-nullable-return/**
   pull_request:
     paths:
       - 'samples/client/petstore/kotlin*/**'
       - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'
       - samples/client/others/kotlin-integer-enum/**
       - samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/**
+      - samples/client/others/kotlin-jvm-spring-3-restclient-nullable-return/**
 
 jobs:
   build:
@@ -66,6 +68,7 @@ jobs:
           - samples/client/echo_api/kotlin-jvm-spring-3-webclient
           - samples/client/petstore/kotlin-jvm-spring-3-restclient
           - samples/client/echo_api/kotlin-jvm-spring-3-restclient
+          - samples/client/others/kotlin-jvm-spring-3-restclient-nullable-return
           - samples/client/petstore/kotlin-name-parameter-mappings
           - samples/client/others/kotlin-jvm-okhttp-parameter-tests
           - samples/client/others/kotlin-jvm-okhttp-path-comments

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

@@ -4,25 +4,31 @@ on:
   push:
     paths:
       - 'samples/server/others/kotlin-server/**'
+      - 'samples/server/others/kotlin-springboot/**'
       - 'samples/server/petstore/kotlin-springboot-3*/**'
       - 'samples/server/petstore/kotlin-server/**'
       - 'samples/server/petstore/kotlin-server-modelMutable/**'
       - 'samples/server/petstore/kotlin-springboot-*/**'
       - 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
       - 'samples/server/petstore/kotlin-spring-declarative*/**'
       - 'samples/server/petstore/kotlin-spring-sealed-interfaces/**'
+      - 'samples/server/petstore/kotlin-springboot-sort-validation/**'
+      - 'samples/server/petstore/kotlin-springboot-paged-model/**'
       # comment out due to gradle build failure
       # - samples/server/petstore/kotlin-spring-default/**
   pull_request:
     paths:
       - 'samples/server/others/kotlin-server/**'
+      - 'samples/server/others/kotlin-springboot/**'
       - 'samples/server/petstore/kotlin-springboot-3*/**'
       - 'samples/server/petstore/kotlin-server/**'
       - 'samples/server/petstore/kotlin-server-modelMutable/**'
       - 'samples/server/petstore/kotlin-springboot-*/**'
       - 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
       - 'samples/server/petstore/kotlin-spring-declarative*/**'
       - 'samples/server/petstore/kotlin-spring-sealed-interfaces/**'
+      - 'samples/server/petstore/kotlin-springboot-sort-validation/**'
+      - 'samples/server/petstore/kotlin-springboot-paged-model/**'
       # comment out due to gradle build failure
       # - samples/server/petstore/kotlin-spring-default/**
 
@@ -38,6 +44,9 @@ jobs:
       matrix:
         sample:
           # server
+          - samples/server/others/kotlin-springboot/oneOf-discriminator
+          - samples/server/others/kotlin-springboot/oneOf-discriminator-const
+          - samples/server/others/kotlin-springboot/oneOf-enum-discriminator
           - samples/server/others/kotlin-server/polymorphism-allof-and-discriminator
           - samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix
           - samples/server/others/kotlin-server/polymorphism-and-discriminator
@@ -62,6 +71,8 @@ jobs:
           - samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped
           - samples/server/petstore/kotlin-spring-declarative-interface-wrapped
           - samples/server/petstore/kotlin-spring-sealed-interfaces
+          - samples/server/petstore/kotlin-springboot-sort-validation
+          - samples/server/petstore/kotlin-springboot-paged-model
           # comment out due to gradle build failure
           # - samples/server/petstore/kotlin-spring-default/
     steps:

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

@@ -4,11 +4,13 @@ on:
   push:
     paths:
       - 'samples/server/others/kotlin-server/**'
+      - 'samples/server/others/kotlin-springboot/**'
       - 'samples/server/petstore/kotlin-server/**'
       - 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
   pull_request:
     paths:
       - 'samples/server/others/kotlin-server/**'
+      - 'samples/server/others/kotlin-springboot/**'
       - 'samples/server/petstore/kotlin-server/**'
       - 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
 
@@ -23,6 +25,9 @@ jobs:
       fail-fast: false
       matrix:
         sample:
+          - samples/server/others/kotlin-springboot/oneOf-discriminator
+          - samples/server/others/kotlin-springboot/oneOf-discriminator-const
+          - samples/server/others/kotlin-springboot/oneOf-enum-discriminator
           - samples/server/others/kotlin-server/polymorphism-allof-and-discriminator
           - samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix
           - samples/server/others/kotlin-server/polymorphism-and-discriminator

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

@@ -14,6 +14,8 @@ on:
       - samples/server/petstore/springboot-lombok-tostring/**
       - samples/server/petstore/springboot-file-delegate-optional/**
       - samples/server/petstore/springboot-petstore-with-api-response-examples/**
+      - samples/server/petstore/springboot-sort-validation/**
+      - samples/server/petstore/springboot-paged-model/**
       - samples/openapi3/server/petstore/spring-boot-oneof-sealed/**
       - samples/openapi3/server/petstore/spring-boot-oneof-interface/**
   pull_request:
@@ -29,6 +31,8 @@ on:
       - samples/server/petstore/springboot-lombok-tostring/**
       - samples/server/petstore/springboot-file-delegate-optional/**
       - samples/server/petstore/springboot-petstore-with-api-response-examples/**
+      - samples/server/petstore/springboot-sort-validation/**
+      - samples/server/petstore/springboot-paged-model/**
       - samples/openapi3/server/petstore/spring-boot-oneof-sealed/**
       - samples/openapi3/server/petstore/spring-boot-oneof-interface/**
 jobs:
@@ -52,6 +56,8 @@ jobs:
           - samples/server/petstore/springboot-lombok-tostring
           - samples/server/petstore/springboot-file-delegate-optional
           - samples/server/petstore/springboot-petstore-with-api-response-examples
+          - samples/server/petstore/springboot-sort-validation
+          - samples/server/petstore/springboot-paged-model
           - samples/openapi3/server/petstore/spring-boot-oneof-sealed
           - samples/openapi3/server/petstore/spring-boot-oneof-interface
     steps:

.gitignore

@@ -309,3 +309,6 @@ samples/client/petstore/ocaml-recursion-test/_build/
 
 # jetbrain http client
 samples/client/jetbrains/adyen/checkout71/http/client/Apis/http-client.private.env.json
+
+# Generated by the run-in-docker.sh
+\?/