Merge branch 'OpenAPITools:master' into fix/java-10010

Author: thorstenhirsch

.geminiignore

@@ -0,0 +1,64 @@
+# .geminiignore
+# This file specifies intentionally untracked files that Gemini CLI should ignore.
+# It uses the same pattern matching rules as .gitignore.
+
+# Build artifacts
+target/
+build/
+*.jar
+*.war
+*.ear
+*.class
+*.log
+
+# IDE and editor files
+.idea/
+.vscode/
+*.iml
+*.ipr
+*.iws
+
+# Maven/Gradle wrapper directories
+.mvn/wrapper/
+.gradle/
+
+# Node.js dependencies for website
+website/node_modules/
+website/build/
+
+# Generated sources by OpenAPI Generator (usually not to be touched directly)
+# This includes sample outputs which are generated code for various languages.
+samples/
+
+# Temporary files
+tmp/
+.DS_Store
+# Eclipse
+.classpath
+.project
+.settings
+
+# IntelliJ IDEA
+.idea/
+*.iml
+*.iws
+*.iwp
+.vscode/
+
+# MacOS
+.DS_Store
+
+# ReSharper
+*.resharper
+
+# Visual Studio
+.vs/
+*.user
+*.suo
+*.sln.docstates
+
+# Other
+*.bak
+*.swp
+*~
+.#*

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

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
           cache: gradle
       - name: Cache maven dependencies

.github/workflows/linux.yaml

@@ -62,7 +62,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
       - name: Upload Maven build artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         if: matrix.java == '11' && matrix.os == 'ubuntu-latest'
         with:
           name: artifact
@@ -98,7 +98,7 @@ jobs:
           maven-version: 3.8.8
           cache: gradle
       - name: Download build artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: artifact
       - name: Run Ensures Script

.github/workflows/openapi-generator.yaml

@@ -42,7 +42,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@v6
+        uses: actions/upload-artifact@v7
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -81,7 +81,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       - name: Publish unit test reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: surefire-test-results
           path: '**/surefire-reports/TEST-*.xml'
@@ -99,7 +99,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
@@ -138,7 +138,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target

.github/workflows/samples-jdk17.yaml

@@ -14,6 +14,7 @@ on:
       - samples/client/petstore/java/microprofile-rest-client-outer-enum/**
       # servers
       - samples/openapi3/server/petstore/springboot-3/**
+      - samples/openapi3/server/petstore/springboot-3-include-http-request-context/**
       - samples/server/petstore/springboot-x-implements-skip/**
       - samples/server/petstore/java-camel/**
       - samples/server/petstore/java-helidon-server/v3/mp/**
@@ -32,6 +33,7 @@ on:
       - samples/client/petstore/java/microprofile-rest-client-outer-enum/**
       # servers
       - samples/openapi3/server/petstore/springboot-3/**
+      - samples/openapi3/server/petstore/springboot-3-include-http-request-context/**
       - samples/server/petstore/springboot-x-implements-skip/**
       - samples/server/petstore/java-camel/**
       - samples/server/petstore/java-helidon-server/v3/mp/**
@@ -56,6 +58,7 @@ jobs:
           - samples/client/petstore/java/microprofile-rest-client-outer-enum
           # servers
           - samples/openapi3/server/petstore/springboot-3
+          - samples/openapi3/server/petstore/springboot-3-include-http-request-context
           - samples/server/petstore/springboot-x-implements-skip
           - samples/server/petstore/java-camel/
           - samples/server/petstore/java-helidon-server/v3/mp/

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

@@ -11,6 +11,7 @@ on:
       - '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/**
 
 jobs:
   build:
@@ -70,6 +71,7 @@ jobs:
           - samples/client/others/kotlin-integer-enum
           - samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization
           - samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization
+          - samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-java@v5

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

@@ -10,6 +10,7 @@ on:
       - '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/**'
       # comment out due to gradle build failure
       # - samples/server/petstore/kotlin-spring-default/**
   pull_request:
@@ -21,6 +22,7 @@ on:
       - '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/**'
       # comment out due to gradle build failure
       # - samples/server/petstore/kotlin-spring-default/**
 
@@ -57,6 +59,7 @@ jobs:
           - samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines
           - 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
           # comment out due to gradle build failure
           # - samples/server/petstore/kotlin-spring-default/
     steps:

.github/workflows/samples-ocaml.yaml

@@ -7,12 +7,16 @@ on:
       - 'samples/client/petstore/ocaml-fake-petstore/**'
       - 'samples/client/petstore/ocaml-oneOf-primitive/**'
       - 'samples/client/petstore/ocaml-additional-properties/**'
+      - 'samples/client/petstore/ocaml-enum-in-composed-schema/**'
+      - 'samples/client/petstore/ocaml-recursion-test/**'
   pull_request:
     paths:
       - 'samples/client/petstore/ocaml/**'
       - 'samples/client/petstore/ocaml-fake-petstore/**'
       - 'samples/client/petstore/ocaml-oneOf-primitive/**'
       - 'samples/client/petstore/ocaml-additional-properties/**'
+      - 'samples/client/petstore/ocaml-enum-in-composed-schema/**'
+      - 'samples/client/petstore/ocaml-recursion-test/**'
 
 jobs:
   build:
@@ -26,12 +30,14 @@ jobs:
           - 'samples/client/petstore/ocaml-fake-petstore/'
           - 'samples/client/petstore/ocaml-oneOf-primitive/'
           - 'samples/client/petstore/ocaml-additional-properties/'
+          - 'samples/client/petstore/ocaml-enum-in-composed-schema/'
+          - 'samples/client/petstore/ocaml-recursion-test/'
     steps:
       - uses: actions/checkout@v5
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: 5
+          ocaml-compiler: 5.3
       - name: Install
         run: opam install . --deps-only --with-test
         working-directory: ${{ matrix.sample }}

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

@@ -3,32 +3,32 @@ name: Samples Java Spring (JDK17)
 on:
   push:
     paths:
-      - samples/openapi3/client/petstore/spring-cloud-3-with-optional
-      - samples/openapi3/client/petstore/spring-cloud-4-with-optional
-      - samples/client/petstore/spring-http-interface-springboot-4
-      - samples/openapi3/server/petstore/springboot-3
-      - samples/openapi3/server/petstore/springboot-4
-      - samples/server/petstore/springboot-api-response-examples
-      - samples/server/petstore/springboot-lombok-data
-      - 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/spring-boot-oneof-sealed
-      - samples/openapi3/server/petstore/spring-boot-oneof-interface
+      - samples/openapi3/client/petstore/spring-cloud-3-with-optional/**
+      - samples/openapi3/client/petstore/spring-cloud-4-with-optional/**
+      - samples/client/petstore/spring-http-interface-springboot-4/**
+      - samples/openapi3/server/petstore/springboot-3/**
+      - samples/openapi3/server/petstore/springboot-4/**
+      - samples/server/petstore/springboot-api-response-examples/**
+      - samples/server/petstore/springboot-lombok-data/**
+      - samples/server/petstore/springboot-lombok-tostring/**
+      - samples/server/petstore/springboot-file-delegate-optional/**
+      - samples/server/petstore/springboot-petstore-with-api-response-examples/**
+      - samples/openapi3/server/petstore/spring-boot-oneof-sealed/**
+      - samples/openapi3/server/petstore/spring-boot-oneof-interface/**
   pull_request:
     paths:
-      - samples/openapi3/client/petstore/spring-cloud-3-with-optional
-      - samples/openapi3/client/petstore/spring-cloud-4-with-optional
-      - samples/client/petstore/spring-http-interface-springboot-4
-      - samples/openapi3/server/petstore/springboot-3
-      - samples/openapi3/server/petstore/springboot-4
-      - samples/server/petstore/springboot-api-response-examples
-      - samples/server/petstore/springboot-lombok-data
-      - 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/spring-boot-oneof-sealed
-      - samples/openapi3/server/petstore/spring-boot-oneof-interface
+      - samples/openapi3/client/petstore/spring-cloud-3-with-optional/**
+      - samples/openapi3/client/petstore/spring-cloud-4-with-optional/**
+      - samples/client/petstore/spring-http-interface-springboot-4/**
+      - samples/openapi3/server/petstore/springboot-3/**
+      - samples/openapi3/server/petstore/springboot-4/**
+      - samples/server/petstore/springboot-api-response-examples/**
+      - samples/server/petstore/springboot-lombok-data/**
+      - samples/server/petstore/springboot-lombok-tostring/**
+      - samples/server/petstore/springboot-file-delegate-optional/**
+      - samples/server/petstore/springboot-petstore-with-api-response-examples/**
+      - samples/openapi3/server/petstore/spring-boot-oneof-sealed/**
+      - samples/openapi3/server/petstore/spring-boot-oneof-interface/**
 jobs:
   build:
     name: Build Java Spring (JDK17)
@@ -49,7 +49,7 @@ 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/spring-boot-oneof-sealed
+          - samples/openapi3/server/petstore/spring-boot-oneof-sealed
           - samples/openapi3/server/petstore/spring-boot-oneof-interface
     steps:
       - uses: actions/checkout@v5

.github/workflows/samples-spring.yaml

@@ -44,6 +44,7 @@ jobs:
           - samples/server/petstore/spring-boot-nullable-set
           - samples/server/petstore/spring-boot-defaultInterface-unhandledExcp
           - samples/server/petstore/springboot
+          - samples/server/petstore/springboot-include-http-request-context
           - samples/server/petstore/springboot-beanvalidation
           - samples/server/petstore/springboot-builtin-validation
           - samples/server/petstore/springboot-delegate