From 6d9f923641d54c8b035646f5d82ec9effb7dbb51 Mon Sep 17 00:00:00 2001
From: "Riedlinger, Jochen (IT 480)" <jochen.riedlinger@l-bank.de>
Date: Wed, 19 Feb 2025 15:33:51 +0100
Subject: [PATCH 1/8] fix: #10618 Using incorrect @Multipart instead of
 @FormParam in microprofile java client

[BUG][JAVA] Using incorrect @Multipart instead of @FormParam when generated Microprofile java client #10618
https://github.com/OpenAPITools/openapi-generator/issues/10618
---
 .../main/resources/Java/libraries/microprofile/api.mustache    | 3 ++-
 .../resources/Java/libraries/microprofile/formParams.mustache  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache
index 3d2864d3e7b1..18729bcf0750 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache
@@ -13,7 +13,7 @@ import {{rootJavaEEPackage}}.ws.rs.*;
 import {{rootJavaEEPackage}}.ws.rs.core.Response;
 import {{rootJavaEEPackage}}.ws.rs.core.MediaType;
 {{^disableMultipart}}
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 {{/disableMultipart}}
 {{#microprofileMutiny}}
 import io.smallrye.mutiny.Uni;
@@ -27,6 +27,7 @@ import {{rootJavaEEPackage}}.validation.Valid;
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 {{#appName}}
 /**
  * {{{appName}}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache
index 97216dc1806f..0e5b55f857ab 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache
@@ -1 +1 @@
-{{#isFormParam}}{{^isFile}}@Multipart(value = "{{baseName}}"{{^required}}, required = false{{/required}})  {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} @Multipart(value = "{{baseName}}" {{^required}}, required = false{{/required}}) Attachment {{paramName}}Detail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{^isFile}}{{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}")  {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} {{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}") Attachment {{paramName}}Detail{{/isFile}}{{/isFormParam}}
\ No newline at end of file

From a16f0cbe66a05db2d620e652c536c715090303bb Mon Sep 17 00:00:00 2001
From: Jochen Riedlinger <j_ri@gmx.de>
Date: Mon, 24 Feb 2025 08:56:50 +0100
Subject: [PATCH 2/8] fix: #10618 put updated samples under sourcecontrol

---
 docs/generators/fsharp-functions.md                   |  2 +-
 docs/generators/fsharp-giraffe-server.md              |  2 +-
 docs/generators/java-inflector.md                     |  2 +-
 docs/generators/jaxrs-cxf-client.md                   |  2 +-
 docs/generators/swift5.md                             |  4 ++--
 docs/generators/swift6.md                             |  4 ++--
 .../main/java/org/openapitools/client/api/PetApi.java |  7 ++++---
 .../java/org/openapitools/client/api/StoreApi.java    |  3 ++-
 .../java/org/openapitools/client/api/UserApi.java     |  3 ++-
 .../org/openapitools/client/api/AnotherFakeApi.java   |  3 ++-
 .../java/org/openapitools/client/api/DefaultApi.java  |  3 ++-
 .../java/org/openapitools/client/api/FakeApi.java     |  9 +++++----
 .../client/api/FakeClassnameTags123Api.java           |  3 ++-
 .../main/java/org/openapitools/client/api/PetApi.java |  9 +++++----
 .../java/org/openapitools/client/api/StoreApi.java    |  3 ++-
 .../java/org/openapitools/client/api/UserApi.java     |  3 ++-
 .../main/java/org/openapitools/client/api/PetApi.java |  7 ++++---
 .../java/org/openapitools/client/api/StoreApi.java    |  3 ++-
 .../java/org/openapitools/client/api/UserApi.java     |  3 ++-
 .../org/openapitools/client/api/AnotherFakeApi.java   |  3 ++-
 .../java/org/openapitools/client/api/DefaultApi.java  |  3 ++-
 .../java/org/openapitools/client/api/FakeApi.java     |  9 +++++----
 .../client/api/FakeClassnameTags123Api.java           |  3 ++-
 .../main/java/org/openapitools/client/api/PetApi.java |  9 +++++----
 .../java/org/openapitools/client/api/StoreApi.java    |  3 ++-
 .../java/org/openapitools/client/api/UserApi.java     |  3 ++-
 .../main/java/org/openapitools/client/api/PetApi.java |  7 ++++---
 .../java/org/openapitools/client/api/StoreApi.java    |  3 ++-
 .../java/org/openapitools/client/api/UserApi.java     |  3 ++-
 .../java/org/openapitools/client/api/DefaultApi.java  |  3 ++-
 .../main/java/org/openapitools/client/api/PetApi.java | 11 ++++++-----
 .../java/org/openapitools/client/api/StoreApi.java    |  3 ++-
 .../java/org/openapitools/client/api/UserApi.java     |  3 ++-
 .../org/openapitools/client/api/AnotherFakeApi.java   |  3 ++-
 .../java/org/openapitools/client/api/DefaultApi.java  |  3 ++-
 .../java/org/openapitools/client/api/FakeApi.java     |  9 +++++----
 .../client/api/FakeClassnameTags123Api.java           |  3 ++-
 .../main/java/org/openapitools/client/api/PetApi.java |  9 +++++----
 .../java/org/openapitools/client/api/StoreApi.java    |  3 ++-
 .../java/org/openapitools/client/api/UserApi.java     |  3 ++-
 .../main/java/org/openapitools/server/api/PetApi.java |  7 ++++---
 .../java/org/openapitools/server/api/StoreApi.java    |  3 ++-
 .../java/org/openapitools/server/api/UserApi.java     |  3 ++-
 43 files changed, 112 insertions(+), 75 deletions(-)

diff --git a/docs/generators/fsharp-functions.md b/docs/generators/fsharp-functions.md
index a20382152aab..33bd1f1c2922 100644
--- a/docs/generators/fsharp-functions.md
+++ b/docs/generators/fsharp-functions.md
@@ -34,7 +34,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sourceFolder|source folder for generated code| |OpenAPI/src|
+|sourceFolder|source folder for generated code| |OpenAPI\src|
 
 ## IMPORT MAPPING
 
diff --git a/docs/generators/fsharp-giraffe-server.md b/docs/generators/fsharp-giraffe-server.md
index abe079e504fa..fb3e25b3d776 100644
--- a/docs/generators/fsharp-giraffe-server.md
+++ b/docs/generators/fsharp-giraffe-server.md
@@ -30,7 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |packageVersion|F# package version.| |1.0.0|
 |returnICollection|Return ICollection&lt;T&gt; instead of the concrete type.| |false|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sourceFolder|source folder for generated code| |OpenAPI/src|
+|sourceFolder|source folder for generated code| |OpenAPI\src|
 |useCollection|Deserialize array types to Collection&lt;T&gt; instead of List&lt;T&gt;.| |false|
 |useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
 |useSwashbuckle|Uses the Swashbuckle.AspNetCore NuGet package for documentation.| |false|
diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md
index 210db1efcb9a..6fa2edb47f90 100644
--- a/docs/generators/java-inflector.md
+++ b/docs/generators/java-inflector.md
@@ -66,7 +66,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |snapshotVersion|Uses a SNAPSHOT version.|<dl><dt>**true**</dt><dd>Use a SnapShot Version</dd><dt>**false**</dt><dd>Use a Release Version</dd></dl>|null|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sourceFolder|source folder for generated code| |src/gen/java|
+|sourceFolder|source folder for generated code| |src\gen\java|
 |testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|
diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md
index 29a7923078b0..d89f12fbf3ab 100644
--- a/docs/generators/jaxrs-cxf-client.md
+++ b/docs/generators/jaxrs-cxf-client.md
@@ -66,7 +66,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |snapshotVersion|Uses a SNAPSHOT version.|<dl><dt>**true**</dt><dd>Use a SnapShot Version</dd><dt>**false**</dt><dd>Use a Release Version</dd></dl>|null|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sourceFolder|source folder for generated code| |src/gen/java|
+|sourceFolder|source folder for generated code| |src\gen\java|
 |testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
 |useAbstractionForFiles|Use alternative types instead of java.io.File to allow passing bytes without a file on disk.| |false|
 |useBeanValidation|Use BeanValidation API annotations| |false|
diff --git a/docs/generators/swift5.md b/docs/generators/swift5.md
index 9d565bf5993f..df0b0e1f3ccd 100644
--- a/docs/generators/swift5.md
+++ b/docs/generators/swift5.md
@@ -49,13 +49,13 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |responseAs|Optionally use libraries to manage response.  Currently PromiseKit, RxSwift, Result, Combine, AsyncAwait are available.| |null|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|swiftPackagePath|Set a custom source path instead of OpenAPIClient/Classes/OpenAPIs.| |null|
+|swiftPackagePath|Set a custom source path instead of OpenAPIClient\Classes\OpenAPIs.| |null|
 |swiftUseApiNamespace|Flag to make all the API classes inner-class of {{projectName}}API| |null|
 |useBacktickEscapes|Escape reserved words using backticks (default: false)| |false|
 |useClasses|Use final classes for models instead of structs (default: false)| |false|
 |useCustomDateWithoutTime|Uses a custom type to decode and encode dates without time information to support OpenAPIs date format (default: false)| |false|
 |useJsonEncodable|Make models conform to JSONEncodable protocol (default: true)| |true|
-|useSPMFileStructure|Use SPM file structure and set the source path to Sources/{{projectName}} (default: false).| |null|
+|useSPMFileStructure|Use SPM file structure and set the source path to Sources\{{projectName}} (default: false).| |null|
 |validatable|Make validation rules and validator for model properties (default: true)| |true|
 
 ## IMPORT MAPPING
diff --git a/docs/generators/swift6.md b/docs/generators/swift6.md
index a49865462eba..f19516ff2449 100644
--- a/docs/generators/swift6.md
+++ b/docs/generators/swift6.md
@@ -51,13 +51,13 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |responseAs|Optionally use libraries to manage response.  Currently AsyncAwait, Combine, Result, RxSwift, ObjcBlock, PromiseKit are available.| |null|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|swiftPackagePath|Set a custom source path instead of Sources/{{projectName}}.| |null|
+|swiftPackagePath|Set a custom source path instead of Sources\{{projectName}}.| |null|
 |swiftUseApiNamespace|Flag to make all the API classes inner-class of {{projectName}}API| |null|
 |useBacktickEscapes|Escape reserved words using backticks (default: false)| |false|
 |useClasses|Use final classes for models instead of structs (default: false)| |false|
 |useCustomDateWithoutTime|Uses a custom type to decode and encode dates without time information to support OpenAPIs date format (default: false)| |false|
 |useJsonEncodable|Make models conform to JSONEncodable protocol (default: true)| |true|
-|useSPMFileStructure|Use SPM file structure and set the source path to Sources/{{projectName}} (default: true).| |null|
+|useSPMFileStructure|Use SPM file structure and set the source path to Sources\{{projectName}} (default: true).| |null|
 |validatable|Make validation rules and validator for model properties (default: true)| |true|
 
 ## IMPORT MAPPING
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java
index d353688861ca..26a00eb47cc7 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java
@@ -24,12 +24,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
@@ -120,7 +121,7 @@ public interface PetApi  {
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false)  String name, @Multipart(value = "status", required = false)  String status) throws ApiException, ProcessingException;
+    void updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name")  String name, @FormParam("status")  String status) throws ApiException, ProcessingException;
 
     /**
      * uploads an image
@@ -132,5 +133,5 @@ public interface PetApi  {
     @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
 }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java
index cd94c5b3bca6..5c5d935816c3 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,12 +22,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java
index 7f8c13c9e080..7d5ea3b25bb1 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,12 +23,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index c22b045c6ed9..c9dabb6a31fd 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -22,12 +22,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java
index 2c7f381b9336..ac0679bcc189 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -22,12 +22,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
index c23faf8ba1b8..35b940591ee3 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -35,12 +35,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
@@ -153,7 +154,7 @@ public interface FakeApi  {
     @POST
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEndpointParameters(@Multipart(value = "number")  BigDecimal number, @Multipart(value = "double")  Double _double, @Multipart(value = "pattern_without_delimiter")  String patternWithoutDelimiter, @Multipart(value = "byte")  byte[] _byte, @Multipart(value = "integer", required = false)  Integer integer, @Multipart(value = "int32", required = false)  Integer int32, @Multipart(value = "int64", required = false)  Long int64, @Multipart(value = "float", required = false)  Float _float, @Multipart(value = "string", required = false)  String string,  @Multipart(value = "binary" , required = false) Attachment binaryDetail, @Multipart(value = "date", required = false)  Date date, @Multipart(value = "dateTime", required = false)  Date dateTime, @Multipart(value = "password", required = false)  String password, @Multipart(value = "callback", required = false)  String paramCallback) throws ApiException, ProcessingException;
+    void testEndpointParameters(@FormParam("number")  BigDecimal number, @FormParam("double")  Double _double, @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam("byte")  byte[] _byte, @FormParam("integer")  Integer integer, @FormParam("int32")  Integer int32, @FormParam("int64")  Long int64, @FormParam("float")  Float _float, @FormParam("string")  String string,  @FormParam("binary") Attachment binaryDetail, @FormParam("date")  Date date, @FormParam("dateTime")  Date dateTime, @FormParam("password")  String password, @FormParam("callback")  String paramCallback) throws ApiException, ProcessingException;
 
     /**
      * To test enum parameters
@@ -164,7 +165,7 @@ public interface FakeApi  {
     @GET
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false)  List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false)  String enumFormString) throws ApiException, ProcessingException;
+    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @FormParam("enum_form_string_array")  List<String> enumFormStringArray, @FormParam("enum_form_string")  String enumFormString) throws ApiException, ProcessingException;
 
     /**
      * Fake endpoint to test group parameters (optional)
@@ -207,7 +208,7 @@ public interface FakeApi  {
     @GET
     @Path("/jsonFormData")
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testJsonFormData(@Multipart(value = "param")  String param, @Multipart(value = "param2")  String param2) throws ApiException, ProcessingException;
+    void testJsonFormData(@FormParam("param")  String param, @FormParam("param2")  String param2) throws ApiException, ProcessingException;
 
     /**
      * test nullable parent property
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 1db471b03658..e63b1d13b8f1 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -22,12 +22,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java
index 224b962916ed..d2dd5ff9464f 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java
@@ -25,12 +25,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
@@ -119,7 +120,7 @@ public interface PetApi  {
     @POST
     @Path("/pet/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false)  String name, @Multipart(value = "status", required = false)  String status) throws ApiException, ProcessingException;
+    void updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name")  String name, @FormParam("status")  String status) throws ApiException, ProcessingException;
 
     /**
      * uploads an image
@@ -131,7 +132,7 @@ public interface PetApi  {
     @Path("/pet/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
 
     /**
      * uploads an image (required)
@@ -143,5 +144,5 @@ public interface PetApi  {
     @Path("/fake/{petId}/uploadImageWithRequiredFile")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @Multipart(value = "requiredFile" ) Attachment requiredFileDetail, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @FormParam("requiredFile") Attachment requiredFileDetail, @FormParam("additionalMetadata")  String additionalMetadata) throws ApiException, ProcessingException;
 }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java
index 0fdf70e0825b..af46af49bbeb 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,12 +22,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java
index 515c42ae977d..0d135df530f5 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,12 +23,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
index 78f825370542..9929ed7adbe4 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
@@ -24,13 +24,14 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.smallrye.mutiny.Uni;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
@@ -121,7 +122,7 @@ public interface PetApi  {
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    Uni<Void> updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false)  String name, @Multipart(value = "status", required = false)  String status) throws ApiException, ProcessingException;
+    Uni<Void> updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name")  String name, @FormParam("status")  String status) throws ApiException, ProcessingException;
 
     /**
      * uploads an image
@@ -133,5 +134,5 @@ public interface PetApi  {
     @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException;
+    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
 }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
index 3e3568235bc9..08ea6412e861 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,13 +22,14 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.smallrye.mutiny.Uni;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
index 398314fe46cd..369d9639d492 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,13 +23,14 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.smallrye.mutiny.Uni;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index c22b045c6ed9..c9dabb6a31fd 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -22,12 +22,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java
index 2c7f381b9336..ac0679bcc189 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -22,12 +22,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
index c23faf8ba1b8..35b940591ee3 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -35,12 +35,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
@@ -153,7 +154,7 @@ public interface FakeApi  {
     @POST
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEndpointParameters(@Multipart(value = "number")  BigDecimal number, @Multipart(value = "double")  Double _double, @Multipart(value = "pattern_without_delimiter")  String patternWithoutDelimiter, @Multipart(value = "byte")  byte[] _byte, @Multipart(value = "integer", required = false)  Integer integer, @Multipart(value = "int32", required = false)  Integer int32, @Multipart(value = "int64", required = false)  Long int64, @Multipart(value = "float", required = false)  Float _float, @Multipart(value = "string", required = false)  String string,  @Multipart(value = "binary" , required = false) Attachment binaryDetail, @Multipart(value = "date", required = false)  Date date, @Multipart(value = "dateTime", required = false)  Date dateTime, @Multipart(value = "password", required = false)  String password, @Multipart(value = "callback", required = false)  String paramCallback) throws ApiException, ProcessingException;
+    void testEndpointParameters(@FormParam("number")  BigDecimal number, @FormParam("double")  Double _double, @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam("byte")  byte[] _byte, @FormParam("integer")  Integer integer, @FormParam("int32")  Integer int32, @FormParam("int64")  Long int64, @FormParam("float")  Float _float, @FormParam("string")  String string,  @FormParam("binary") Attachment binaryDetail, @FormParam("date")  Date date, @FormParam("dateTime")  Date dateTime, @FormParam("password")  String password, @FormParam("callback")  String paramCallback) throws ApiException, ProcessingException;
 
     /**
      * To test enum parameters
@@ -164,7 +165,7 @@ public interface FakeApi  {
     @GET
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false)  List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false)  String enumFormString) throws ApiException, ProcessingException;
+    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @FormParam("enum_form_string_array")  List<String> enumFormStringArray, @FormParam("enum_form_string")  String enumFormString) throws ApiException, ProcessingException;
 
     /**
      * Fake endpoint to test group parameters (optional)
@@ -207,7 +208,7 @@ public interface FakeApi  {
     @GET
     @Path("/jsonFormData")
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testJsonFormData(@Multipart(value = "param")  String param, @Multipart(value = "param2")  String param2) throws ApiException, ProcessingException;
+    void testJsonFormData(@FormParam("param")  String param, @FormParam("param2")  String param2) throws ApiException, ProcessingException;
 
     /**
      * test nullable parent property
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 1db471b03658..e63b1d13b8f1 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -22,12 +22,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java
index 224b962916ed..d2dd5ff9464f 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java
@@ -25,12 +25,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
@@ -119,7 +120,7 @@ public interface PetApi  {
     @POST
     @Path("/pet/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false)  String name, @Multipart(value = "status", required = false)  String status) throws ApiException, ProcessingException;
+    void updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name")  String name, @FormParam("status")  String status) throws ApiException, ProcessingException;
 
     /**
      * uploads an image
@@ -131,7 +132,7 @@ public interface PetApi  {
     @Path("/pet/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
 
     /**
      * uploads an image (required)
@@ -143,5 +144,5 @@ public interface PetApi  {
     @Path("/fake/{petId}/uploadImageWithRequiredFile")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @Multipart(value = "requiredFile" ) Attachment requiredFileDetail, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @FormParam("requiredFile") Attachment requiredFileDetail, @FormParam("additionalMetadata")  String additionalMetadata) throws ApiException, ProcessingException;
 }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java
index 0fdf70e0825b..af46af49bbeb 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,12 +22,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java
index 515c42ae977d..0d135df530f5 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,12 +23,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
index 0964ae15d4c7..1a5905d43834 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
@@ -24,13 +24,14 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.smallrye.mutiny.Uni;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
@@ -121,7 +122,7 @@ public interface PetApi  {
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    Uni<Void> updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false)  String name, @Multipart(value = "status", required = false)  String status) throws ApiException, ProcessingException;
+    Uni<Void> updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name")  String name, @FormParam("status")  String status) throws ApiException, ProcessingException;
 
     /**
      * uploads an image
@@ -133,5 +134,5 @@ public interface PetApi  {
     @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException;
+    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
 }
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
index de22bb71fd2e..86f39e5ccc2e 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,13 +22,14 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.smallrye.mutiny.Uni;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
index 1fc96630b011..ece797dc5c65 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,13 +23,14 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.smallrye.mutiny.Uni;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java
index 247b26ac6c1f..5aeb01bc9fee 100644
--- a/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -23,12 +23,13 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * Petstore API
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
index 55c25f97f820..418f8c43fbf5 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
@@ -24,12 +24,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
@@ -218,8 +219,8 @@ public GetPetByIdRequest petId(Long petId) {
     public class UpdatePetWithFormRequest {
 
         private @PathParam("petId") Long petId;
-        private @Multipart(value = "name", required = false)  String name;
-        private @Multipart(value = "status", required = false)  String status;
+        private @FormParam("name")  String name;
+        private @FormParam("status")  String status;
 
         private UpdatePetWithFormRequest() {
         }
@@ -271,8 +272,8 @@ public UpdatePetWithFormRequest status(String status) {
     public class UploadFileRequest {
 
         private @PathParam("petId") Long petId;
-        private @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata;
-        private  @Multipart(value = "file" , required = false) Attachment _fileDetail;
+        private @FormParam("additionalMetadata")  String additionalMetadata;
+        private  @FormParam("file") Attachment _fileDetail;
 
         private UploadFileRequest() {
         }
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java
index d95b73db2091..1b6335cd6d04 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,12 +22,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java
index a45d07d34581..1ca079613647 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,12 +23,13 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index a15c245c8494..f268f8d23a69 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -22,12 +22,13 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java
index 1ca1a836550c..c51a4ffc8139 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -22,12 +22,13 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
index 411aebd5d178..d72fe95854a7 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -35,12 +35,13 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
@@ -153,7 +154,7 @@ public interface FakeApi  {
     @POST
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEndpointParameters(@Multipart(value = "number")  BigDecimal number, @Multipart(value = "double")  Double _double, @Multipart(value = "pattern_without_delimiter")  String patternWithoutDelimiter, @Multipart(value = "byte")  byte[] _byte, @Multipart(value = "integer", required = false)  Integer integer, @Multipart(value = "int32", required = false)  Integer int32, @Multipart(value = "int64", required = false)  Long int64, @Multipart(value = "float", required = false)  Float _float, @Multipart(value = "string", required = false)  String string,  @Multipart(value = "binary" , required = false) Attachment binaryDetail, @Multipart(value = "date", required = false)  Date date, @Multipart(value = "dateTime", required = false)  Date dateTime, @Multipart(value = "password", required = false)  String password, @Multipart(value = "callback", required = false)  String paramCallback) throws ApiException, ProcessingException;
+    void testEndpointParameters(@FormParam("number")  BigDecimal number, @FormParam("double")  Double _double, @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam("byte")  byte[] _byte, @FormParam("integer")  Integer integer, @FormParam("int32")  Integer int32, @FormParam("int64")  Long int64, @FormParam("float")  Float _float, @FormParam("string")  String string,  @FormParam("binary") Attachment binaryDetail, @FormParam("date")  Date date, @FormParam("dateTime")  Date dateTime, @FormParam("password")  String password, @FormParam("callback")  String paramCallback) throws ApiException, ProcessingException;
 
     /**
      * To test enum parameters
@@ -164,7 +165,7 @@ public interface FakeApi  {
     @GET
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false)  List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false)  String enumFormString) throws ApiException, ProcessingException;
+    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @FormParam("enum_form_string_array")  List<String> enumFormStringArray, @FormParam("enum_form_string")  String enumFormString) throws ApiException, ProcessingException;
 
     /**
      * Fake endpoint to test group parameters (optional)
@@ -207,7 +208,7 @@ public interface FakeApi  {
     @GET
     @Path("/jsonFormData")
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testJsonFormData(@Multipart(value = "param")  String param, @Multipart(value = "param2")  String param2) throws ApiException, ProcessingException;
+    void testJsonFormData(@FormParam("param")  String param, @FormParam("param2")  String param2) throws ApiException, ProcessingException;
 
     /**
      * test nullable parent property
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index ec882fa3ce56..fe3c45f27d01 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -22,12 +22,13 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java
index f5ce26c6765a..3e5a1f21e8a2 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java
@@ -25,12 +25,13 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
@@ -119,7 +120,7 @@ public interface PetApi  {
     @POST
     @Path("/pet/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false)  String name, @Multipart(value = "status", required = false)  String status) throws ApiException, ProcessingException;
+    void updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name")  String name, @FormParam("status")  String status) throws ApiException, ProcessingException;
 
     /**
      * uploads an image
@@ -131,7 +132,7 @@ public interface PetApi  {
     @Path("/pet/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
 
     /**
      * uploads an image (required)
@@ -143,5 +144,5 @@ public interface PetApi  {
     @Path("/fake/{petId}/uploadImageWithRequiredFile")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @Multipart(value = "requiredFile" ) Attachment requiredFileDetail, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @FormParam("requiredFile") Attachment requiredFileDetail, @FormParam("additionalMetadata")  String additionalMetadata) throws ApiException, ProcessingException;
 }
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java
index d63a429c9e96..f73d5cd06ca2 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,12 +22,13 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java
index d1088c95cffb..ca9d4ef4602f 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,12 +23,13 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java
index 2ca0851ef231..9d358a63f5fe 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java
@@ -24,13 +24,14 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.smallrye.mutiny.Uni;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
@@ -120,7 +121,7 @@ public interface PetApi  {
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    Uni<Void> updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false)  String name, @Multipart(value = "status", required = false)  String status) throws ApiException, ProcessingException;
+    Uni<Void> updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name")  String name, @FormParam("status")  String status) throws ApiException, ProcessingException;
 
     /**
      * uploads an image
@@ -132,5 +133,5 @@ public interface PetApi  {
     @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException;
+    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
 }
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java
index 2dea0b817a57..de2e5c71ac21 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java
@@ -22,13 +22,14 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.smallrye.mutiny.Uni;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java
index ab673f1773f5..f96512f75a31 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java
@@ -23,13 +23,14 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
+// import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.smallrye.mutiny.Uni;
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+
 /**
  * OpenAPI Petstore
  *

From 3c6e1a04814e8c91f70dc6ffc8429eab9453e712 Mon Sep 17 00:00:00 2001
From: Jochen Riedlinger <j_ri@gmx.de>
Date: Mon, 24 Feb 2025 09:00:07 +0100
Subject: [PATCH 3/8] fix: #10618 delete configoption disableMultipart for
 microprofile

---
 .../resources/Java/libraries/microprofile/api.mustache    | 4 +---
 .../resources/Java/libraries/microprofile/pom.mustache    | 8 +-------
 .../Java/libraries/microprofile/pom_3.0.mustache          | 8 +-------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache
index 18729bcf0750..1ea8b3a1c509 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache
@@ -12,9 +12,7 @@ import java.util.Set;
 import {{rootJavaEEPackage}}.ws.rs.*;
 import {{rootJavaEEPackage}}.ws.rs.core.Response;
 import {{rootJavaEEPackage}}.ws.rs.core.MediaType;
-{{^disableMultipart}}
-// import org.apache.cxf.jaxrs.ext.multipart.*;
-{{/disableMultipart}}
+
 {{#microprofileMutiny}}
 import io.smallrye.mutiny.Uni;
 {{/microprofileMutiny}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
index 4fefd6db233e..d77f58422a4d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
@@ -101,13 +101,7 @@
       <version>${smallrye.config.version}</version>
       <scope>test</scope>
     </dependency>
-    {{^disableMultipart}}
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>${cxf.rt.rs.extension.providers.version}</version>
-    </dependency>
-    {{/disableMultipart}}
+
     {{#jsonb}}
     <dependency>
       <groupId>jakarta.json.bind</groupId>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache
index 9462e0d9236b..0a16de870360 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache
@@ -101,13 +101,7 @@
         <scope>test</scope>
     </dependency>
 
-    {{^disableMultipart}}
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>${cxf.rt.rs.extension.providers.version}</version>
-    </dependency>
-    {{/disableMultipart}}
+
     {{#jsonb}}
     <dependency>
       <groupId>jakarta.json.bind</groupId>

From 7d7b9dd6e78eb52bbebb419cb8de6e59ed5e4b48 Mon Sep 17 00:00:00 2001
From: Jochen Riedlinger <j_ri@gmx.de>
Date: Mon, 24 Feb 2025 09:31:25 +0100
Subject: [PATCH 4/8] fix: #10618 put updated samples after cleanup of
 "disableMultipart"

---
 .../microprofile-rest-client-3.0-jackson-with-xml/pom.xml   | 6 +-----
 .../src/main/java/org/openapitools/client/api/PetApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/StoreApi.java | 2 +-
 .../src/main/java/org/openapitools/client/api/UserApi.java  | 2 +-
 .../java/microprofile-rest-client-3.0-jackson/pom.xml       | 6 +-----
 .../java/org/openapitools/client/api/AnotherFakeApi.java    | 2 +-
 .../main/java/org/openapitools/client/api/DefaultApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/FakeApi.java  | 2 +-
 .../openapitools/client/api/FakeClassnameTags123Api.java    | 2 +-
 .../src/main/java/org/openapitools/client/api/PetApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/StoreApi.java | 2 +-
 .../src/main/java/org/openapitools/client/api/UserApi.java  | 2 +-
 .../java/microprofile-rest-client-3.0-mutiny/pom.xml        | 6 +-----
 .../src/main/java/org/openapitools/client/api/PetApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/StoreApi.java | 2 +-
 .../src/main/java/org/openapitools/client/api/UserApi.java  | 2 +-
 .../petstore/java/microprofile-rest-client-3.0/pom.xml      | 6 +-----
 .../java/org/openapitools/client/api/AnotherFakeApi.java    | 2 +-
 .../main/java/org/openapitools/client/api/DefaultApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/FakeApi.java  | 2 +-
 .../openapitools/client/api/FakeClassnameTags123Api.java    | 2 +-
 .../src/main/java/org/openapitools/client/api/PetApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/StoreApi.java | 2 +-
 .../src/main/java/org/openapitools/client/api/UserApi.java  | 2 +-
 .../petstore/java/microprofile-rest-client-mutiny/pom.xml   | 6 +-----
 .../src/main/java/org/openapitools/client/api/PetApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/StoreApi.java | 2 +-
 .../src/main/java/org/openapitools/client/api/UserApi.java  | 2 +-
 .../java/microprofile-rest-client-outer-enum/pom.xml        | 6 +-----
 .../main/java/org/openapitools/client/api/DefaultApi.java   | 2 +-
 .../pom.xml                                                 | 6 +-----
 .../src/main/java/org/openapitools/client/api/PetApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/StoreApi.java | 2 +-
 .../src/main/java/org/openapitools/client/api/UserApi.java  | 2 +-
 .../client/petstore/java/microprofile-rest-client/pom.xml   | 6 +-----
 .../java/org/openapitools/client/api/AnotherFakeApi.java    | 2 +-
 .../main/java/org/openapitools/client/api/DefaultApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/FakeApi.java  | 2 +-
 .../openapitools/client/api/FakeClassnameTags123Api.java    | 2 +-
 .../src/main/java/org/openapitools/client/api/PetApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/StoreApi.java | 2 +-
 .../src/main/java/org/openapitools/client/api/UserApi.java  | 2 +-
 samples/server/petstore/java-microprofile/pom.xml           | 6 +-----
 .../src/main/java/org/openapitools/server/api/PetApi.java   | 2 +-
 .../src/main/java/org/openapitools/server/api/StoreApi.java | 2 +-
 .../src/main/java/org/openapitools/server/api/UserApi.java  | 2 +-
 46 files changed, 46 insertions(+), 82 deletions(-)

diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml
index a5df70c97604..0fc8651ce46b 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml
@@ -90,11 +90,7 @@
         <scope>test</scope>
     </dependency>
 
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>${cxf.rt.rs.extension.providers.version}</version>
-    </dependency>
+
     <!-- JSON processing: jackson -->
     <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java
index 26a00eb47cc7..655e9bddb895 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java
@@ -24,7 +24,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java
index 5c5d935816c3..9d530689f8d4 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,7 +22,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java
index 7d5ea3b25bb1..3c191bab5e68 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,7 +23,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml
index e79da281f43c..62725b217709 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml
@@ -90,11 +90,7 @@
         <scope>test</scope>
     </dependency>
 
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>${cxf.rt.rs.extension.providers.version}</version>
-    </dependency>
+
     <!-- JSON processing: jackson -->
     <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index c9dabb6a31fd..3c313a6bf023 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -22,7 +22,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java
index ac0679bcc189..748fef678aac 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -22,7 +22,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
index 35b940591ee3..8d59c7668c8f 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -35,7 +35,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index e63b1d13b8f1..1ea0afe8a41c 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -22,7 +22,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java
index d2dd5ff9464f..e44282ae122d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java
@@ -25,7 +25,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java
index af46af49bbeb..e11a06ce2618 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,7 +22,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java
index 0d135df530f5..e841c00185b3 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,7 +23,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml
index d930a9f96dc9..f1a595ab4eed 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml
@@ -90,11 +90,7 @@
         <scope>test</scope>
     </dependency>
 
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>${cxf.rt.rs.extension.providers.version}</version>
-    </dependency>
+
     <dependency>
       <groupId>jakarta.json.bind</groupId>
       <artifactId>jakarta.json.bind-api</artifactId>
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
index 9929ed7adbe4..0ef0678f13d0 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
@@ -24,7 +24,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 import io.smallrye.mutiny.Uni;
 
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
index 08ea6412e861..cf7090a9a561 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,7 +22,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 import io.smallrye.mutiny.Uni;
 
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
index 369d9639d492..aa8413b4f0e6 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,7 +23,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 import io.smallrye.mutiny.Uni;
 
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml
index 7b03483c49eb..d5cb932fed1f 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml
@@ -90,11 +90,7 @@
         <scope>test</scope>
     </dependency>
 
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>${cxf.rt.rs.extension.providers.version}</version>
-    </dependency>
+
     <dependency>
       <groupId>jakarta.json.bind</groupId>
       <artifactId>jakarta.json.bind-api</artifactId>
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index c9dabb6a31fd..3c313a6bf023 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -22,7 +22,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java
index ac0679bcc189..748fef678aac 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -22,7 +22,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
index 35b940591ee3..8d59c7668c8f 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -35,7 +35,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index e63b1d13b8f1..1ea0afe8a41c 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -22,7 +22,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java
index d2dd5ff9464f..e44282ae122d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java
@@ -25,7 +25,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java
index af46af49bbeb..e11a06ce2618 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,7 +22,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java
index 0d135df530f5..e841c00185b3 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,7 +23,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml b/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml
index 57273ef43a84..9fff8fc4f4ca 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml
@@ -90,11 +90,7 @@
       <version>${smallrye.config.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>${cxf.rt.rs.extension.providers.version}</version>
-    </dependency>
+
     <dependency>
       <groupId>jakarta.json.bind</groupId>
       <artifactId>jakarta.json.bind-api</artifactId>
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
index 1a5905d43834..8de75590d03e 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
@@ -24,7 +24,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 import io.smallrye.mutiny.Uni;
 
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
index 86f39e5ccc2e..9445f8d0eb30 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,7 +22,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 import io.smallrye.mutiny.Uni;
 
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
index ece797dc5c65..be73f46205ea 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,7 +23,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 import io.smallrye.mutiny.Uni;
 
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml b/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml
index cc21c05b3882..837f6ebc36f6 100644
--- a/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml
@@ -90,11 +90,7 @@
       <version>${smallrye.config.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>${cxf.rt.rs.extension.providers.version}</version>
-    </dependency>
+
     <dependency>
       <groupId>jakarta.json.bind</groupId>
       <artifactId>jakarta.json.bind-api</artifactId>
diff --git a/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java
index 5aeb01bc9fee..db420a065cb6 100644
--- a/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -23,7 +23,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml
index 3e6d548f51ae..89442bae5f70 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml
@@ -90,11 +90,7 @@
         <scope>test</scope>
     </dependency>
 
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>${cxf.rt.rs.extension.providers.version}</version>
-    </dependency>
+
     <dependency>
       <groupId>jakarta.json.bind</groupId>
       <artifactId>jakarta.json.bind-api</artifactId>
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
index 418f8c43fbf5..ba402eaa1351 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
@@ -24,7 +24,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java
index 1b6335cd6d04..f18f3fb6ba43 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,7 +22,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java
index 1ca079613647..def887a2c33d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,7 +23,7 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client/pom.xml b/samples/client/petstore/java/microprofile-rest-client/pom.xml
index 59af12cd31c9..b5b334d3afd6 100644
--- a/samples/client/petstore/java/microprofile-rest-client/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client/pom.xml
@@ -90,11 +90,7 @@
       <version>${smallrye.config.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>${cxf.rt.rs.extension.providers.version}</version>
-    </dependency>
+
     <dependency>
       <groupId>jakarta.json.bind</groupId>
       <artifactId>jakarta.json.bind-api</artifactId>
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index f268f8d23a69..03905c5d23ff 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -22,7 +22,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java
index c51a4ffc8139..fc120b558053 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -22,7 +22,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
index d72fe95854a7..55bf44a43c01 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -35,7 +35,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index fe3c45f27d01..e04639dbd461 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -22,7 +22,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java
index 3e5a1f21e8a2..7cad90434812 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java
@@ -25,7 +25,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java
index f73d5cd06ca2..fcf70d5fadd6 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -22,7 +22,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java
index ca9d4ef4602f..31c641d61b68 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java
@@ -23,7 +23,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/samples/server/petstore/java-microprofile/pom.xml b/samples/server/petstore/java-microprofile/pom.xml
index 550d81ab8233..9d7495fc8052 100644
--- a/samples/server/petstore/java-microprofile/pom.xml
+++ b/samples/server/petstore/java-microprofile/pom.xml
@@ -90,11 +90,7 @@
       <version>${smallrye.config.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>${cxf.rt.rs.extension.providers.version}</version>
-    </dependency>
+
     <!-- JSON processing: jackson -->
     <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java
index 9d358a63f5fe..1b2b38cf0324 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java
@@ -24,7 +24,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 import io.smallrye.mutiny.Uni;
 
 
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java
index de2e5c71ac21..7768d16e8d5e 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java
@@ -22,7 +22,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 import io.smallrye.mutiny.Uni;
 
 
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java
index f96512f75a31..c14791575cf4 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java
@@ -23,7 +23,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-// import org.apache.cxf.jaxrs.ext.multipart.*;
+
 import io.smallrye.mutiny.Uni;
 
 

From fbbe64e578cdfc090b40763e085353a7d3b8c732 Mon Sep 17 00:00:00 2001
From: Jochen Riedlinger <j_ri@gmx.de>
Date: Wed, 26 Feb 2025 21:11:31 +0100
Subject: [PATCH 5/8] fix: #10618 make samples compile and switch
 jandex-maven-plugin

---
 .../resources/Java/libraries/microprofile/api_test.mustache  | 5 ++++-
 .../Java/libraries/microprofile/formParams.mustache          | 2 +-
 .../main/resources/Java/libraries/microprofile/pom.mustache  | 4 ++--
 .../resources/Java/libraries/microprofile/pom_3.0.mustache   | 4 ++--
 .../microprofile-rest-client-3.0-jackson-with-xml/pom.xml    | 4 ++--
 .../src/main/java/org/openapitools/client/api/PetApi.java    | 2 +-
 .../java/microprofile-rest-client-3.0-jackson/pom.xml        | 4 ++--
 .../src/main/java/org/openapitools/client/api/FakeApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/PetApi.java    | 4 ++--
 .../java/microprofile-rest-client-3.0-mutiny/pom.xml         | 4 ++--
 .../src/main/java/org/openapitools/client/api/PetApi.java    | 2 +-
 .../petstore/java/microprofile-rest-client-3.0/pom.xml       | 4 ++--
 .../src/main/java/org/openapitools/client/api/FakeApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/PetApi.java    | 4 ++--
 .../petstore/java/microprofile-rest-client-mutiny/pom.xml    | 4 ++--
 .../src/main/java/org/openapitools/client/api/PetApi.java    | 2 +-
 .../java/microprofile-rest-client-outer-enum/pom.xml         | 4 ++--
 .../pom.xml                                                  | 4 ++--
 .../src/main/java/org/openapitools/client/api/PetApi.java    | 2 +-
 .../client/petstore/java/microprofile-rest-client/pom.xml    | 4 ++--
 .../src/main/java/org/openapitools/client/api/FakeApi.java   | 2 +-
 .../src/main/java/org/openapitools/client/api/PetApi.java    | 4 ++--
 samples/server/petstore/java-microprofile/pom.xml            | 4 ++--
 .../src/main/java/org/openapitools/server/api/PetApi.java    | 2 +-
 .../test/java/org/openapitools/server/api/PetApiTest.java    | 2 +-
 25 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache
index d9af87719b47..b124fa062566 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache
@@ -4,6 +4,9 @@ package {{package}};
 
 {{#imports}}import {{import}};
 {{/imports}}
+{{#isFile}}
+import java.io.File;
+{{/isFile}}
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
@@ -70,7 +73,7 @@ public class {{classname}}Test {
     public void {{operationId}}Test() {
         // TODO: test validations
         {{#allParams}}
-        {{^isFile}}{{{dataType}}} {{paramName}} = null;{{/isFile}}{{#isFile}}org.apache.cxf.jaxrs.ext.multipart.Attachment {{paramName}} = null;{{/isFile}}
+        {{^isFile}}{{{dataType}}} {{paramName}} = null;{{/isFile}}{{#isFile}}File {{paramName}} = null;{{/isFile}}
         {{/allParams}}
         //{{^vendorExtensions.x-java-is-response-void}}{{#microprofileMutiny}}Uni<{{{returnType}}}>{{/microprofileMutiny}}{{^microprofileMutiny}}{{{returnType}}}{{/microprofileMutiny}} response = {{/vendorExtensions.x-java-is-response-void}}api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
         //{{#returnType}}Assertions.assertNotNull(response);{{/returnType}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache
index 0e5b55f857ab..3ec6fb98c9f3 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache
@@ -1 +1 @@
-{{#isFormParam}}{{^isFile}}{{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}")  {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} {{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}") Attachment {{paramName}}Detail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{^isFile}}{{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}")  {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} {{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}") File {{paramName}}Detail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
index d77f58422a4d..5381ca90ed74 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
@@ -12,7 +12,7 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
         <version>${jandex.maven.plugin.version}</version>
         <executions>
@@ -239,7 +239,7 @@
     <jaxb.core.version>2.2.11</jaxb.core.version>
     <jaxb.impl.version>2.2.11</jaxb.impl.version>
     <hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
-    <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
+    <jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
 {{#microprofileMutiny}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache
index 0a16de870360..b3d7cddde2d2 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache
@@ -12,7 +12,7 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
         <version>${jandex.maven.plugin.version}</version>
         <executions>
@@ -239,7 +239,7 @@
     <jaxb.core.version>3.0.2</jaxb.core.version>
     <jaxb.impl.version>3.0.2</jaxb.impl.version>
     <hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
-    <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
+    <jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
 {{#microprofileMutiny}}
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml
index 0fc8651ce46b..c06b972dab5e 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml
@@ -10,7 +10,7 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
         <version>${jandex.maven.plugin.version}</version>
         <executions>
@@ -170,7 +170,7 @@
     <jaxb.core.version>3.0.2</jaxb.core.version>
     <jaxb.impl.version>3.0.2</jaxb.impl.version>
     <hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
-    <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
+    <jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
   </properties>
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java
index 655e9bddb895..c878e1ca94b9 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java
@@ -133,5 +133,5 @@ public interface PetApi  {
     @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") File _fileDetail) throws ApiException, ProcessingException;
 }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml
index 62725b217709..99532a9cb71d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml
@@ -10,7 +10,7 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
         <version>${jandex.maven.plugin.version}</version>
         <executions>
@@ -165,7 +165,7 @@
     <jaxb.core.version>3.0.2</jaxb.core.version>
     <jaxb.impl.version>3.0.2</jaxb.impl.version>
     <hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
-    <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
+    <jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
     <commons.lang3.version>3.17.0</commons.lang3.version>
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
index 8d59c7668c8f..20cc52762bb3 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -154,7 +154,7 @@ public interface FakeApi  {
     @POST
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEndpointParameters(@FormParam("number")  BigDecimal number, @FormParam("double")  Double _double, @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam("byte")  byte[] _byte, @FormParam("integer")  Integer integer, @FormParam("int32")  Integer int32, @FormParam("int64")  Long int64, @FormParam("float")  Float _float, @FormParam("string")  String string,  @FormParam("binary") Attachment binaryDetail, @FormParam("date")  Date date, @FormParam("dateTime")  Date dateTime, @FormParam("password")  String password, @FormParam("callback")  String paramCallback) throws ApiException, ProcessingException;
+    void testEndpointParameters(@FormParam("number")  BigDecimal number, @FormParam("double")  Double _double, @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam("byte")  byte[] _byte, @FormParam("integer")  Integer integer, @FormParam("int32")  Integer int32, @FormParam("int64")  Long int64, @FormParam("float")  Float _float, @FormParam("string")  String string,  @FormParam("binary") File binaryDetail, @FormParam("date")  Date date, @FormParam("dateTime")  Date dateTime, @FormParam("password")  String password, @FormParam("callback")  String paramCallback) throws ApiException, ProcessingException;
 
     /**
      * To test enum parameters
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java
index e44282ae122d..72ad43c84a2d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java
@@ -132,7 +132,7 @@ public interface PetApi  {
     @Path("/pet/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") File _fileDetail) throws ApiException, ProcessingException;
 
     /**
      * uploads an image (required)
@@ -144,5 +144,5 @@ public interface PetApi  {
     @Path("/fake/{petId}/uploadImageWithRequiredFile")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @FormParam("requiredFile") Attachment requiredFileDetail, @FormParam("additionalMetadata")  String additionalMetadata) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @FormParam("requiredFile") File requiredFileDetail, @FormParam("additionalMetadata")  String additionalMetadata) throws ApiException, ProcessingException;
 }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml
index f1a595ab4eed..1b2452350a40 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml
@@ -10,7 +10,7 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
         <version>${jandex.maven.plugin.version}</version>
         <executions>
@@ -172,7 +172,7 @@
     <jaxb.core.version>3.0.2</jaxb.core.version>
     <jaxb.impl.version>3.0.2</jaxb.impl.version>
     <hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
-    <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
+    <jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
     <mutiny.version>1.10.0</mutiny.version>
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
index 0ef0678f13d0..6f498ac9770d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
@@ -134,5 +134,5 @@ public interface PetApi  {
     @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
+    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") File _fileDetail) throws ApiException, ProcessingException;
 }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml
index d5cb932fed1f..36a96e56aca1 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml
@@ -10,7 +10,7 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
         <version>${jandex.maven.plugin.version}</version>
         <executions>
@@ -167,7 +167,7 @@
     <jaxb.core.version>3.0.2</jaxb.core.version>
     <jaxb.impl.version>3.0.2</jaxb.impl.version>
     <hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
-    <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
+    <jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
   </properties>
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
index 8d59c7668c8f..20cc52762bb3 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -154,7 +154,7 @@ public interface FakeApi  {
     @POST
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEndpointParameters(@FormParam("number")  BigDecimal number, @FormParam("double")  Double _double, @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam("byte")  byte[] _byte, @FormParam("integer")  Integer integer, @FormParam("int32")  Integer int32, @FormParam("int64")  Long int64, @FormParam("float")  Float _float, @FormParam("string")  String string,  @FormParam("binary") Attachment binaryDetail, @FormParam("date")  Date date, @FormParam("dateTime")  Date dateTime, @FormParam("password")  String password, @FormParam("callback")  String paramCallback) throws ApiException, ProcessingException;
+    void testEndpointParameters(@FormParam("number")  BigDecimal number, @FormParam("double")  Double _double, @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam("byte")  byte[] _byte, @FormParam("integer")  Integer integer, @FormParam("int32")  Integer int32, @FormParam("int64")  Long int64, @FormParam("float")  Float _float, @FormParam("string")  String string,  @FormParam("binary") File binaryDetail, @FormParam("date")  Date date, @FormParam("dateTime")  Date dateTime, @FormParam("password")  String password, @FormParam("callback")  String paramCallback) throws ApiException, ProcessingException;
 
     /**
      * To test enum parameters
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java
index e44282ae122d..72ad43c84a2d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java
@@ -132,7 +132,7 @@ public interface PetApi  {
     @Path("/pet/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") File _fileDetail) throws ApiException, ProcessingException;
 
     /**
      * uploads an image (required)
@@ -144,5 +144,5 @@ public interface PetApi  {
     @Path("/fake/{petId}/uploadImageWithRequiredFile")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @FormParam("requiredFile") Attachment requiredFileDetail, @FormParam("additionalMetadata")  String additionalMetadata) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @FormParam("requiredFile") File requiredFileDetail, @FormParam("additionalMetadata")  String additionalMetadata) throws ApiException, ProcessingException;
 }
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml b/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml
index 9fff8fc4f4ca..ceb74918aab7 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml
@@ -10,7 +10,7 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
         <version>${jandex.maven.plugin.version}</version>
         <executions>
@@ -172,7 +172,7 @@
     <jaxb.core.version>2.2.11</jaxb.core.version>
     <jaxb.impl.version>2.2.11</jaxb.impl.version>
     <hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
-    <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
+    <jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
     <mutiny.version>1.10.0</mutiny.version>
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
index 8de75590d03e..3515eacea89d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java
@@ -134,5 +134,5 @@ public interface PetApi  {
     @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
+    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") File _fileDetail) throws ApiException, ProcessingException;
 }
diff --git a/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml b/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml
index 837f6ebc36f6..42b434f8a819 100644
--- a/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml
@@ -10,7 +10,7 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
         <version>${jandex.maven.plugin.version}</version>
         <executions>
@@ -167,7 +167,7 @@
     <jaxb.core.version>2.2.11</jaxb.core.version>
     <jaxb.impl.version>2.2.11</jaxb.impl.version>
     <hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
-    <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
+    <jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
   </properties>
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml
index 89442bae5f70..6006e0439c1d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml
@@ -10,7 +10,7 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
         <version>${jandex.maven.plugin.version}</version>
         <executions>
@@ -167,7 +167,7 @@
     <jaxb.core.version>3.0.2</jaxb.core.version>
     <jaxb.impl.version>3.0.2</jaxb.impl.version>
     <hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
-    <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
+    <jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
   </properties>
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
index ba402eaa1351..248d58d09bdc 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
@@ -273,7 +273,7 @@ public class UploadFileRequest {
 
         private @PathParam("petId") Long petId;
         private @FormParam("additionalMetadata")  String additionalMetadata;
-        private  @FormParam("file") Attachment _fileDetail;
+        private  @FormParam("file") File _fileDetail;
 
         private UploadFileRequest() {
         }
diff --git a/samples/client/petstore/java/microprofile-rest-client/pom.xml b/samples/client/petstore/java/microprofile-rest-client/pom.xml
index b5b334d3afd6..d05c952292ce 100644
--- a/samples/client/petstore/java/microprofile-rest-client/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client/pom.xml
@@ -10,7 +10,7 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
         <version>${jandex.maven.plugin.version}</version>
         <executions>
@@ -167,7 +167,7 @@
     <jaxb.core.version>2.2.11</jaxb.core.version>
     <jaxb.impl.version>2.2.11</jaxb.impl.version>
     <hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
-    <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
+    <jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
   </properties>
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
index 55bf44a43c01..cac496f5c160 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -154,7 +154,7 @@ public interface FakeApi  {
     @POST
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEndpointParameters(@FormParam("number")  BigDecimal number, @FormParam("double")  Double _double, @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam("byte")  byte[] _byte, @FormParam("integer")  Integer integer, @FormParam("int32")  Integer int32, @FormParam("int64")  Long int64, @FormParam("float")  Float _float, @FormParam("string")  String string,  @FormParam("binary") Attachment binaryDetail, @FormParam("date")  Date date, @FormParam("dateTime")  Date dateTime, @FormParam("password")  String password, @FormParam("callback")  String paramCallback) throws ApiException, ProcessingException;
+    void testEndpointParameters(@FormParam("number")  BigDecimal number, @FormParam("double")  Double _double, @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam("byte")  byte[] _byte, @FormParam("integer")  Integer integer, @FormParam("int32")  Integer int32, @FormParam("int64")  Long int64, @FormParam("float")  Float _float, @FormParam("string")  String string,  @FormParam("binary") File binaryDetail, @FormParam("date")  Date date, @FormParam("dateTime")  Date dateTime, @FormParam("password")  String password, @FormParam("callback")  String paramCallback) throws ApiException, ProcessingException;
 
     /**
      * To test enum parameters
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java
index 7cad90434812..68c4cfa4c167 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java
@@ -132,7 +132,7 @@ public interface PetApi  {
     @Path("/pet/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") File _fileDetail) throws ApiException, ProcessingException;
 
     /**
      * uploads an image (required)
@@ -144,5 +144,5 @@ public interface PetApi  {
     @Path("/fake/{petId}/uploadImageWithRequiredFile")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @FormParam("requiredFile") Attachment requiredFileDetail, @FormParam("additionalMetadata")  String additionalMetadata) throws ApiException, ProcessingException;
+    ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @FormParam("requiredFile") File requiredFileDetail, @FormParam("additionalMetadata")  String additionalMetadata) throws ApiException, ProcessingException;
 }
diff --git a/samples/server/petstore/java-microprofile/pom.xml b/samples/server/petstore/java-microprofile/pom.xml
index 9d7495fc8052..02f5c79f9541 100644
--- a/samples/server/petstore/java-microprofile/pom.xml
+++ b/samples/server/petstore/java-microprofile/pom.xml
@@ -10,7 +10,7 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
         <version>${jandex.maven.plugin.version}</version>
         <executions>
@@ -164,7 +164,7 @@
     <jaxb.core.version>2.2.11</jaxb.core.version>
     <jaxb.impl.version>2.2.11</jaxb.impl.version>
     <hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
-    <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
+    <jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
     <mutiny.version>1.10.0</mutiny.version>
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java
index 1b2b38cf0324..e71070a52956 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java
@@ -133,5 +133,5 @@ public interface PetApi  {
     @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
+    Uni<ModelApiResponse> uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata")  String additionalMetadata,  @FormParam("file") File _fileDetail) throws ApiException, ProcessingException;
 }
diff --git a/samples/server/petstore/java-microprofile/src/test/java/org/openapitools/server/api/PetApiTest.java b/samples/server/petstore/java-microprofile/src/test/java/org/openapitools/server/api/PetApiTest.java
index 0cd50290f230..a81bf2c9663e 100644
--- a/samples/server/petstore/java-microprofile/src/test/java/org/openapitools/server/api/PetApiTest.java
+++ b/samples/server/petstore/java-microprofile/src/test/java/org/openapitools/server/api/PetApiTest.java
@@ -191,7 +191,7 @@ public void uploadFileTest() {
         // TODO: test validations
         Long petId = null;
         String additionalMetadata = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null;
+        File _file = null;
         //Uni<ModelApiResponse> response = api.uploadFile(petId, additionalMetadata, _file);
         //Assertions.assertNotNull(response);
 

From d22f106e5c47e5c08e71ab7637ab361f2d8ee4d7 Mon Sep 17 00:00:00 2001
From: Jochen Riedlinger <j_ri@gmx.de>
Date: Fri, 28 Feb 2025 20:32:49 +0100
Subject: [PATCH 6/8] fix: #10618 sync my fork with upstream & clean pom

---
 .../src/main/resources/Java/libraries/microprofile/pom.mustache | 2 --
 .../petstore/java/microprofile-rest-client-mutiny/pom.xml       | 2 --
 .../petstore/java/microprofile-rest-client-outer-enum/pom.xml   | 2 --
 samples/client/petstore/java/microprofile-rest-client/pom.xml   | 2 --
 samples/server/petstore/java-microprofile/pom.xml               | 2 --
 5 files changed, 10 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
index 5381ca90ed74..2ebe8f0a7006 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
@@ -221,7 +221,6 @@
 {{#useBeanValidation}}
     <beanvalidation.version>3.0.2</beanvalidation.version>
 {{/useBeanValidation}}
-    <cxf.version>3.2.7</cxf.version>
     <jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
 {{#jackson}}
     <jackson.version>2.17.1</jackson.version>
@@ -235,7 +234,6 @@
     <microprofile.rest.client.api.version>{{microprofileRestClientVersion}}</microprofile.rest.client.api.version>
     <smallrye.rest.client.version>1.2.1</smallrye.rest.client.version>
     <smallrye.config.version>1.3.5</smallrye.config.version>
-    <cxf.rt.rs.extension.providers.version>3.2.6</cxf.rt.rs.extension.providers.version>
     <jaxb.core.version>2.2.11</jaxb.core.version>
     <jaxb.impl.version>2.2.11</jaxb.impl.version>
     <hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml b/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml
index ceb74918aab7..6aa3a855eaef 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml
@@ -157,7 +157,6 @@
     <jetty.version>9.2.9.v20150224</jetty.version>
     <junit.version>5.10.2</junit.version>
     <logback.version>1.5.13</logback.version>
-    <cxf.version>3.2.7</cxf.version>
     <jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
     <jakarta.activation.version>1.2.2</jakarta.activation.version>
     <jakarta.annotation.version>1.3.5</jakarta.annotation.version>
@@ -168,7 +167,6 @@
     <microprofile.rest.client.api.version>2.0</microprofile.rest.client.api.version>
     <smallrye.rest.client.version>1.2.1</smallrye.rest.client.version>
     <smallrye.config.version>1.3.5</smallrye.config.version>
-    <cxf.rt.rs.extension.providers.version>3.2.6</cxf.rt.rs.extension.providers.version>
     <jaxb.core.version>2.2.11</jaxb.core.version>
     <jaxb.impl.version>2.2.11</jaxb.impl.version>
     <hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
diff --git a/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml b/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml
index 42b434f8a819..11c5a71d9d66 100644
--- a/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml
@@ -152,7 +152,6 @@
     <jetty.version>9.2.9.v20150224</jetty.version>
     <junit.version>5.10.2</junit.version>
     <logback.version>1.5.13</logback.version>
-    <cxf.version>3.2.7</cxf.version>
     <jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
     <jakarta.activation.version>1.2.2</jakarta.activation.version>
     <jakarta.annotation.version>1.3.5</jakarta.annotation.version>
@@ -163,7 +162,6 @@
     <microprofile.rest.client.api.version>2.0</microprofile.rest.client.api.version>
     <smallrye.rest.client.version>1.2.1</smallrye.rest.client.version>
     <smallrye.config.version>1.3.5</smallrye.config.version>
-    <cxf.rt.rs.extension.providers.version>3.2.6</cxf.rt.rs.extension.providers.version>
     <jaxb.core.version>2.2.11</jaxb.core.version>
     <jaxb.impl.version>2.2.11</jaxb.impl.version>
     <hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
diff --git a/samples/client/petstore/java/microprofile-rest-client/pom.xml b/samples/client/petstore/java/microprofile-rest-client/pom.xml
index d05c952292ce..2cd477a0ec32 100644
--- a/samples/client/petstore/java/microprofile-rest-client/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client/pom.xml
@@ -152,7 +152,6 @@
     <jetty.version>9.2.9.v20150224</jetty.version>
     <junit.version>5.10.2</junit.version>
     <logback.version>1.5.13</logback.version>
-    <cxf.version>3.2.7</cxf.version>
     <jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
     <jakarta.activation.version>1.2.2</jakarta.activation.version>
     <jakarta.annotation.version>1.3.5</jakarta.annotation.version>
@@ -163,7 +162,6 @@
     <microprofile.rest.client.api.version>2.0</microprofile.rest.client.api.version>
     <smallrye.rest.client.version>1.2.1</smallrye.rest.client.version>
     <smallrye.config.version>1.3.5</smallrye.config.version>
-    <cxf.rt.rs.extension.providers.version>3.2.6</cxf.rt.rs.extension.providers.version>
     <jaxb.core.version>2.2.11</jaxb.core.version>
     <jaxb.impl.version>2.2.11</jaxb.impl.version>
     <hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
diff --git a/samples/server/petstore/java-microprofile/pom.xml b/samples/server/petstore/java-microprofile/pom.xml
index 02f5c79f9541..2109c7d4e8b8 100644
--- a/samples/server/petstore/java-microprofile/pom.xml
+++ b/samples/server/petstore/java-microprofile/pom.xml
@@ -148,7 +148,6 @@
     <jetty.version>9.2.9.v20150224</jetty.version>
     <junit.version>5.10.2</junit.version>
     <logback.version>1.5.13</logback.version>
-    <cxf.version>3.2.7</cxf.version>
     <jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
     <jackson.version>2.17.1</jackson.version>
     <jakarta.activation.version>1.2.2</jakarta.activation.version>
@@ -160,7 +159,6 @@
     <microprofile.rest.client.api.version>2.0</microprofile.rest.client.api.version>
     <smallrye.rest.client.version>1.2.1</smallrye.rest.client.version>
     <smallrye.config.version>1.3.5</smallrye.config.version>
-    <cxf.rt.rs.extension.providers.version>3.2.6</cxf.rt.rs.extension.providers.version>
     <jaxb.core.version>2.2.11</jaxb.core.version>
     <jaxb.impl.version>2.2.11</jaxb.impl.version>
     <hibernate.validator.version>5.2.2.Final</hibernate.validator.version>

From 18436234c37be7ee4c65f45071e47e0d704364b7 Mon Sep 17 00:00:00 2001
From: Jochen Riedlinger <j_ri@gmx.de>
Date: Fri, 28 Feb 2025 21:07:18 +0100
Subject: [PATCH 7/8] fix: #10618 regenerate samples

---
 .../.openapi-generator/FILES                  | 10 ++++
 .../openapitools/client/api/PetApiTest.java   |  2 +-
 .../.openapi-generator/FILES                  | 58 +++++++++++++++++++
 .../openapitools/client/api/FakeApiTest.java  |  4 +-
 .../openapitools/client/api/PetApiTest.java   |  4 +-
 .../.openapi-generator/FILES                  | 10 ++++
 .../openapitools/client/api/PetApiTest.java   |  2 +-
 .../.openapi-generator/FILES                  | 58 +++++++++++++++++++
 .../openapitools/client/api/FakeApiTest.java  |  4 +-
 .../openapitools/client/api/PetApiTest.java   |  4 +-
 .../.openapi-generator/FILES                  | 10 ++++
 .../openapitools/client/api/PetApiTest.java   |  2 +-
 .../.openapi-generator/FILES                  |  5 ++
 .../.openapi-generator/FILES                  | 10 ++++
 .../openapitools/client/api/PetApiTest.java   |  2 +-
 .../.openapi-generator/FILES                  | 58 +++++++++++++++++++
 .../openapitools/client/api/FakeApiTest.java  |  4 +-
 .../openapitools/client/api/PetApiTest.java   |  4 +-
 18 files changed, 235 insertions(+), 16 deletions(-)

diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/.openapi-generator/FILES
index 6943768893bd..c9d7a9c14e3d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 docs/Category.md
 docs/ModelApiResponse.md
@@ -21,3 +22,12 @@ src/main/java/org/openapitools/client/model/Order.java
 src/main/java/org/openapitools/client/model/Pet.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/User.java
+src/test/java/org/openapitools/client/api/PetApiTest.java
+src/test/java/org/openapitools/client/api/StoreApiTest.java
+src/test/java/org/openapitools/client/api/UserApiTest.java
+src/test/java/org/openapitools/client/model/CategoryTest.java
+src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+src/test/java/org/openapitools/client/model/OrderTest.java
+src/test/java/org/openapitools/client/model/PetTest.java
+src/test/java/org/openapitools/client/model/TagTest.java
+src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/PetApiTest.java
index 797c05009b01..c38211f41b24 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -188,7 +188,7 @@ public void uploadFileTest() {
         // TODO: test validations
         Long petId = null;
         String additionalMetadata = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null;
+        File _file = null;
         //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
         //Assertions.assertNotNull(response);
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/.openapi-generator/FILES
index 719f590596a2..435150fb9507 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 docs/AdditionalPropertiesClass.md
 docs/AllOfWithSingleRef.md
@@ -117,3 +118,60 @@ src/main/java/org/openapitools/client/model/SpecialModelName.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
 src/main/java/org/openapitools/client/model/User.java
+src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+src/test/java/org/openapitools/client/api/DefaultApiTest.java
+src/test/java/org/openapitools/client/api/FakeApiTest.java
+src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+src/test/java/org/openapitools/client/api/PetApiTest.java
+src/test/java/org/openapitools/client/api/StoreApiTest.java
+src/test/java/org/openapitools/client/api/UserApiTest.java
+src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
+src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
+src/test/java/org/openapitools/client/model/AnimalTest.java
+src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
+src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
+src/test/java/org/openapitools/client/model/ArrayTestTest.java
+src/test/java/org/openapitools/client/model/CapitalizationTest.java
+src/test/java/org/openapitools/client/model/CatTest.java
+src/test/java/org/openapitools/client/model/CategoryTest.java
+src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
+src/test/java/org/openapitools/client/model/ClassModelTest.java
+src/test/java/org/openapitools/client/model/ClientTest.java
+src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
+src/test/java/org/openapitools/client/model/DogTest.java
+src/test/java/org/openapitools/client/model/EnumArraysTest.java
+src/test/java/org/openapitools/client/model/EnumClassTest.java
+src/test/java/org/openapitools/client/model/EnumTestTest.java
+src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
+src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
+src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
+src/test/java/org/openapitools/client/model/FooTest.java
+src/test/java/org/openapitools/client/model/FormatTestTest.java
+src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
+src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
+src/test/java/org/openapitools/client/model/MapTestTest.java
+src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
+src/test/java/org/openapitools/client/model/Model200ResponseTest.java
+src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+src/test/java/org/openapitools/client/model/ModelFileTest.java
+src/test/java/org/openapitools/client/model/ModelListTest.java
+src/test/java/org/openapitools/client/model/ModelReturnTest.java
+src/test/java/org/openapitools/client/model/NameTest.java
+src/test/java/org/openapitools/client/model/NullableClassTest.java
+src/test/java/org/openapitools/client/model/NumberOnlyTest.java
+src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
+src/test/java/org/openapitools/client/model/OrderTest.java
+src/test/java/org/openapitools/client/model/OuterCompositeTest.java
+src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
+src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
+src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
+src/test/java/org/openapitools/client/model/OuterEnumTest.java
+src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
+src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
+src/test/java/org/openapitools/client/model/PetTest.java
+src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
+src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
+src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
+src/test/java/org/openapitools/client/model/TagTest.java
+src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
+src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 26ec6bf6711c..9bf431f6a13b 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -198,7 +198,7 @@ public void testAdditionalPropertiesReferenceTest() {
     @Test
     public void testBodyWithBinaryTest() {
         // TODO: test validations
-        org.apache.cxf.jaxrs.ext.multipart.Attachment body = null;
+        File body = null;
         //api.testBodyWithBinary(body);
         //Assertions.assertNotNull(response);
 
@@ -272,7 +272,7 @@ public void testEndpointParametersTest() {
         Long int64 = null;
         Float _float = null;
         String string = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment binary = null;
+        File binary = null;
         Date date = null;
         Date dateTime = null;
         String password = null;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java
index 10e6a3f86060..0e81ba3d3382 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -189,7 +189,7 @@ public void uploadFileTest() {
         // TODO: test validations
         Long petId = null;
         String additionalMetadata = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null;
+        File _file = null;
         //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
         //Assertions.assertNotNull(response);
 
@@ -208,7 +208,7 @@ public void uploadFileTest() {
     public void uploadFileWithRequiredFileTest() {
         // TODO: test validations
         Long petId = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment requiredFile = null;
+        File requiredFile = null;
         String additionalMetadata = null;
         //ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
         //Assertions.assertNotNull(response);
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/.openapi-generator/FILES
index ae145903e52b..8461102c6b9a 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 docs/Category.md
 docs/ModelApiResponse.md
@@ -20,3 +21,12 @@ src/main/java/org/openapitools/client/model/Order.java
 src/main/java/org/openapitools/client/model/Pet.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/User.java
+src/test/java/org/openapitools/client/api/PetApiTest.java
+src/test/java/org/openapitools/client/api/StoreApiTest.java
+src/test/java/org/openapitools/client/api/UserApiTest.java
+src/test/java/org/openapitools/client/model/CategoryTest.java
+src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+src/test/java/org/openapitools/client/model/OrderTest.java
+src/test/java/org/openapitools/client/model/PetTest.java
+src/test/java/org/openapitools/client/model/TagTest.java
+src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java
index a08c4178f405..e1008ad720dc 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -188,7 +188,7 @@ public void uploadFileTest() {
         // TODO: test validations
         Long petId = null;
         String additionalMetadata = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null;
+        File _file = null;
         //Uni<ModelApiResponse> response = api.uploadFile(petId, additionalMetadata, _file);
         //Assertions.assertNotNull(response);
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/FILES
index c2568cfe3018..aa13937676f7 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 docs/AdditionalPropertiesClass.md
 docs/AllOfWithSingleRef.md
@@ -116,3 +117,60 @@ src/main/java/org/openapitools/client/model/SpecialModelName.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
 src/main/java/org/openapitools/client/model/User.java
+src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+src/test/java/org/openapitools/client/api/DefaultApiTest.java
+src/test/java/org/openapitools/client/api/FakeApiTest.java
+src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+src/test/java/org/openapitools/client/api/PetApiTest.java
+src/test/java/org/openapitools/client/api/StoreApiTest.java
+src/test/java/org/openapitools/client/api/UserApiTest.java
+src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
+src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
+src/test/java/org/openapitools/client/model/AnimalTest.java
+src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
+src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
+src/test/java/org/openapitools/client/model/ArrayTestTest.java
+src/test/java/org/openapitools/client/model/CapitalizationTest.java
+src/test/java/org/openapitools/client/model/CatTest.java
+src/test/java/org/openapitools/client/model/CategoryTest.java
+src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
+src/test/java/org/openapitools/client/model/ClassModelTest.java
+src/test/java/org/openapitools/client/model/ClientTest.java
+src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
+src/test/java/org/openapitools/client/model/DogTest.java
+src/test/java/org/openapitools/client/model/EnumArraysTest.java
+src/test/java/org/openapitools/client/model/EnumClassTest.java
+src/test/java/org/openapitools/client/model/EnumTestTest.java
+src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
+src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
+src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
+src/test/java/org/openapitools/client/model/FooTest.java
+src/test/java/org/openapitools/client/model/FormatTestTest.java
+src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
+src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
+src/test/java/org/openapitools/client/model/MapTestTest.java
+src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
+src/test/java/org/openapitools/client/model/Model200ResponseTest.java
+src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+src/test/java/org/openapitools/client/model/ModelFileTest.java
+src/test/java/org/openapitools/client/model/ModelListTest.java
+src/test/java/org/openapitools/client/model/ModelReturnTest.java
+src/test/java/org/openapitools/client/model/NameTest.java
+src/test/java/org/openapitools/client/model/NullableClassTest.java
+src/test/java/org/openapitools/client/model/NumberOnlyTest.java
+src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
+src/test/java/org/openapitools/client/model/OrderTest.java
+src/test/java/org/openapitools/client/model/OuterCompositeTest.java
+src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
+src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
+src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
+src/test/java/org/openapitools/client/model/OuterEnumTest.java
+src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
+src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
+src/test/java/org/openapitools/client/model/PetTest.java
+src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
+src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
+src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
+src/test/java/org/openapitools/client/model/TagTest.java
+src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
+src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 26ec6bf6711c..9bf431f6a13b 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -198,7 +198,7 @@ public void testAdditionalPropertiesReferenceTest() {
     @Test
     public void testBodyWithBinaryTest() {
         // TODO: test validations
-        org.apache.cxf.jaxrs.ext.multipart.Attachment body = null;
+        File body = null;
         //api.testBodyWithBinary(body);
         //Assertions.assertNotNull(response);
 
@@ -272,7 +272,7 @@ public void testEndpointParametersTest() {
         Long int64 = null;
         Float _float = null;
         String string = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment binary = null;
+        File binary = null;
         Date date = null;
         Date dateTime = null;
         String password = null;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/PetApiTest.java
index 10e6a3f86060..0e81ba3d3382 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -189,7 +189,7 @@ public void uploadFileTest() {
         // TODO: test validations
         Long petId = null;
         String additionalMetadata = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null;
+        File _file = null;
         //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
         //Assertions.assertNotNull(response);
 
@@ -208,7 +208,7 @@ public void uploadFileTest() {
     public void uploadFileWithRequiredFileTest() {
         // TODO: test validations
         Long petId = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment requiredFile = null;
+        File requiredFile = null;
         String additionalMetadata = null;
         //ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
         //Assertions.assertNotNull(response);
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-mutiny/.openapi-generator/FILES
index ae145903e52b..8461102c6b9a 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 docs/Category.md
 docs/ModelApiResponse.md
@@ -20,3 +21,12 @@ src/main/java/org/openapitools/client/model/Order.java
 src/main/java/org/openapitools/client/model/Pet.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/User.java
+src/test/java/org/openapitools/client/api/PetApiTest.java
+src/test/java/org/openapitools/client/api/StoreApiTest.java
+src/test/java/org/openapitools/client/api/UserApiTest.java
+src/test/java/org/openapitools/client/model/CategoryTest.java
+src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+src/test/java/org/openapitools/client/model/OrderTest.java
+src/test/java/org/openapitools/client/model/PetTest.java
+src/test/java/org/openapitools/client/model/TagTest.java
+src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java
index 764ced64f49a..0e62476a83d8 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -191,7 +191,7 @@ public void uploadFileTest() {
         // TODO: test validations
         Long petId = null;
         String additionalMetadata = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null;
+        File _file = null;
         //Uni<ModelApiResponse> response = api.uploadFile(petId, additionalMetadata, _file);
         //Assertions.assertNotNull(response);
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-outer-enum/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-outer-enum/.openapi-generator/FILES
index 697576c5e2f5..af09e379a574 100644
--- a/samples/client/petstore/java/microprofile-rest-client-outer-enum/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-outer-enum/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 docs/Cat.md
 docs/DefaultApi.md
@@ -10,3 +11,7 @@ src/main/java/org/openapitools/client/api/DefaultApi.java
 src/main/java/org/openapitools/client/model/Cat.java
 src/main/java/org/openapitools/client/model/Dog.java
 src/main/java/org/openapitools/client/model/Status.java
+src/test/java/org/openapitools/client/api/DefaultApiTest.java
+src/test/java/org/openapitools/client/model/CatTest.java
+src/test/java/org/openapitools/client/model/DogTest.java
+src/test/java/org/openapitools/client/model/StatusTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/.openapi-generator/FILES
index ae145903e52b..8461102c6b9a 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 docs/Category.md
 docs/ModelApiResponse.md
@@ -20,3 +21,12 @@ src/main/java/org/openapitools/client/model/Order.java
 src/main/java/org/openapitools/client/model/Pet.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/User.java
+src/test/java/org/openapitools/client/api/PetApiTest.java
+src/test/java/org/openapitools/client/api/StoreApiTest.java
+src/test/java/org/openapitools/client/api/UserApiTest.java
+src/test/java/org/openapitools/client/model/CategoryTest.java
+src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+src/test/java/org/openapitools/client/model/OrderTest.java
+src/test/java/org/openapitools/client/model/PetTest.java
+src/test/java/org/openapitools/client/model/TagTest.java
+src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/test/java/org/openapitools/client/api/PetApiTest.java
index 797c05009b01..c38211f41b24 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -188,7 +188,7 @@ public void uploadFileTest() {
         // TODO: test validations
         Long petId = null;
         String additionalMetadata = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null;
+        File _file = null;
         //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
         //Assertions.assertNotNull(response);
 
diff --git a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/FILES
index c2568cfe3018..aa13937676f7 100644
--- a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 docs/AdditionalPropertiesClass.md
 docs/AllOfWithSingleRef.md
@@ -116,3 +117,60 @@ src/main/java/org/openapitools/client/model/SpecialModelName.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
 src/main/java/org/openapitools/client/model/User.java
+src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+src/test/java/org/openapitools/client/api/DefaultApiTest.java
+src/test/java/org/openapitools/client/api/FakeApiTest.java
+src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+src/test/java/org/openapitools/client/api/PetApiTest.java
+src/test/java/org/openapitools/client/api/StoreApiTest.java
+src/test/java/org/openapitools/client/api/UserApiTest.java
+src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
+src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
+src/test/java/org/openapitools/client/model/AnimalTest.java
+src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
+src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
+src/test/java/org/openapitools/client/model/ArrayTestTest.java
+src/test/java/org/openapitools/client/model/CapitalizationTest.java
+src/test/java/org/openapitools/client/model/CatTest.java
+src/test/java/org/openapitools/client/model/CategoryTest.java
+src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
+src/test/java/org/openapitools/client/model/ClassModelTest.java
+src/test/java/org/openapitools/client/model/ClientTest.java
+src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
+src/test/java/org/openapitools/client/model/DogTest.java
+src/test/java/org/openapitools/client/model/EnumArraysTest.java
+src/test/java/org/openapitools/client/model/EnumClassTest.java
+src/test/java/org/openapitools/client/model/EnumTestTest.java
+src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
+src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
+src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
+src/test/java/org/openapitools/client/model/FooTest.java
+src/test/java/org/openapitools/client/model/FormatTestTest.java
+src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
+src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
+src/test/java/org/openapitools/client/model/MapTestTest.java
+src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
+src/test/java/org/openapitools/client/model/Model200ResponseTest.java
+src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+src/test/java/org/openapitools/client/model/ModelFileTest.java
+src/test/java/org/openapitools/client/model/ModelListTest.java
+src/test/java/org/openapitools/client/model/ModelReturnTest.java
+src/test/java/org/openapitools/client/model/NameTest.java
+src/test/java/org/openapitools/client/model/NullableClassTest.java
+src/test/java/org/openapitools/client/model/NumberOnlyTest.java
+src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
+src/test/java/org/openapitools/client/model/OrderTest.java
+src/test/java/org/openapitools/client/model/OuterCompositeTest.java
+src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
+src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
+src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
+src/test/java/org/openapitools/client/model/OuterEnumTest.java
+src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
+src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
+src/test/java/org/openapitools/client/model/PetTest.java
+src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
+src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
+src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
+src/test/java/org/openapitools/client/model/TagTest.java
+src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
+src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/FakeApiTest.java
index d25f42399053..0e61b357a4c8 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -201,7 +201,7 @@ public void testAdditionalPropertiesReferenceTest() {
     @Test
     public void testBodyWithBinaryTest() {
         // TODO: test validations
-        org.apache.cxf.jaxrs.ext.multipart.Attachment body = null;
+        File body = null;
         //api.testBodyWithBinary(body);
         //Assertions.assertNotNull(response);
 
@@ -275,7 +275,7 @@ public void testEndpointParametersTest() {
         Long int64 = null;
         Float _float = null;
         String string = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment binary = null;
+        File binary = null;
         Date date = null;
         Date dateTime = null;
         String password = null;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/PetApiTest.java
index 40a4b434dc6c..74b58c73ec89 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -192,7 +192,7 @@ public void uploadFileTest() {
         // TODO: test validations
         Long petId = null;
         String additionalMetadata = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null;
+        File _file = null;
         //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
         //Assertions.assertNotNull(response);
 
@@ -211,7 +211,7 @@ public void uploadFileTest() {
     public void uploadFileWithRequiredFileTest() {
         // TODO: test validations
         Long petId = null;
-        org.apache.cxf.jaxrs.ext.multipart.Attachment requiredFile = null;
+        File requiredFile = null;
         String additionalMetadata = null;
         //ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
         //Assertions.assertNotNull(response);

From d04d9ab64007fab51f70aba1be63c0a3edbe1567 Mon Sep 17 00:00:00 2001
From: Jochen Riedlinger <j_ri@gmx.de>
Date: Fri, 28 Feb 2025 21:27:45 +0100
Subject: [PATCH 8/8] fix: #10618
 microprofile-rest-client-with-useSingleRequestParameter

---
 .../microprofile/formParamsImpl.mustache      |  2 +-
 .../.openapi-generator/FILES                  | 10 ----
 .../.openapi-generator/FILES                  | 58 -------------------
 .../.openapi-generator/FILES                  | 10 ----
 .../.openapi-generator/FILES                  | 58 -------------------
 .../.openapi-generator/FILES                  | 10 ----
 .../.openapi-generator/FILES                  |  5 --
 .../.openapi-generator/FILES                  | 10 ----
 .../org/openapitools/client/api/PetApi.java   |  2 +-
 .../.openapi-generator/FILES                  | 58 -------------------
 10 files changed, 2 insertions(+), 221 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache
index 2be40e1ddd3d..1cdf27390222 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache
@@ -1 +1 @@
-{{#isFormParam}}{{^isFile}}{{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} Attachment {{paramName}}Detail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{^isFile}}{{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} File {{paramName}}Detail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/.openapi-generator/FILES
index c9d7a9c14e3d..6943768893bd 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 docs/Category.md
 docs/ModelApiResponse.md
@@ -22,12 +21,3 @@ src/main/java/org/openapitools/client/model/Order.java
 src/main/java/org/openapitools/client/model/Pet.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/User.java
-src/test/java/org/openapitools/client/api/PetApiTest.java
-src/test/java/org/openapitools/client/api/StoreApiTest.java
-src/test/java/org/openapitools/client/api/UserApiTest.java
-src/test/java/org/openapitools/client/model/CategoryTest.java
-src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
-src/test/java/org/openapitools/client/model/OrderTest.java
-src/test/java/org/openapitools/client/model/PetTest.java
-src/test/java/org/openapitools/client/model/TagTest.java
-src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/.openapi-generator/FILES
index 435150fb9507..719f590596a2 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 docs/AdditionalPropertiesClass.md
 docs/AllOfWithSingleRef.md
@@ -118,60 +117,3 @@ src/main/java/org/openapitools/client/model/SpecialModelName.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
 src/main/java/org/openapitools/client/model/User.java
-src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
-src/test/java/org/openapitools/client/api/DefaultApiTest.java
-src/test/java/org/openapitools/client/api/FakeApiTest.java
-src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
-src/test/java/org/openapitools/client/api/PetApiTest.java
-src/test/java/org/openapitools/client/api/StoreApiTest.java
-src/test/java/org/openapitools/client/api/UserApiTest.java
-src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
-src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
-src/test/java/org/openapitools/client/model/AnimalTest.java
-src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
-src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
-src/test/java/org/openapitools/client/model/ArrayTestTest.java
-src/test/java/org/openapitools/client/model/CapitalizationTest.java
-src/test/java/org/openapitools/client/model/CatTest.java
-src/test/java/org/openapitools/client/model/CategoryTest.java
-src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
-src/test/java/org/openapitools/client/model/ClassModelTest.java
-src/test/java/org/openapitools/client/model/ClientTest.java
-src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
-src/test/java/org/openapitools/client/model/DogTest.java
-src/test/java/org/openapitools/client/model/EnumArraysTest.java
-src/test/java/org/openapitools/client/model/EnumClassTest.java
-src/test/java/org/openapitools/client/model/EnumTestTest.java
-src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
-src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
-src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
-src/test/java/org/openapitools/client/model/FooTest.java
-src/test/java/org/openapitools/client/model/FormatTestTest.java
-src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
-src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
-src/test/java/org/openapitools/client/model/MapTestTest.java
-src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
-src/test/java/org/openapitools/client/model/Model200ResponseTest.java
-src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
-src/test/java/org/openapitools/client/model/ModelFileTest.java
-src/test/java/org/openapitools/client/model/ModelListTest.java
-src/test/java/org/openapitools/client/model/ModelReturnTest.java
-src/test/java/org/openapitools/client/model/NameTest.java
-src/test/java/org/openapitools/client/model/NullableClassTest.java
-src/test/java/org/openapitools/client/model/NumberOnlyTest.java
-src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
-src/test/java/org/openapitools/client/model/OrderTest.java
-src/test/java/org/openapitools/client/model/OuterCompositeTest.java
-src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
-src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
-src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
-src/test/java/org/openapitools/client/model/OuterEnumTest.java
-src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
-src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
-src/test/java/org/openapitools/client/model/PetTest.java
-src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
-src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
-src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
-src/test/java/org/openapitools/client/model/TagTest.java
-src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
-src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/.openapi-generator/FILES
index 8461102c6b9a..ae145903e52b 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 docs/Category.md
 docs/ModelApiResponse.md
@@ -21,12 +20,3 @@ src/main/java/org/openapitools/client/model/Order.java
 src/main/java/org/openapitools/client/model/Pet.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/User.java
-src/test/java/org/openapitools/client/api/PetApiTest.java
-src/test/java/org/openapitools/client/api/StoreApiTest.java
-src/test/java/org/openapitools/client/api/UserApiTest.java
-src/test/java/org/openapitools/client/model/CategoryTest.java
-src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
-src/test/java/org/openapitools/client/model/OrderTest.java
-src/test/java/org/openapitools/client/model/PetTest.java
-src/test/java/org/openapitools/client/model/TagTest.java
-src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/FILES
index aa13937676f7..c2568cfe3018 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 docs/AdditionalPropertiesClass.md
 docs/AllOfWithSingleRef.md
@@ -117,60 +116,3 @@ src/main/java/org/openapitools/client/model/SpecialModelName.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
 src/main/java/org/openapitools/client/model/User.java
-src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
-src/test/java/org/openapitools/client/api/DefaultApiTest.java
-src/test/java/org/openapitools/client/api/FakeApiTest.java
-src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
-src/test/java/org/openapitools/client/api/PetApiTest.java
-src/test/java/org/openapitools/client/api/StoreApiTest.java
-src/test/java/org/openapitools/client/api/UserApiTest.java
-src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
-src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
-src/test/java/org/openapitools/client/model/AnimalTest.java
-src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
-src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
-src/test/java/org/openapitools/client/model/ArrayTestTest.java
-src/test/java/org/openapitools/client/model/CapitalizationTest.java
-src/test/java/org/openapitools/client/model/CatTest.java
-src/test/java/org/openapitools/client/model/CategoryTest.java
-src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
-src/test/java/org/openapitools/client/model/ClassModelTest.java
-src/test/java/org/openapitools/client/model/ClientTest.java
-src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
-src/test/java/org/openapitools/client/model/DogTest.java
-src/test/java/org/openapitools/client/model/EnumArraysTest.java
-src/test/java/org/openapitools/client/model/EnumClassTest.java
-src/test/java/org/openapitools/client/model/EnumTestTest.java
-src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
-src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
-src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
-src/test/java/org/openapitools/client/model/FooTest.java
-src/test/java/org/openapitools/client/model/FormatTestTest.java
-src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
-src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
-src/test/java/org/openapitools/client/model/MapTestTest.java
-src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
-src/test/java/org/openapitools/client/model/Model200ResponseTest.java
-src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
-src/test/java/org/openapitools/client/model/ModelFileTest.java
-src/test/java/org/openapitools/client/model/ModelListTest.java
-src/test/java/org/openapitools/client/model/ModelReturnTest.java
-src/test/java/org/openapitools/client/model/NameTest.java
-src/test/java/org/openapitools/client/model/NullableClassTest.java
-src/test/java/org/openapitools/client/model/NumberOnlyTest.java
-src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
-src/test/java/org/openapitools/client/model/OrderTest.java
-src/test/java/org/openapitools/client/model/OuterCompositeTest.java
-src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
-src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
-src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
-src/test/java/org/openapitools/client/model/OuterEnumTest.java
-src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
-src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
-src/test/java/org/openapitools/client/model/PetTest.java
-src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
-src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
-src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
-src/test/java/org/openapitools/client/model/TagTest.java
-src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
-src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-mutiny/.openapi-generator/FILES
index 8461102c6b9a..ae145903e52b 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 docs/Category.md
 docs/ModelApiResponse.md
@@ -21,12 +20,3 @@ src/main/java/org/openapitools/client/model/Order.java
 src/main/java/org/openapitools/client/model/Pet.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/User.java
-src/test/java/org/openapitools/client/api/PetApiTest.java
-src/test/java/org/openapitools/client/api/StoreApiTest.java
-src/test/java/org/openapitools/client/api/UserApiTest.java
-src/test/java/org/openapitools/client/model/CategoryTest.java
-src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
-src/test/java/org/openapitools/client/model/OrderTest.java
-src/test/java/org/openapitools/client/model/PetTest.java
-src/test/java/org/openapitools/client/model/TagTest.java
-src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-outer-enum/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-outer-enum/.openapi-generator/FILES
index af09e379a574..697576c5e2f5 100644
--- a/samples/client/petstore/java/microprofile-rest-client-outer-enum/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-outer-enum/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 docs/Cat.md
 docs/DefaultApi.md
@@ -11,7 +10,3 @@ src/main/java/org/openapitools/client/api/DefaultApi.java
 src/main/java/org/openapitools/client/model/Cat.java
 src/main/java/org/openapitools/client/model/Dog.java
 src/main/java/org/openapitools/client/model/Status.java
-src/test/java/org/openapitools/client/api/DefaultApiTest.java
-src/test/java/org/openapitools/client/model/CatTest.java
-src/test/java/org/openapitools/client/model/DogTest.java
-src/test/java/org/openapitools/client/model/StatusTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/.openapi-generator/FILES
index 8461102c6b9a..ae145903e52b 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 docs/Category.md
 docs/ModelApiResponse.md
@@ -21,12 +20,3 @@ src/main/java/org/openapitools/client/model/Order.java
 src/main/java/org/openapitools/client/model/Pet.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/User.java
-src/test/java/org/openapitools/client/api/PetApiTest.java
-src/test/java/org/openapitools/client/api/StoreApiTest.java
-src/test/java/org/openapitools/client/api/UserApiTest.java
-src/test/java/org/openapitools/client/model/CategoryTest.java
-src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
-src/test/java/org/openapitools/client/model/OrderTest.java
-src/test/java/org/openapitools/client/model/PetTest.java
-src/test/java/org/openapitools/client/model/TagTest.java
-src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
index 248d58d09bdc..00f766ca51fd 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java
@@ -305,7 +305,7 @@ public UploadFileRequest additionalMetadata(String additionalMetadata) {
          * @param _fileDetail file to upload (optional)
          * @return UploadFileRequest
          */
-        public UploadFileRequest _fileDetail( Attachment _fileDetail) {
+        public UploadFileRequest _fileDetail( File _fileDetail) {
             this._fileDetail = _fileDetail;
             return this;
         }
diff --git a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/FILES b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/FILES
index aa13937676f7..c2568cfe3018 100644
--- a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/FILES
+++ b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 docs/AdditionalPropertiesClass.md
 docs/AllOfWithSingleRef.md
@@ -117,60 +116,3 @@ src/main/java/org/openapitools/client/model/SpecialModelName.java
 src/main/java/org/openapitools/client/model/Tag.java
 src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
 src/main/java/org/openapitools/client/model/User.java
-src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
-src/test/java/org/openapitools/client/api/DefaultApiTest.java
-src/test/java/org/openapitools/client/api/FakeApiTest.java
-src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
-src/test/java/org/openapitools/client/api/PetApiTest.java
-src/test/java/org/openapitools/client/api/StoreApiTest.java
-src/test/java/org/openapitools/client/api/UserApiTest.java
-src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
-src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
-src/test/java/org/openapitools/client/model/AnimalTest.java
-src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
-src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
-src/test/java/org/openapitools/client/model/ArrayTestTest.java
-src/test/java/org/openapitools/client/model/CapitalizationTest.java
-src/test/java/org/openapitools/client/model/CatTest.java
-src/test/java/org/openapitools/client/model/CategoryTest.java
-src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
-src/test/java/org/openapitools/client/model/ClassModelTest.java
-src/test/java/org/openapitools/client/model/ClientTest.java
-src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
-src/test/java/org/openapitools/client/model/DogTest.java
-src/test/java/org/openapitools/client/model/EnumArraysTest.java
-src/test/java/org/openapitools/client/model/EnumClassTest.java
-src/test/java/org/openapitools/client/model/EnumTestTest.java
-src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
-src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
-src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
-src/test/java/org/openapitools/client/model/FooTest.java
-src/test/java/org/openapitools/client/model/FormatTestTest.java
-src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
-src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
-src/test/java/org/openapitools/client/model/MapTestTest.java
-src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
-src/test/java/org/openapitools/client/model/Model200ResponseTest.java
-src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
-src/test/java/org/openapitools/client/model/ModelFileTest.java
-src/test/java/org/openapitools/client/model/ModelListTest.java
-src/test/java/org/openapitools/client/model/ModelReturnTest.java
-src/test/java/org/openapitools/client/model/NameTest.java
-src/test/java/org/openapitools/client/model/NullableClassTest.java
-src/test/java/org/openapitools/client/model/NumberOnlyTest.java
-src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
-src/test/java/org/openapitools/client/model/OrderTest.java
-src/test/java/org/openapitools/client/model/OuterCompositeTest.java
-src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
-src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
-src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
-src/test/java/org/openapitools/client/model/OuterEnumTest.java
-src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
-src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
-src/test/java/org/openapitools/client/model/PetTest.java
-src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
-src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
-src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
-src/test/java/org/openapitools/client/model/TagTest.java
-src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
-src/test/java/org/openapitools/client/model/UserTest.java