From d759845a7f6c01d2d9f388387f48dfca6f6ccd01 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 12 Feb 2025 17:52:01 +0800 Subject: [PATCH] update samples --- .../libraries/spring-boot/pom-sb3.mustache | 12 ++++++++---- .../JavaSpring/libraries/spring-boot/pom.mustache | 12 ++++++++---- .../spring-stubs-skip-default-interface/pom.xml | 1 - .../openapi3/client/petstore/spring-stubs/pom.xml | 1 - .../server/petstore/spring-boot-oneof/pom.xml | 1 - .../server/petstore/spring-boot-springdoc/pom.xml | 1 - .../openapi3/server/petstore/springboot-3/pom.xml | 1 - .../server/petstore/springboot-delegate/pom.xml | 1 - .../petstore/springboot-implicitHeaders/pom.xml | 1 - .../server/petstore/springboot-source/pom.xml | 1 - samples/openapi3/server/petstore/springboot/pom.xml | 1 - .../pom.xml | 1 - .../server/petstore/spring-boot-nullable-set/pom.xml | 1 - .../springboot-beanvalidation-no-nullable/pom.xml | 1 - .../petstore/springboot-beanvalidation/pom.xml | 1 - .../server/petstore/springboot-delegate-j8/pom.xml | 1 - .../springboot-delegate-no-response-entity/pom.xml | 1 - samples/server/petstore/springboot-delegate/pom.xml | 1 - .../springboot-file-delegate-optional/pom.xml | 1 - .../pom.xml | 1 - .../petstore/springboot-implicitHeaders/pom.xml | 1 - .../server/petstore/springboot-lombok-data/pom.xml | 1 - .../petstore/springboot-lombok-tostring/pom.xml | 1 - .../springboot-reactive-noResponseEntity/pom.xml | 1 - samples/server/petstore/springboot-reactive/pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../springboot-spring-pageable-without-j8/pom.xml | 1 - .../petstore/springboot-spring-pageable/pom.xml | 1 - .../petstore/springboot-spring-provide-args/pom.xml | 1 - .../server/petstore/springboot-useoptional/pom.xml | 1 - samples/server/petstore/springboot-virtualan/pom.xml | 1 - samples/server/petstore/springboot/pom.xml | 1 - 33 files changed, 16 insertions(+), 39 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache index f1b251a815da..0e23de07570c 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache @@ -58,7 +58,8 @@ src/main/java - {{^interfaceOnly}} + {{^interfaceOnly}} + org.springframework.boot spring-boot-maven-plugin @@ -74,8 +75,10 @@ {{/lombok}} - {{/interfaceOnly}} - {{#interfaceOnly}} + + {{/interfaceOnly}} + {{#interfaceOnly}} + org.apache.maven.plugins maven-source-plugin @@ -86,7 +89,8 @@ - {{/interfaceOnly}} + + {{/interfaceOnly}} {{#apiFirst}} org.openapitools diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache index b9d84091bc9d..2eaf236d2865 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache @@ -51,7 +51,8 @@ src/main/java - {{^interfaceOnly}} + {{^interfaceOnly}} + org.springframework.boot spring-boot-maven-plugin @@ -67,8 +68,10 @@ {{/lombok}} - {{/interfaceOnly}} - {{#interfaceOnly}} + + {{/interfaceOnly}} + {{#interfaceOnly}} + org.apache.maven.plugins maven-source-plugin @@ -79,7 +82,8 @@ - {{/interfaceOnly}} + + {{/interfaceOnly}} {{#apiFirst}} org.openapitools diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml index 9fbce0513655..0c5273b87d7a 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml @@ -22,7 +22,6 @@ src/main/java - org.apache.maven.plugins maven-source-plugin diff --git a/samples/openapi3/client/petstore/spring-stubs/pom.xml b/samples/openapi3/client/petstore/spring-stubs/pom.xml index 9fbce0513655..0c5273b87d7a 100644 --- a/samples/openapi3/client/petstore/spring-stubs/pom.xml +++ b/samples/openapi3/client/petstore/spring-stubs/pom.xml @@ -22,7 +22,6 @@ src/main/java - org.apache.maven.plugins maven-source-plugin diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml b/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml index f492b83a9691..7113913e6ca0 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml +++ b/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml b/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml index 67c48412e174..230983b59c85 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml @@ -27,7 +27,6 @@ - diff --git a/samples/openapi3/server/petstore/springboot-3/pom.xml b/samples/openapi3/server/petstore/springboot-3/pom.xml index 3d20c6390a38..54c3603cbc9d 100644 --- a/samples/openapi3/server/petstore/springboot-3/pom.xml +++ b/samples/openapi3/server/petstore/springboot-3/pom.xml @@ -43,7 +43,6 @@ - diff --git a/samples/openapi3/server/petstore/springboot-delegate/pom.xml b/samples/openapi3/server/petstore/springboot-delegate/pom.xml index fb60a61c9b95..67d552b723dc 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/pom.xml +++ b/samples/openapi3/server/petstore/springboot-delegate/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml b/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml index d7299a0482dc..5b071433c604 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/openapi3/server/petstore/springboot-source/pom.xml b/samples/openapi3/server/petstore/springboot-source/pom.xml index 53d9d81b327e..3f54f4adede8 100644 --- a/samples/openapi3/server/petstore/springboot-source/pom.xml +++ b/samples/openapi3/server/petstore/springboot-source/pom.xml @@ -27,7 +27,6 @@ - diff --git a/samples/openapi3/server/petstore/springboot/pom.xml b/samples/openapi3/server/petstore/springboot/pom.xml index 0919bc8dbd96..d60cccd3ff1f 100644 --- a/samples/openapi3/server/petstore/springboot/pom.xml +++ b/samples/openapi3/server/petstore/springboot/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/pom.xml b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/pom.xml index a871967c2bb2..2e96536c4471 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/pom.xml +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/pom.xml @@ -22,7 +22,6 @@ src/main/java - org.apache.maven.plugins maven-source-plugin diff --git a/samples/server/petstore/spring-boot-nullable-set/pom.xml b/samples/server/petstore/spring-boot-nullable-set/pom.xml index 0d5996f775db..5bbc7407c1e0 100644 --- a/samples/server/petstore/spring-boot-nullable-set/pom.xml +++ b/samples/server/petstore/spring-boot-nullable-set/pom.xml @@ -22,7 +22,6 @@ src/main/java - org.apache.maven.plugins maven-source-plugin diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml b/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml index bdf380a87060..6281f810cd38 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-beanvalidation/pom.xml b/samples/server/petstore/springboot-beanvalidation/pom.xml index 301dfba8efd7..f48622e7ec8d 100644 --- a/samples/server/petstore/springboot-beanvalidation/pom.xml +++ b/samples/server/petstore/springboot-beanvalidation/pom.xml @@ -27,7 +27,6 @@ - diff --git a/samples/server/petstore/springboot-delegate-j8/pom.xml b/samples/server/petstore/springboot-delegate-j8/pom.xml index 692bbb2b9b71..92bfa2cb5cbb 100644 --- a/samples/server/petstore/springboot-delegate-j8/pom.xml +++ b/samples/server/petstore/springboot-delegate-j8/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml b/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml index cdbb8636eeb9..461339353f4b 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml +++ b/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-delegate/pom.xml b/samples/server/petstore/springboot-delegate/pom.xml index 38d2b4da909f..726f5f2dae84 100644 --- a/samples/server/petstore/springboot-delegate/pom.xml +++ b/samples/server/petstore/springboot-delegate/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-file-delegate-optional/pom.xml b/samples/server/petstore/springboot-file-delegate-optional/pom.xml index 41c63ba68113..9ac3410785c2 100644 --- a/samples/server/petstore/springboot-file-delegate-optional/pom.xml +++ b/samples/server/petstore/springboot-file-delegate-optional/pom.xml @@ -43,7 +43,6 @@ - diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml index 5e27d9762d07..687700115869 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml @@ -26,7 +26,6 @@ - diff --git a/samples/server/petstore/springboot-implicitHeaders/pom.xml b/samples/server/petstore/springboot-implicitHeaders/pom.xml index 954d4535a06d..d1c4c8d6452d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/pom.xml +++ b/samples/server/petstore/springboot-implicitHeaders/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-lombok-data/pom.xml b/samples/server/petstore/springboot-lombok-data/pom.xml index 0cdbf58237db..16d607dab7b1 100644 --- a/samples/server/petstore/springboot-lombok-data/pom.xml +++ b/samples/server/petstore/springboot-lombok-data/pom.xml @@ -34,7 +34,6 @@ - diff --git a/samples/server/petstore/springboot-lombok-tostring/pom.xml b/samples/server/petstore/springboot-lombok-tostring/pom.xml index d2714a2b7939..0b079a60154c 100644 --- a/samples/server/petstore/springboot-lombok-tostring/pom.xml +++ b/samples/server/petstore/springboot-lombok-tostring/pom.xml @@ -49,7 +49,6 @@ - diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml b/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml index fedfec8d3829..d445bc501aa8 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-reactive/pom.xml b/samples/server/petstore/springboot-reactive/pom.xml index c2864360a1eb..586a1099ee64 100644 --- a/samples/server/petstore/springboot-reactive/pom.xml +++ b/samples/server/petstore/springboot-reactive/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml index 2fe45d72699f..814077ac4e1a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml b/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml index e0fd8e70efa0..6623444ffa31 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml b/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml index 9986c18906af..b518d1dee9f2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-spring-pageable/pom.xml b/samples/server/petstore/springboot-spring-pageable/pom.xml index 585c369fb58c..fed9f1d12e18 100644 --- a/samples/server/petstore/springboot-spring-pageable/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-spring-provide-args/pom.xml b/samples/server/petstore/springboot-spring-provide-args/pom.xml index ed49ebfecf09..4057470ce3f1 100644 --- a/samples/server/petstore/springboot-spring-provide-args/pom.xml +++ b/samples/server/petstore/springboot-spring-provide-args/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-useoptional/pom.xml b/samples/server/petstore/springboot-useoptional/pom.xml index 6b7fd27c6185..f46331493248 100644 --- a/samples/server/petstore/springboot-useoptional/pom.xml +++ b/samples/server/petstore/springboot-useoptional/pom.xml @@ -28,7 +28,6 @@ - diff --git a/samples/server/petstore/springboot-virtualan/pom.xml b/samples/server/petstore/springboot-virtualan/pom.xml index 214efbb92284..36bdd555a285 100644 --- a/samples/server/petstore/springboot-virtualan/pom.xml +++ b/samples/server/petstore/springboot-virtualan/pom.xml @@ -29,7 +29,6 @@ - diff --git a/samples/server/petstore/springboot/pom.xml b/samples/server/petstore/springboot/pom.xml index 187c7b784f3b..dcce5e10d79f 100644 --- a/samples/server/petstore/springboot/pom.xml +++ b/samples/server/petstore/springboot/pom.xml @@ -28,7 +28,6 @@ -