chore: solved conflicts

Author: jorgerod

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

@@ -11,6 +11,7 @@ on:
       - samples/client/petstore/scala-sttp/**
       - samples/client/petstore/scala-sttp-circe/**
       - samples/client/petstore/scala-sttp4/**
+      - samples/client/petstore/scala-sttp4-circe/**
   pull_request:
     paths:
       - samples/client/petstore/scalaz/**
@@ -21,6 +22,7 @@ on:
       - samples/client/petstore/scala-sttp/**
       - samples/client/petstore/scala-sttp-circe/**
       - samples/client/petstore/scala-sttp4/**
+      - samples/client/petstore/scala-sttp4-circe/**
 jobs:
   build:
     name: Build sbt/Scala
@@ -38,6 +40,7 @@ jobs:
           - samples/client/petstore/scala-sttp
           - samples/client/petstore/scala-sttp-circe
           - samples/client/petstore/scala-sttp4
+          - samples/client/petstore/scala-sttp4-circe
     services:
       petstore-api:
         image: swaggerapi/petstore

README.md

@@ -15,7 +15,7 @@
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.23.0`):
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.24.0`):
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/master?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67)
 
@@ -154,8 +154,8 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 7.23.0 (upcoming minor release) [SNAPSHOT](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) | 08.06.2026   | Minor release with breaking changes (with fallback) |
-| [7.22.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.22.0) (latest stable release)                                                    | 28.04.2026   | Minor release with breaking changes (with fallback) |
+| 7.24.0 (upcoming minor release) [SNAPSHOT](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) | 08.07.2026   | Minor release with breaking changes (with fallback) |
+| [7.23.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.23.0) (latest stable release)                                                    | 28.04.2026   | Minor release with breaking changes (with fallback) |
 | [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)                                                    | 11.05.2023   | Minor release with breaking changes (with fallback) |
 | [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0)                                                    | 31.01.2022   | Minor release with breaking changes (with fallback) |
 | [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |
@@ -218,16 +218,16 @@ See the different versions of the [openapi-generator-cli](https://search.maven.o
 <!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 11 runtime at a minimum):
 
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.22.0/openapi-generator-cli-7.22.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.23.0/openapi-generator-cli-7.23.0.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.22.0/openapi-generator-cli-7.22.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.23.0/openapi-generator-cli-7.23.0.jar -O openapi-generator-cli.jar
 ```
 
 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 ```
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.22.0/openapi-generator-cli-7.22.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.23.0/openapi-generator-cli-7.23.0.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -462,7 +462,7 @@ openapi-generator-cli version
 To use a specific version of "openapi-generator-cli"
 
 ```sh
-openapi-generator-cli version-manager set 7.22.0
+openapi-generator-cli version-manager set 7.23.0
 ```
 
 Or install it as dev-dependency:
@@ -486,7 +486,7 @@ pip install openapi-generator-cli
 
 To install a specific version
 ```
-pip install openapi-generator-cli==7.22.0
+pip install openapi-generator-cli==7.23.0
 ```
 
 You can also install with [jdk4py](https://github.com/activeviam/jdk4py) instead of java binary. (python>=3.10 is required)
@@ -512,7 +512,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
 (if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`)
 
 <!-- RELEASE_VERSION -->
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.22.0/openapi-generator-cli-7.22.0.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.23.0/openapi-generator-cli-7.23.0.jar)
 <!-- /RELEASE_VERSION -->
 
 To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`

bin/configs/kotlin-spring-boot-integer-enum.yaml

@@ -11,3 +11,4 @@ additionalProperties:
   annotationLibrary: none
   documentationProvider: none
   enumPropertyNaming: UPPERCASE
+  useEnumValueInterface: "true"

bin/configs/kotlin-spring-boot.yaml

@@ -11,3 +11,5 @@ additionalProperties:
   serializableModel: "true"
   useBeanValidation: "true"
   requestMappingMode: controller
+  useEnumValueInterface: "true"
+  useSpringBoot3: "false"

bin/configs/manual/rust-axum-sse.yaml

@@ -0,0 +1,12 @@
+generatorName: rust-axum
+outputDir: samples/server/petstore/rust-axum/output/rust-axum-sse
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-axum/rust-axum-sse.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-axum
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: rust-axum-sse-test
+  homePageUrl: https://github.com/openapitools/openapi-generator
+globalProperties:
+  skipFormModel: false
+enablePostProcessFile: true

bin/configs/scala-sttp4-circe.yaml

@@ -0,0 +1,7 @@
+generatorName: scala-sttp4
+outputDir: samples/client/petstore/scala-sttp4-circe
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/scala-sttp4
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  jsonLibrary: "circe"

bin/configs/spring-boot-3-include-http-request-context.yaml

@@ -15,3 +15,4 @@ additionalProperties:
   generateBuilders: true
   includeHttpRequestContext: "true"
   delegatePattern: true
+  useEnumValueInterface: "true"

bin/configs/spring-boot-4.yaml

@@ -15,3 +15,4 @@ additionalProperties:
   generateConstructorWithAllArgs: true
   generateBuilders: true
   openApiNullable: false
+  useEnumValueInterface: "true"

bin/configs/spring-boot-sort-validation.yaml

@@ -18,3 +18,4 @@ additionalProperties:
   generatePageableConstraintValidation: "true"
   useTags: "true"
   requestMappingMode: api_interface
+  useEnumValueInterface: "true"

bin/configs/spring-boot.yaml

@@ -9,3 +9,5 @@ additionalProperties:
   hideGenerationTimestamp: "true"
   camelCaseDollarSign: "true"
   modelNameSuffix: 'Dto'
+  useEnumValueInterface: "true"
+  useSpringBoot3: "false"