diff --git a/client/integration-tests/gav-source/pom.xml b/client/integration-tests/gav-source/pom.xml deleted file mode 100644 index e1d7f6a0..00000000 --- a/client/integration-tests/gav-source/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - quarkus-openapi-generator-integration-tests - io.quarkiverse.openapi.generator - 3.0.0-lts-SNAPSHOT - - 4.0.0 - - quarkus-openapi-generator-gav-source - Quarkus - OpenAPI Generator - Integration Tests - Client - GAV source - Example project for OpenAPI with GAV source - - - - - org.apache.maven.plugins - maven-install-plugin - - - install-echo1 - - install-file - - package - - quarkus-openapi-generator-gav-source-echo1 - io.quarkiverse.openapi.generator - 3.0.0-SNAPSHOT - src/main/openapi/echo.yaml - yaml - - - - install-echo2 - - install-file - - package - - quarkus-openapi-generator-gav-source-echo2 - io.quarkiverse.openapi.generator - 3.0.0-SNAPSHOT - src/main/openapi/echo.yaml - yaml - - - - install-other - - install-file - - package - - quarkus-openapi-generator-gav-source-other - io.quarkiverse.openapi.generator - 3.0.0-SNAPSHOT - src/main/openapi/echo.yaml - yaml - - - - - - - - \ No newline at end of file diff --git a/client/integration-tests/gav/pom.xml b/client/integration-tests/gav/pom.xml index 90c25266..8d02491a 100644 --- a/client/integration-tests/gav/pom.xml +++ b/client/integration-tests/gav/pom.xml @@ -1,105 +1,73 @@ - - - quarkus-openapi-generator-integration-tests - io.quarkiverse.openapi.generator - 3.0.0-lts-SNAPSHOT - - 4.0.0 + + 4.0.0 + + quarkus-openapi-generator-integration-tests + io.quarkiverse.openapi.generator + 3.0.0-lts-SNAPSHOT + - quarkus-openapi-generator-it-gav - Quarkus - OpenAPI Generator - Integration Tests - Client - GAV - Example project for OpenAPI via GAV coordinates + quarkus-openapi-generator-it-gav + Quarkus - OpenAPI Generator - Integration Tests - Client - GAV + pom - - - io.quarkiverse.openapi.generator - quarkus-openapi-generator - - - - - io.quarkiverse.openapi.generator - quarkus-openapi-generator-gav-source-echo1 - 3.0.0-SNAPSHOT - yaml - - - - io.quarkiverse.openapi.generator - quarkus-openapi-generator-gav-source-echo2 - 3.0.0-SNAPSHOT - yaml - - - org.assertj - assertj-core - test - - - io.quarkus - quarkus-junit5 - test - - - - - - io.quarkus - quarkus-maven-plugin - true - - - - build - generate-code - generate-code-tests - - - - - - - - - native-image - - - native - - - + + 17 + 17 + UTF-8 + ${project.version} + 3.6.1 + + + - - maven-surefire-plugin - - ${native.surefire.skip} - - - - maven-failsafe-plugin - - - - integration-test - verify - + + org.apache.maven.plugins + maven-invoker-plugin + ${version.maven.invoker.plugin} - - ${project.build.directory}/${project.build.finalName}-runner - org.jboss.logmanager.LogManager - ${maven.home} - + src/it + ${project.build.directory}/it-work + ${settings.localRepository} + true + true + true + + ${tested.version} + + ${consume.profile} + + + clean + install + - - - + + + it-01-install-gav-sources + install + run + + + 01-install-gav-sources/pom.xml + + + + + it-02-consume-gav + install + run + + + 02-consume-gav/pom.xml + + + + + - - - native - - - + \ No newline at end of file diff --git a/client/integration-tests/gav/src/it/01-install-gav-sources/pom.xml b/client/integration-tests/gav/src/it/01-install-gav-sources/pom.xml new file mode 100644 index 00000000..4465d6e1 --- /dev/null +++ b/client/integration-tests/gav/src/it/01-install-gav-sources/pom.xml @@ -0,0 +1,66 @@ + + + 4.0.0 + + + io.quarkiverse.openapi.generator.it + install-gav-sources + 1 + pom + + + + 0.0.0-UNSET + + + + + + org.apache.maven.plugins + maven-install-plugin + 3.1.4 + + + install-echo1 + package + install-file + + io.quarkiverse.openapi.generator + quarkus-openapi-generator-gav-source-echo1 + ${tested.version} + ${project.basedir}/src/main/openapi/echo1.yaml + yaml + + + + install-echo2 + package + install-file + + io.quarkiverse.openapi.generator + quarkus-openapi-generator-gav-source-echo2 + ${tested.version} + ${project.basedir}/src/main/openapi/echo2.yaml + yaml + + + + install-other + package + install-file + + io.quarkiverse.openapi.generator + quarkus-openapi-generator-gav-source-other + ${tested.version} + ${project.basedir}/src/main/openapi/other.yaml + yaml + + + + + + + diff --git a/client/integration-tests/gav-source/src/main/openapi/echo.yaml b/client/integration-tests/gav/src/it/01-install-gav-sources/src/main/openapi/echo1.yaml similarity index 100% rename from client/integration-tests/gav-source/src/main/openapi/echo.yaml rename to client/integration-tests/gav/src/it/01-install-gav-sources/src/main/openapi/echo1.yaml diff --git a/client/integration-tests/gav/src/it/01-install-gav-sources/src/main/openapi/echo2.yaml b/client/integration-tests/gav/src/it/01-install-gav-sources/src/main/openapi/echo2.yaml new file mode 100644 index 00000000..f93ea218 --- /dev/null +++ b/client/integration-tests/gav/src/it/01-install-gav-sources/src/main/openapi/echo2.yaml @@ -0,0 +1,34 @@ +openapi: 3.0.3 +info: + title: echo + version: '1.0.0' + description: "" +paths: + /echo: + post: + summary: Echo + operationId: echo + requestBody: + content: + application/json: + schema: + $ref: "#/components/schemas/Message" + responses: + "200": + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/Echo' +components: + schemas: + Echo: + type: object + properties: + echo: + type: string + Message: + type: object + properties: + message: + type: string \ No newline at end of file diff --git a/client/integration-tests/gav/src/it/01-install-gav-sources/src/main/openapi/other.yaml b/client/integration-tests/gav/src/it/01-install-gav-sources/src/main/openapi/other.yaml new file mode 100644 index 00000000..f93ea218 --- /dev/null +++ b/client/integration-tests/gav/src/it/01-install-gav-sources/src/main/openapi/other.yaml @@ -0,0 +1,34 @@ +openapi: 3.0.3 +info: + title: echo + version: '1.0.0' + description: "" +paths: + /echo: + post: + summary: Echo + operationId: echo + requestBody: + content: + application/json: + schema: + $ref: "#/components/schemas/Message" + responses: + "200": + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/Echo' +components: + schemas: + Echo: + type: object + properties: + echo: + type: string + Message: + type: object + properties: + message: + type: string \ No newline at end of file diff --git a/client/integration-tests/gav/src/it/02-consume-gav/invoker.properties b/client/integration-tests/gav/src/it/02-consume-gav/invoker.properties new file mode 100644 index 00000000..b266e3b9 --- /dev/null +++ b/client/integration-tests/gav/src/it/02-consume-gav/invoker.properties @@ -0,0 +1,5 @@ +# Activate the same profile inside the Invoker-run build +invoker.profiles=${consume.profile} + +# Optional: default if the outer build didn't set one +invoker.profiles.default=resteasy-classic \ No newline at end of file diff --git a/client/integration-tests/gav/src/it/02-consume-gav/pom.xml b/client/integration-tests/gav/src/it/02-consume-gav/pom.xml new file mode 100644 index 00000000..08209f30 --- /dev/null +++ b/client/integration-tests/gav/src/it/02-consume-gav/pom.xml @@ -0,0 +1,169 @@ + + + 4.0.0 + + + io.quarkiverse.openapi.generator.it + consume-gav + 1 + Consume GAV (Quarkus test) + + + 17 + io.quarkus.platform + quarkus-bom + 3.20.3 + + + 0.0.0-UNSET + + 3.27.6 + 3.3.1 + 3.8.1 + + + + + + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + + + + + + io.quarkiverse.openapi.generator + quarkus-openapi-generator + ${tested.version} + + + + + io.quarkiverse.openapi.generator + quarkus-openapi-generator-gav-source-echo1 + ${tested.version} + yaml + + + io.quarkiverse.openapi.generator + quarkus-openapi-generator-gav-source-echo2 + ${tested.version} + yaml + + + + + io.quarkus + quarkus-junit5 + test + + + org.assertj + assertj-core + ${version.assertj.core} + test + + + + + + + io.quarkus + quarkus-maven-plugin + ${quarkus.platform.version} + + + + build + generate-code + generate-code-tests + + + + + + + maven-surefire-plugin + ${version.maven.surefire.plugin} + + + + + + + resteasy-classic + + true + + + + io.quarkus + quarkus-resteasy-client-jackson + + + org.jboss.resteasy + resteasy-multipart-provider + + + + + + maven-compiler-plugin + ${version.maven.compiler.plugin} + + + **/*ReactiveTest.java + + + + + maven-surefire-plugin + + resteasy-reactive + + + + + + + resteasy-reactive + + + io.quarkus + quarkus-rest-client-jackson + + + jakarta.validation + jakarta.validation-api + + + + + + maven-compiler-plugin + ${version.maven.compiler.plugin} + + + **/*ClassicTest.java + + + + + maven-surefire-plugin + + resteasy-classic + + + + + + + diff --git a/client/integration-tests/gav/src/main/resources/application.properties b/client/integration-tests/gav/src/it/02-consume-gav/src/main/resources/application.properties similarity index 100% rename from client/integration-tests/gav/src/main/resources/application.properties rename to client/integration-tests/gav/src/it/02-consume-gav/src/main/resources/application.properties diff --git a/client/integration-tests/gav/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusGAVOpenApiTest.java b/client/integration-tests/gav/src/it/02-consume-gav/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusGAVOpenApiTest.java similarity index 100% rename from client/integration-tests/gav/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusGAVOpenApiTest.java rename to client/integration-tests/gav/src/it/02-consume-gav/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusGAVOpenApiTest.java diff --git a/client/integration-tests/pom.xml b/client/integration-tests/pom.xml index 7a8dda1b..af1ad1fb 100644 --- a/client/integration-tests/pom.xml +++ b/client/integration-tests/pom.xml @@ -22,7 +22,6 @@ cookie-authentication custom-templates enum-property - gav-source gav enum-unexpected exclude @@ -76,6 +75,10 @@ resteasy-classic + + + resteasy-classic + true @@ -110,6 +113,10 @@ resteasy-reactive + + + resteasy-reactive + io.quarkus diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc index 659fd370..3e8b8e0d 100644 --- a/docs/modules/ROOT/pages/includes/attributes.adoc +++ b/docs/modules/ROOT/pages/includes/attributes.adoc @@ -1,3 +1,3 @@ -:project-version: 2.12.1-lts +:project-version: 2.13.0-lts :examples-dir: ./../examples/ diff --git a/docs/modules/ROOT/pages/includes/quarkus-openapi-generator.adoc b/docs/modules/ROOT/pages/includes/quarkus-openapi-generator.adoc index 16659c89..f22852d0 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-openapi-generator.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-openapi-generator.adoc @@ -557,7 +557,7 @@ Environment variable: `+++QUARKUS_OPENAPI_GENERATOR_CODEGEN_GAV_SCANNING+++` endif::add-copy-button-to-env-var[] -- |boolean -|`+++true+++` +|`true` a|icon:lock[title=Fixed at build time] [[quarkus-openapi-generator_quarkus-openapi-generator-codegen-template-base-dir]] [.property-path]##link:#quarkus-openapi-generator_quarkus-openapi-generator-codegen-template-base-dir[`quarkus.openapi-generator.codegen.template-base-dir`]## ifdef::add-copy-button-to-config-props[] @@ -662,7 +662,7 @@ Environment variable: `+++QUARKUS_OPENAPI_GENERATOR_CODEGEN_ARTIFACT_ID_FILTER++ endif::add-copy-button-to-env-var[] -- |string -|`+++.*openapi.*+++` +|`.*openapi.*` a|icon:lock[title=Fixed at build time] [[quarkus-openapi-generator_quarkus-openapi-generator-codegen-exclude-gavs]] [.property-path]##link:#quarkus-openapi-generator_quarkus-openapi-generator-codegen-exclude-gavs[`quarkus.openapi-generator.codegen.exclude-gavs`]## ifdef::add-copy-button-to-config-props[] diff --git a/docs/modules/ROOT/pages/includes/quarkus-openapi-generator_quarkus.openapi-generator.adoc b/docs/modules/ROOT/pages/includes/quarkus-openapi-generator_quarkus.openapi-generator.adoc index 16659c89..f22852d0 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-openapi-generator_quarkus.openapi-generator.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-openapi-generator_quarkus.openapi-generator.adoc @@ -557,7 +557,7 @@ Environment variable: `+++QUARKUS_OPENAPI_GENERATOR_CODEGEN_GAV_SCANNING+++` endif::add-copy-button-to-env-var[] -- |boolean -|`+++true+++` +|`true` a|icon:lock[title=Fixed at build time] [[quarkus-openapi-generator_quarkus-openapi-generator-codegen-template-base-dir]] [.property-path]##link:#quarkus-openapi-generator_quarkus-openapi-generator-codegen-template-base-dir[`quarkus.openapi-generator.codegen.template-base-dir`]## ifdef::add-copy-button-to-config-props[] @@ -662,7 +662,7 @@ Environment variable: `+++QUARKUS_OPENAPI_GENERATOR_CODEGEN_ARTIFACT_ID_FILTER++ endif::add-copy-button-to-env-var[] -- |string -|`+++.*openapi.*+++` +|`.*openapi.*` a|icon:lock[title=Fixed at build time] [[quarkus-openapi-generator_quarkus-openapi-generator-codegen-exclude-gavs]] [.property-path]##link:#quarkus-openapi-generator_quarkus-openapi-generator-codegen-exclude-gavs[`quarkus.openapi-generator.codegen.exclude-gavs`]## ifdef::add-copy-button-to-config-props[] diff --git a/pom.xml b/pom.xml index b9b61980..9eb4a7be 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,7 @@ UTF-8 3.20.3 1.2.6.Final + 3.1.4 3.27.1 3.27.6 4.1.2