From 05fcc7a8be155d36b20d43d1793b6d7f22a6d15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Nie=C3=9Fing?= Date: Fri, 28 Apr 2023 21:50:41 +0200 Subject: [PATCH] Remove CXF imports and dependency --- .../resources/Java/libraries/microprofile/api.mustache | 3 --- .../resources/Java/libraries/microprofile/pom.mustache | 7 ------- .../resources/Java/libraries/microprofile/pom_3.0.mustache | 7 ------- .../petstore/java/microprofile-rest-client-3.0/pom.xml | 5 ----- .../src/main/java/org/openapitools/client/api/PetApi.java | 1 - .../main/java/org/openapitools/client/api/StoreApi.java | 1 - .../src/main/java/org/openapitools/client/api/UserApi.java | 1 - .../client/petstore/java/microprofile-rest-client/pom.xml | 5 ----- .../src/main/java/org/openapitools/client/api/PetApi.java | 1 - .../main/java/org/openapitools/client/api/StoreApi.java | 1 - .../src/main/java/org/openapitools/client/api/UserApi.java | 1 - 11 files changed, 33 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 22f38b750abf..e806917d1752 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,6 @@ 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 56d9f8afb027..4679289a4809 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,6 @@ ${smallrye.config.version} test - {{^disableMultipart}} - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - - {{/disableMultipart}} jakarta.json.bind jakarta.json.bind-api 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 f2795bf32bb1..27f4058cc43c 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,6 @@ test - {{^disableMultipart}} - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - - {{/disableMultipart}} jakarta.json.bind jakarta.json.bind-api 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 46ec836840c6..416436f9f53a 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,6 @@ test - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - jakarta.json.bind jakarta.json.bind-api 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 d353688861ca..ee20aac63885 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 @@ -24,7 +24,6 @@ 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 cd94c5b3bca6..b900a6a98ec3 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,6 @@ 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 7f8c13c9e080..9900ed1267e2 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,6 @@ 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 968f176c15f8..1d6d6f7929a2 100644 --- a/samples/client/petstore/java/microprofile-rest-client/pom.xml +++ b/samples/client/petstore/java/microprofile-rest-client/pom.xml @@ -90,11 +90,6 @@ ${smallrye.config.version} test - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - jakarta.json.bind jakarta.json.bind-api 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 fe8f0596df26..632e66ed9d4e 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 @@ -24,7 +24,6 @@ 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 29466ef6c217..85d328a4d3fc 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,6 @@ 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 d1eb41adcb8b..20cee1f3fa81 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,6 @@ 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;