From 512022706309a0de6925c9a9ef5fd10a067e8ae9 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Mon, 5 Aug 2019 16:53:59 +0200 Subject: [PATCH 1/2] External Parent POM for third party extensions --- core/builder/pom.xml | 2 +- core/creator/pom.xml | 2 +- core/devmode/pom.xml | 2 +- core/pom.xml | 2 +- devtools/aesh/pom.xml | 2 +- devtools/extension-plugin/pom.xml | 2 +- devtools/gradle/pom.xml | 2 +- devtools/maven/pom.xml | 2 +- devtools/pom.xml | 2 +- docs/pom.xml | 2 +- extensions/agroal/pom.xml | 2 +- extensions/amazon-dynamodb/pom.xml | 2 +- extensions/amazon-lambda-resteasy/pom.xml | 2 +- extensions/amazon-lambda/pom.xml | 2 +- extensions/arc/pom.xml | 2 +- extensions/caffeine/pom.xml | 2 +- extensions/elasticsearch-rest-client/pom.xml | 2 +- extensions/elytron-security-oauth2/pom.xml | 2 +- extensions/elytron-security/pom.xml | 2 +- extensions/flyway/pom.xml | 2 +- extensions/hibernate-orm/pom.xml | 2 +- .../hibernate-search-elasticsearch/pom.xml | 2 +- extensions/hibernate-validator/pom.xml | 2 +- extensions/infinispan-client/pom.xml | 2 +- extensions/jackson/pom.xml | 2 +- extensions/jaeger/pom.xml | 2 +- extensions/jaxb/pom.xml | 2 +- extensions/jdbc/pom.xml | 2 +- extensions/jsonb/pom.xml | 2 +- extensions/jsonp/pom.xml | 2 +- extensions/kafka-client/pom.xml | 2 +- extensions/kafka-streams/pom.xml | 2 +- extensions/keycloak/pom.xml | 2 +- extensions/kogito/pom.xml | 2 +- extensions/kotlin/pom.xml | 2 +- extensions/kubernetes-client/pom.xml | 2 +- extensions/kubernetes/pom.xml | 2 +- extensions/mailer/pom.xml | 2 +- extensions/mongodb-client/pom.xml | 2 +- extensions/narayana-jta/pom.xml | 2 +- extensions/neo4j/pom.xml | 2 +- extensions/netty/pom.xml | 2 +- .../panache/hibernate-orm-panache/pom.xml | 2 +- extensions/panache/panache-common/pom.xml | 2 +- extensions/panache/pom.xml | 2 +- extensions/pom.xml | 2 +- extensions/reactive-pg-client/pom.xml | 2 +- extensions/reactive-streams-operators/pom.xml | 2 +- .../pom.xml | 2 +- .../smallrye-reactive-type-converters/pom.xml | 2 +- extensions/rest-client/pom.xml | 2 +- extensions/resteasy-common/pom.xml | 2 +- extensions/resteasy-jackson/pom.xml | 2 +- extensions/resteasy-jsonb/pom.xml | 2 +- extensions/resteasy-server-common/pom.xml | 2 +- extensions/resteasy/pom.xml | 2 +- extensions/scheduler/pom.xml | 2 +- .../smallrye-context-propagation/pom.xml | 2 +- extensions/smallrye-fault-tolerance/pom.xml | 2 +- extensions/smallrye-health/pom.xml | 2 +- extensions/smallrye-jwt/pom.xml | 2 +- extensions/smallrye-metrics/pom.xml | 2 +- extensions/smallrye-openapi-common/pom.xml | 2 +- extensions/smallrye-openapi/pom.xml | 2 +- extensions/smallrye-opentracing/pom.xml | 2 +- .../smallrye-reactive-messaging-amqp/pom.xml | 2 +- .../smallrye-reactive-messaging-kafka/pom.xml | 2 +- .../smallrye-reactive-messaging-mqtt/pom.xml | 2 +- .../smallrye-reactive-messaging/pom.xml | 2 +- extensions/spring-di/pom.xml | 2 +- extensions/swagger-ui/pom.xml | 2 +- extensions/tika/pom.xml | 2 +- extensions/undertow-websockets/pom.xml | 2 +- extensions/undertow/pom.xml | 2 +- extensions/vertx-web/pom.xml | 2 +- extensions/vertx/pom.xml | 2 +- integration-tests/pom.xml | 2 +- .../build-parent}/pom.xml | 110 +------------- parents/external-parent/pom.xml | 134 ++++++++++++++++++ pom.xml | 3 +- tcks/pom.xml | 2 +- test-framework/pom.xml | 2 +- war-launcher/pom.xml | 2 +- 83 files changed, 218 insertions(+), 189 deletions(-) rename {build-parent => parents/build-parent}/pom.xml (77%) create mode 100644 parents/external-parent/pom.xml diff --git a/core/builder/pom.xml b/core/builder/pom.xml index 6d814b4769451..e0bd1c9149d03 100644 --- a/core/builder/pom.xml +++ b/core/builder/pom.xml @@ -11,7 +11,7 @@ io.quarkus quarkus-build-parent 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml diff --git a/core/creator/pom.xml b/core/creator/pom.xml index 2ae2f151d3af1..7f3250d052e26 100644 --- a/core/creator/pom.xml +++ b/core/creator/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/core/devmode/pom.xml b/core/devmode/pom.xml index 028c2dcd12333..328057459e8b8 100644 --- a/core/devmode/pom.xml +++ b/core/devmode/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index ae8a9896c860a..c579f157d2998 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../build-parent/pom.xml + ../parents/build-parent/pom.xml 4.0.0 diff --git a/devtools/aesh/pom.xml b/devtools/aesh/pom.xml index 736112516bfc9..f9b4b09875b1e 100644 --- a/devtools/aesh/pom.xml +++ b/devtools/aesh/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/devtools/extension-plugin/pom.xml b/devtools/extension-plugin/pom.xml index 0e443394ba638..2f7d274514aee 100644 --- a/devtools/extension-plugin/pom.xml +++ b/devtools/extension-plugin/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/devtools/gradle/pom.xml b/devtools/gradle/pom.xml index 1df642a698a1f..89daacc3d62ce 100644 --- a/devtools/gradle/pom.xml +++ b/devtools/gradle/pom.xml @@ -5,7 +5,7 @@ io.quarkus quarkus-build-parent 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/devtools/maven/pom.xml b/devtools/maven/pom.xml index 8b530061700b9..615b610c0a11e 100644 --- a/devtools/maven/pom.xml +++ b/devtools/maven/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/devtools/pom.xml b/devtools/pom.xml index b7f2d0a304722..235b5b528c649 100644 --- a/devtools/pom.xml +++ b/devtools/pom.xml @@ -8,7 +8,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../build-parent/pom.xml + ../parents/build-parent/pom.xml quarkus-devtools-all diff --git a/docs/pom.xml b/docs/pom.xml index 6269a98c8fcb2..23be203d86ffe 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ io.quarkus quarkus-build-parent 999-SNAPSHOT - ../build-parent/pom.xml + ../parents/build-parent/pom.xml quarkus-documentation diff --git a/extensions/agroal/pom.xml b/extensions/agroal/pom.xml index 47b4f6984e30d..d84ea50e6392a 100644 --- a/extensions/agroal/pom.xml +++ b/extensions/agroal/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/amazon-dynamodb/pom.xml b/extensions/amazon-dynamodb/pom.xml index 503fe86a7cd5d..8fecf539afece 100644 --- a/extensions/amazon-dynamodb/pom.xml +++ b/extensions/amazon-dynamodb/pom.xml @@ -8,7 +8,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml quarkus-amazon-dynamodb-parent diff --git a/extensions/amazon-lambda-resteasy/pom.xml b/extensions/amazon-lambda-resteasy/pom.xml index fd8f6b852bf31..82db1e65dd794 100644 --- a/extensions/amazon-lambda-resteasy/pom.xml +++ b/extensions/amazon-lambda-resteasy/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/amazon-lambda/pom.xml b/extensions/amazon-lambda/pom.xml index 506ae48a9b6db..c5c7b3e9c67ed 100644 --- a/extensions/amazon-lambda/pom.xml +++ b/extensions/amazon-lambda/pom.xml @@ -8,7 +8,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml quarkus-amazon-lambda-parent diff --git a/extensions/arc/pom.xml b/extensions/arc/pom.xml index c4f0708fb8b7f..215aa87b8fcbf 100644 --- a/extensions/arc/pom.xml +++ b/extensions/arc/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/caffeine/pom.xml b/extensions/caffeine/pom.xml index 9c308239e0512..2d85aea081d86 100644 --- a/extensions/caffeine/pom.xml +++ b/extensions/caffeine/pom.xml @@ -7,7 +7,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/elasticsearch-rest-client/pom.xml b/extensions/elasticsearch-rest-client/pom.xml index 6fecd9de4e686..8504332a52ee6 100644 --- a/extensions/elasticsearch-rest-client/pom.xml +++ b/extensions/elasticsearch-rest-client/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/elytron-security-oauth2/pom.xml b/extensions/elytron-security-oauth2/pom.xml index 8db2a0bfd1fa7..b19a4834a9b49 100644 --- a/extensions/elytron-security-oauth2/pom.xml +++ b/extensions/elytron-security-oauth2/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/elytron-security/pom.xml b/extensions/elytron-security/pom.xml index 91bd24f698a15..7069b2c9b90e6 100644 --- a/extensions/elytron-security/pom.xml +++ b/extensions/elytron-security/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/flyway/pom.xml b/extensions/flyway/pom.xml index a17086ab33233..a2faebbf02115 100644 --- a/extensions/flyway/pom.xml +++ b/extensions/flyway/pom.xml @@ -7,7 +7,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/hibernate-orm/pom.xml b/extensions/hibernate-orm/pom.xml index b16510865df97..cb078bbd3a09b 100644 --- a/extensions/hibernate-orm/pom.xml +++ b/extensions/hibernate-orm/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/hibernate-search-elasticsearch/pom.xml b/extensions/hibernate-search-elasticsearch/pom.xml index f4a6c64ba845c..e2b2cd23e9713 100644 --- a/extensions/hibernate-search-elasticsearch/pom.xml +++ b/extensions/hibernate-search-elasticsearch/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/hibernate-validator/pom.xml b/extensions/hibernate-validator/pom.xml index ac09fbf8bcd04..f53cd563f8360 100644 --- a/extensions/hibernate-validator/pom.xml +++ b/extensions/hibernate-validator/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/infinispan-client/pom.xml b/extensions/infinispan-client/pom.xml index d71ee32a176df..62d58f16a359f 100644 --- a/extensions/infinispan-client/pom.xml +++ b/extensions/infinispan-client/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/jackson/pom.xml b/extensions/jackson/pom.xml index 9dcdb39d5610a..898050341a1ff 100644 --- a/extensions/jackson/pom.xml +++ b/extensions/jackson/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/jaeger/pom.xml b/extensions/jaeger/pom.xml index 5a380a4eb89a1..9c4af51979b9a 100644 --- a/extensions/jaeger/pom.xml +++ b/extensions/jaeger/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/jaxb/pom.xml b/extensions/jaxb/pom.xml index 12968c9dc2735..df9dde92b504d 100644 --- a/extensions/jaxb/pom.xml +++ b/extensions/jaxb/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/jdbc/pom.xml b/extensions/jdbc/pom.xml index eae3c292a25e8..9dc16440e96f8 100644 --- a/extensions/jdbc/pom.xml +++ b/extensions/jdbc/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/jsonb/pom.xml b/extensions/jsonb/pom.xml index b7d000623493d..0932168c1a454 100644 --- a/extensions/jsonb/pom.xml +++ b/extensions/jsonb/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/jsonp/pom.xml b/extensions/jsonp/pom.xml index 7674aac523727..fad05eda1c013 100644 --- a/extensions/jsonp/pom.xml +++ b/extensions/jsonp/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/kafka-client/pom.xml b/extensions/kafka-client/pom.xml index e7b50f2d26624..ea083feed51b7 100644 --- a/extensions/kafka-client/pom.xml +++ b/extensions/kafka-client/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/kafka-streams/pom.xml b/extensions/kafka-streams/pom.xml index 5231530da6bfa..4d13c0baddba3 100644 --- a/extensions/kafka-streams/pom.xml +++ b/extensions/kafka-streams/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/keycloak/pom.xml b/extensions/keycloak/pom.xml index cd4685d3c9185..cd1853b5c9085 100644 --- a/extensions/keycloak/pom.xml +++ b/extensions/keycloak/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/kogito/pom.xml b/extensions/kogito/pom.xml index c58203f56b688..84a0ec22bfd1a 100644 --- a/extensions/kogito/pom.xml +++ b/extensions/kogito/pom.xml @@ -7,7 +7,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/kotlin/pom.xml b/extensions/kotlin/pom.xml index f7dd4f53d308a..ba837ab7bcb0b 100644 --- a/extensions/kotlin/pom.xml +++ b/extensions/kotlin/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/kubernetes-client/pom.xml b/extensions/kubernetes-client/pom.xml index b1758dcf79cb5..85d74b25ea4c6 100644 --- a/extensions/kubernetes-client/pom.xml +++ b/extensions/kubernetes-client/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/kubernetes/pom.xml b/extensions/kubernetes/pom.xml index e81d6c685bc42..7d62f6de40d38 100644 --- a/extensions/kubernetes/pom.xml +++ b/extensions/kubernetes/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/mailer/pom.xml b/extensions/mailer/pom.xml index de5b3ac479566..f9b18a8a6226b 100644 --- a/extensions/mailer/pom.xml +++ b/extensions/mailer/pom.xml @@ -8,7 +8,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml quarkus-mailer-parent diff --git a/extensions/mongodb-client/pom.xml b/extensions/mongodb-client/pom.xml index e88210a9c5d2c..86b3cc774c8d7 100644 --- a/extensions/mongodb-client/pom.xml +++ b/extensions/mongodb-client/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/narayana-jta/pom.xml b/extensions/narayana-jta/pom.xml index 542cec5b810d7..0a28e6f53f10c 100644 --- a/extensions/narayana-jta/pom.xml +++ b/extensions/narayana-jta/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/neo4j/pom.xml b/extensions/neo4j/pom.xml index 9b0d13574fa5f..ebfbfc7247202 100644 --- a/extensions/neo4j/pom.xml +++ b/extensions/neo4j/pom.xml @@ -7,7 +7,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/netty/pom.xml b/extensions/netty/pom.xml index 95c392513ecb7..59d24d678ed0a 100644 --- a/extensions/netty/pom.xml +++ b/extensions/netty/pom.xml @@ -7,7 +7,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/panache/hibernate-orm-panache/pom.xml b/extensions/panache/hibernate-orm-panache/pom.xml index c6114f9eb19d6..80a521d6d627d 100644 --- a/extensions/panache/hibernate-orm-panache/pom.xml +++ b/extensions/panache/hibernate-orm-panache/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../../build-parent/pom.xml + ../../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/panache/panache-common/pom.xml b/extensions/panache/panache-common/pom.xml index dd2879dde6094..5f020ae7699a6 100644 --- a/extensions/panache/panache-common/pom.xml +++ b/extensions/panache/panache-common/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../../build-parent/pom.xml + ../../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/panache/pom.xml b/extensions/panache/pom.xml index c0ec7615555b0..b47c695b4f80f 100644 --- a/extensions/panache/pom.xml +++ b/extensions/panache/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/pom.xml b/extensions/pom.xml index 00027e211a916..70f3c7eafa01d 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../build-parent/pom.xml + ../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/reactive-pg-client/pom.xml b/extensions/reactive-pg-client/pom.xml index 99304de005a25..58ab270b65add 100644 --- a/extensions/reactive-pg-client/pom.xml +++ b/extensions/reactive-pg-client/pom.xml @@ -8,7 +8,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml quarkus-reactive-pg-client-parent diff --git a/extensions/reactive-streams-operators/pom.xml b/extensions/reactive-streams-operators/pom.xml index 9437a26db5b34..c792fbbe2fb93 100644 --- a/extensions/reactive-streams-operators/pom.xml +++ b/extensions/reactive-streams-operators/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml index 4cf762e8bb71e..7e350d96434f5 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml +++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../../build-parent/pom.xml + ../../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml index eb90341d1ea15..e7c1bf3bd2e7b 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml +++ b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml @@ -8,7 +8,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../../build-parent/pom.xml + ../../../parents/build-parent/pom.xml quarkus-smallrye-reactive-type-converters-parent diff --git a/extensions/rest-client/pom.xml b/extensions/rest-client/pom.xml index dae231a4d4040..0d02638955982 100644 --- a/extensions/rest-client/pom.xml +++ b/extensions/rest-client/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/resteasy-common/pom.xml b/extensions/resteasy-common/pom.xml index 71a0e1387611d..a87979a6b3a9c 100644 --- a/extensions/resteasy-common/pom.xml +++ b/extensions/resteasy-common/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/resteasy-jackson/pom.xml b/extensions/resteasy-jackson/pom.xml index 767f69cc4df9d..8944fc3b7feb8 100644 --- a/extensions/resteasy-jackson/pom.xml +++ b/extensions/resteasy-jackson/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/resteasy-jsonb/pom.xml b/extensions/resteasy-jsonb/pom.xml index 35cca798cdd0c..f7ee5864f5e62 100644 --- a/extensions/resteasy-jsonb/pom.xml +++ b/extensions/resteasy-jsonb/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/resteasy-server-common/pom.xml b/extensions/resteasy-server-common/pom.xml index 314f69b74a29c..b7c1f303bb46f 100644 --- a/extensions/resteasy-server-common/pom.xml +++ b/extensions/resteasy-server-common/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/resteasy/pom.xml b/extensions/resteasy/pom.xml index 05d24dee59732..1cf23110b08ab 100644 --- a/extensions/resteasy/pom.xml +++ b/extensions/resteasy/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/scheduler/pom.xml b/extensions/scheduler/pom.xml index fb8625d4589da..47f364120f25b 100644 --- a/extensions/scheduler/pom.xml +++ b/extensions/scheduler/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-context-propagation/pom.xml b/extensions/smallrye-context-propagation/pom.xml index c58aab34b3a60..53646d8c798e9 100644 --- a/extensions/smallrye-context-propagation/pom.xml +++ b/extensions/smallrye-context-propagation/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-fault-tolerance/pom.xml b/extensions/smallrye-fault-tolerance/pom.xml index 04cf5441f381a..a974c9f664e79 100644 --- a/extensions/smallrye-fault-tolerance/pom.xml +++ b/extensions/smallrye-fault-tolerance/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-health/pom.xml b/extensions/smallrye-health/pom.xml index 80772bfd8280b..0957824fd0eb0 100644 --- a/extensions/smallrye-health/pom.xml +++ b/extensions/smallrye-health/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-jwt/pom.xml b/extensions/smallrye-jwt/pom.xml index 9353874592802..c4ace0b81ccdf 100644 --- a/extensions/smallrye-jwt/pom.xml +++ b/extensions/smallrye-jwt/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-metrics/pom.xml b/extensions/smallrye-metrics/pom.xml index 09b808a71ddfc..4ec9517bf5db3 100644 --- a/extensions/smallrye-metrics/pom.xml +++ b/extensions/smallrye-metrics/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-openapi-common/pom.xml b/extensions/smallrye-openapi-common/pom.xml index a7f8a2d52120e..8edb03426add3 100644 --- a/extensions/smallrye-openapi-common/pom.xml +++ b/extensions/smallrye-openapi-common/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-openapi/pom.xml b/extensions/smallrye-openapi/pom.xml index f49b798247ca3..95ba32cf14a05 100644 --- a/extensions/smallrye-openapi/pom.xml +++ b/extensions/smallrye-openapi/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-opentracing/pom.xml b/extensions/smallrye-opentracing/pom.xml index 97b1025357d86..f1cd206701f99 100644 --- a/extensions/smallrye-opentracing/pom.xml +++ b/extensions/smallrye-opentracing/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-reactive-messaging-amqp/pom.xml b/extensions/smallrye-reactive-messaging-amqp/pom.xml index 3f896bde6b1ed..a2e4c8a74e92c 100644 --- a/extensions/smallrye-reactive-messaging-amqp/pom.xml +++ b/extensions/smallrye-reactive-messaging-amqp/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-reactive-messaging-kafka/pom.xml b/extensions/smallrye-reactive-messaging-kafka/pom.xml index 2c3967f8eee84..b70f4e362dc85 100644 --- a/extensions/smallrye-reactive-messaging-kafka/pom.xml +++ b/extensions/smallrye-reactive-messaging-kafka/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-reactive-messaging-mqtt/pom.xml b/extensions/smallrye-reactive-messaging-mqtt/pom.xml index 8cd21f85308e6..4d7606559c084 100644 --- a/extensions/smallrye-reactive-messaging-mqtt/pom.xml +++ b/extensions/smallrye-reactive-messaging-mqtt/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/smallrye-reactive-messaging/pom.xml b/extensions/smallrye-reactive-messaging/pom.xml index 0a7dd67b4bcfb..1108e1c0ccfaa 100644 --- a/extensions/smallrye-reactive-messaging/pom.xml +++ b/extensions/smallrye-reactive-messaging/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/spring-di/pom.xml b/extensions/spring-di/pom.xml index b0e9d4fab6e23..0c74b5925033f 100644 --- a/extensions/spring-di/pom.xml +++ b/extensions/spring-di/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/swagger-ui/pom.xml b/extensions/swagger-ui/pom.xml index 90abfcf33b60c..a151f9416793c 100644 --- a/extensions/swagger-ui/pom.xml +++ b/extensions/swagger-ui/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/tika/pom.xml b/extensions/tika/pom.xml index 6df77ea5976a6..866f759390e02 100644 --- a/extensions/tika/pom.xml +++ b/extensions/tika/pom.xml @@ -22,7 +22,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/undertow-websockets/pom.xml b/extensions/undertow-websockets/pom.xml index 2f24d50e342a4..f2020dccb03fb 100644 --- a/extensions/undertow-websockets/pom.xml +++ b/extensions/undertow-websockets/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/undertow/pom.xml b/extensions/undertow/pom.xml index dd69eff0cd85e..0048d609729a2 100644 --- a/extensions/undertow/pom.xml +++ b/extensions/undertow/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/vertx-web/pom.xml b/extensions/vertx-web/pom.xml index 7f1634349eeff..aa7b36a46541d 100644 --- a/extensions/vertx-web/pom.xml +++ b/extensions/vertx-web/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/extensions/vertx/pom.xml b/extensions/vertx/pom.xml index de795aa5d2937..aeb06229f7279 100644 --- a/extensions/vertx/pom.xml +++ b/extensions/vertx/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../../build-parent/pom.xml + ../../parents/build-parent/pom.xml 4.0.0 diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 88bbc0b985282..69191da868b02 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../build-parent/pom.xml + ../parents/build-parent/pom.xml 4.0.0 diff --git a/build-parent/pom.xml b/parents/build-parent/pom.xml similarity index 77% rename from build-parent/pom.xml rename to parents/build-parent/pom.xml index 9bab3611993d1..6cbf67c84d3cd 100644 --- a/build-parent/pom.xml +++ b/parents/build-parent/pom.xml @@ -3,9 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - quarkus-parent + quarkus-external-parent io.quarkus 999-SNAPSHOT + ../external-parent/pom.xml 4.0.0 @@ -39,11 +40,6 @@ jdt_apt - - [3.5.3,) - 3.6.1 0.7.6 @@ -106,82 +102,6 @@ - - maven-surefire-plugin - - - org.jboss.logmanager.LogManager - - - - - ${project.groupId} - quarkus-maven-plugin - ${project.version} - - - io.quarkus - quarkus-bootstrap-maven-plugin - ${project.version} - - - - extension-descriptor - - compile - - ${project.groupId}:${project.artifactId}-deployment:${project.version} - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce - - - - - ${supported-maven-versions} - - - - - org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec - - org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec - - - org.jboss.logging:jboss-logmanager - - javax:javaee-api - - org.wildfly.client:wildfly-client-config - - javax.activation:javax-activation-api - javax.activation:activation - org.jboss.marshalling:jboss-marshalling-osgi - org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec - - javax.json:javax.json-api - - org.glassfish:jakarta.json - jakarta.json.bind:jakarta.json.bind-api - jakarta.json:jakarta.json-api - - - - - - enforce - - - - io.fabric8 docker-maven-plugin @@ -195,11 +115,6 @@ package - - org.jboss.jandex - jandex-maven-plugin - 1.0.6 - net.revelc.code.formatter formatter-maven-plugin @@ -225,10 +140,6 @@ maven-resources-plugin 1.5.3 - - maven-resources-plugin - 3.1.0 - com.github.alexcojocaru elasticsearch-maven-plugin @@ -242,23 +153,6 @@ - - jdk-8-classpath - - [9, - - - - - maven-compiler-plugin - - 8 - - - - - - format diff --git a/parents/external-parent/pom.xml b/parents/external-parent/pom.xml new file mode 100644 index 0000000000000..eabbed164c8aa --- /dev/null +++ b/parents/external-parent/pom.xml @@ -0,0 +1,134 @@ + + + + quarkus-parent + io.quarkus + 999-SNAPSHOT + ../../pom.xml + + 4.0.0 + + quarkus-external-parent + Quarkus - External Parent + A parent POM for third party extension projects + pom + + + + + 999-SNAPSHOT + + + [3.5.3,) + + + + + + + + maven-surefire-plugin + + + org.jboss.logmanager.LogManager + + + + + io.quarkus + quarkus-maven-plugin + ${quarkus.version} + + + io.quarkus + quarkus-bootstrap-maven-plugin + ${quarkus.version} + + + + extension-descriptor + + compile + + ${project.groupId}:${project.artifactId}-deployment:${project.version} + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce + + + + + ${supported-maven-versions} + + + + + org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec + + org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec + + + org.jboss.logging:jboss-logmanager + + javax:javaee-api + + org.wildfly.client:wildfly-client-config + + javax.activation:javax-activation-api + javax.activation:activation + org.jboss.marshalling:jboss-marshalling-osgi + org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec + + javax.json:javax.json-api + + org.glassfish:jakarta.json + jakarta.json.bind:jakarta.json.bind-api + jakarta.json:jakarta.json-api + + + + + + enforce + + + + + + org.jboss.jandex + jandex-maven-plugin + 1.0.6 + + + + + + + + jdk-8-classpath + + [9, + + + + + maven-compiler-plugin + + 8 + + + + + + + diff --git a/pom.xml b/pom.xml index 09fc291d27a0d..420c2ef13f643 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,8 @@ bom/runtime bom/deployment - build-parent + parents/external-parent + parents/build-parent core diff --git a/tcks/pom.xml b/tcks/pom.xml index 7f2924baeae05..99a716302853a 100644 --- a/tcks/pom.xml +++ b/tcks/pom.xml @@ -5,7 +5,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../build-parent/pom.xml + ../parents/build-parent/pom.xml 4.0.0 diff --git a/test-framework/pom.xml b/test-framework/pom.xml index cb4847b845fd3..1b5323497bb0a 100644 --- a/test-framework/pom.xml +++ b/test-framework/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../build-parent/pom.xml + ../parents/build-parent/pom.xml 4.0.0 diff --git a/war-launcher/pom.xml b/war-launcher/pom.xml index 001ae339ba9b1..d171d70f05403 100644 --- a/war-launcher/pom.xml +++ b/war-launcher/pom.xml @@ -6,7 +6,7 @@ quarkus-build-parent io.quarkus 999-SNAPSHOT - ../build-parent/pom.xml + ../parents/build-parent/pom.xml 4.0.0 From c508b44bfebc1d7f2a1015bccccc7eecb0dd509e Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Mon, 5 Aug 2019 18:34:50 +0200 Subject: [PATCH 2/2] Fix #3321 create-extension Maven mojo should allow creating from scratch --- devtools/maven/pom.xml | 22 +- .../io/quarkus/maven/CreateExtensionMojo.java | 224 +++++++++++------- .../deployment-pom.xml | 16 +- .../create-extension-templates/parent-pom.xml | 20 +- .../runtime-pom.xml | 2 +- .../maven/CreateExtensionMojoTest.java | 32 ++- .../minimal-extension/deployment/pom.xml | 6 +- .../minimal-extension/runtime/pom.xml | 6 +- .../boms/deployment/pom.xml | 2 +- .../boms/runtime/pom.xml | 2 +- .../with-grand-parent/deployment/pom.xml | 2 +- .../with-grand-parent/runtime/pom.xml | 2 +- .../single-ext/deployment/pom.xml | 57 +++++ .../ext/deployment/SingleExtProcessor.java | 15 ++ .../single-from-scratch/single-ext/pom.xml | 37 +++ .../single-ext/runtime/pom.xml | 37 +++ 16 files changed, 373 insertions(+), 109 deletions(-) create mode 100644 devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/deployment/pom.xml create mode 100644 devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/deployment/src/main/java/io/quarkus/example/single/ext/deployment/SingleExtProcessor.java create mode 100644 devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/pom.xml create mode 100644 devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/runtime/pom.xml diff --git a/devtools/maven/pom.xml b/devtools/maven/pom.xml index 615b610c0a11e..eb33f671fa352 100644 --- a/devtools/maven/pom.xml +++ b/devtools/maven/pom.xml @@ -164,16 +164,12 @@ - - - src/main/resources + + + src/test/resources true - - - src/main/templates - false - - + + org.codehaus.plexus @@ -254,6 +250,14 @@ + + + org.apache.maven.plugins + maven-resources-plugin + + @@ + + diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java index 1060819183016..58a4d939e75ee 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java @@ -35,6 +35,7 @@ import freemarker.template.Template; import freemarker.template.TemplateException; import freemarker.template.TemplateExceptionHandler; +import io.quarkus.maven.utilities.MojoUtils; import io.quarkus.maven.utilities.PomTransformer; import io.quarkus.maven.utilities.PomTransformer.Transformation; @@ -74,8 +75,9 @@ public class CreateExtensionMojo extends AbstractMojo { Path basedir; /** - * The {@code groupId} for the newly created Maven modules. If {@code groupId} is left unset, the {@code groupId} - * from the {@code pom.xml} in the current directory will be used. Otherwise, an exception is thrown. + * The {@code groupId} for the newly created Maven modules. If {@code groupId} is left unspecified, the + * {@code groupId} from the {@code pom.xml} (if present) in the current directory will be used. Otherwise, an + * exception is thrown. * * @since 0.20.0 */ @@ -118,8 +120,9 @@ public class CreateExtensionMojo extends AbstractMojo { String artifactIdBase; /** - * The {@code version} for the newly created Maven modules. If {@code version} is left unset, the {@code version} - * from the {@code pom.xml} in the current directory will be used. Otherwise, an exception is thrown. + * The {@code version} for the newly created Maven modules. If {@code version} is left unspecified, the + * {@code version} from the {@code pom.xml} (if present) in the current directory will be used. Otherwise, an + * exception is thrown. * * @since 0.20.0 */ @@ -200,8 +203,9 @@ public class CreateExtensionMojo extends AbstractMojo { /** * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the - * Parent module. If {@code grandParentArtifactId} is left unset, the {@code artifactId} from the {@code pom.xml} in - * the current directory will be used. Otherwise, an exception is thrown. + * Parent module. If {@code grandParentArtifactId} is left unspecified and {@link #basedir} contains a + * {@code pom.xml} file, the {@code artifactId} from that {@code pom.xml} will be used. Otherwise, + * {@code quarkus-external-parent} will be used. * * @since 0.20.0 */ @@ -210,8 +214,9 @@ public class CreateExtensionMojo extends AbstractMojo { /** * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the - * Parent module. If {@code grandParentGroupId} is left unset, the {@code groupId} from the {@code pom.xml} in the - * current directory will be used. Otherwise, an exception is thrown. + * Parent module. If {@code grandParentGroupId} is left unspecified and {@link #basedir} contains a {@code pom.xml} + * file, the {@code groupId} from that {@code pom.xml} file will be used. Otherwise, {@code io.quarkus} will be + * used. * * @since 0.20.0 */ @@ -220,8 +225,9 @@ public class CreateExtensionMojo extends AbstractMojo { /** * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the - * Parent module. If {@code grandParentRelativePath} is left unset, the default {@code relativePath} - * {@code "../pom.xml"} is used. + * Parent module. If {@code grandParentRelativePath} is left unspecified and {@link #basedir} contains a + * {@code pom.xml} file, then the value {@code ../pom.xml} will be used. Otherwise, the parent in the Parent module + * will have no {@code } set. * * @since 0.20.0 */ @@ -230,8 +236,9 @@ public class CreateExtensionMojo extends AbstractMojo { /** * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the - * Parent module. If {@code grandParentVersion} is left unset, the {@code version} from the {@code pom.xml} in the - * current directory will be used. Otherwise, an exception is thrown. + * Parent module. If {@code grandParentVersion} is left unspecified and {@link #basedir} contains a {@code pom.xml} + * file, the {@code version} from that {@code pom.xml} will be used. Otherwise, the version of the currently running + * {@code quarkus-maven-plugin} will be used. * * @since 0.20.0 */ @@ -241,7 +248,7 @@ public class CreateExtensionMojo extends AbstractMojo { /** * Quarkus version the newly created extension should depend on. If you want to pass a property placeholder, use * {@code @} instead if {@code $} so that the property is not evaluated by the current mojo - e.g. - * @{quarkus.version} + * @{quarkus.version}. * * @since 0.20.0 */ @@ -394,74 +401,86 @@ public void execute() throws MojoExecutionException, MojoFailureException { throw new MojoExecutionException(String.format("Could not process a FreeMarker template"), e); } } else { - newParent(basedir); + try { + if (this.groupId == null) { + throw new MojoFailureException( + "groupId is required. Pass something like -Dquarkus.groupId=org.my-org on the command line"); + } + singleFromScratch(charset); + } catch (IOException e) { + throw new MojoExecutionException( + String.format("Could not create a new extension project under %s", basedir), e); + } catch (TemplateException e) { + throw new MojoExecutionException(String.format("Could not process a FreeMarker template"), e); + } } } void addModules(Path basePomXml, Model basePom, Charset charset) throws IOException, TemplateException { - final Configuration cfg = new Configuration(Configuration.VERSION_2_3_28); - cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); - cfg.setTemplateLoader(createTemplateLoader(basedir, templatesUriBase)); - cfg.setDefaultEncoding(charset.name()); - cfg.setInterpolationSyntax(Configuration.SQUARE_BRACKET_INTERPOLATION_SYNTAX); - cfg.setTagSyntax(Configuration.SQUARE_BRACKET_TAG_SYNTAX); - - TemplateParams model = new TemplateParams(); - - model.artifactId = artifactId; - model.artifactIdPrefix = artifactIdPrefix; - model.artifactIdBase = artifactIdBase; - model.artifactIdBaseCamelCase = toCapCamelCase(model.artifactIdBase); - - model.groupId = this.groupId != null ? this.groupId : getGroupId(basePom); - model.version = this.version != null ? this.version : getVersion(basePom); - - model.namePrefix = namePrefix; - model.nameBase = nameBase; - model.nameSegmentDelimiter = nameSegmentDelimiter; - model.assumeManaged = detectAssumeManaged(); - model.quarkusVersion = quarkusVersion.replace('@', '$'); + final Configuration cfg = freeMarkerConfig(charset); + final String gId = getGroupId(basePom); + final String v = getVersion(basePom); + final TemplateParams model = templateParams(true, gId, basePom.getArtifactId(), v, "../pom.xml", gId, v); - model.grandParentGroupId = grandParentGroupId != null ? grandParentGroupId : getGroupId(basePom); - model.grandParentArtifactId = grandParentArtifactId != null ? grandParentArtifactId : basePom.getArtifactId(); - model.grandParentVersion = grandParentVersion != null ? grandParentVersion : getVersion(basePom); - model.grandParentRelativePath = grandParentRelativePath != null ? grandParentRelativePath : "../pom.xml"; - model.javaPackageBase = javaPackageBase != null ? javaPackageBase - : getJavaPackage(model.groupId, javaPackageInfix, artifactId); - - evalTemplate(cfg, "parent-pom.xml", basedir.resolve(model.artifactIdBase + "/pom.xml"), charset, model); - - Files.createDirectories(basedir - .resolve(model.artifactIdBase + "/runtime/src/main/java/" + model.javaPackageBase.replace('.', '/'))); - evalTemplate(cfg, "runtime-pom.xml", basedir.resolve(model.artifactIdBase + "/runtime/pom.xml"), charset, - model); - - evalTemplate(cfg, "deployment-pom.xml", basedir.resolve(model.artifactIdBase + "/deployment/pom.xml"), charset, - model); - final Path processorPath = basedir - .resolve(model.artifactIdBase + "/deployment/src/main/java/" + model.javaPackageBase.replace('.', '/') - + "/deployment/" + model.artifactIdBaseCamelCase + "Processor.java"); - evalTemplate(cfg, "Processor.java", processorPath, charset, model); + evalTemplates(basedir, charset, cfg, model); if (!basePom.getModules().contains(model.artifactIdBase)) { getLog().info(String.format("Adding module [%s] to [%s]", model.artifactIdBase, basePomXml)); new PomTransformer(basePomXml, charset).transform(Transformation.addModule(model.artifactIdBase)); } if (runtimeBomPath != null) { - getLog().info(String.format("Adding [%s] to dependencyManagement in [%s]", model.artifactId, runtimeBomPath)); - new PomTransformer(runtimeBomPath, charset) - .transform(Transformation.addManagedDependency(model.groupId, model.artifactId, "${project.version}")); + getLog().info( + String.format("Adding [%s] to dependencyManagement in [%s]", model.artifactId, runtimeBomPath)); + new PomTransformer(runtimeBomPath, charset).transform( + Transformation.addManagedDependency(model.groupId, model.artifactId, "${project.version}")); } if (deploymentBomPath != null) { final String aId = model.artifactId + "-deployment"; getLog().info(String.format("Adding [%s] to dependencyManagement in [%s]", aId, deploymentBomPath)); - new PomTransformer(deploymentBomPath, charset).transform( - Transformation.addManagedDependency(model.groupId, aId, "${project.version}")); + new PomTransformer(deploymentBomPath, charset) + .transform(Transformation.addManagedDependency(model.groupId, aId, "${project.version}")); } } + void singleFromScratch(Charset charset) throws IOException, TemplateException { + final Configuration cfg = freeMarkerConfig(charset); + final TemplateParams model = templateParams(false, "io.quarkus", "quarkus-build-parent", + MojoUtils.getPluginVersion(), null, groupId, "0.0.1-SNAPSHOT"); + + evalTemplates(basedir, charset, cfg, model); + + } + + private TemplateParams templateParams(boolean multipleExtensions, String defaultGpGroupId, + String defaultGpArtifactId, String defaultGpVersion, String gpRelPath, String defaultGroupId, + String defaultVersion) { + final String gId = this.groupId != null ? this.groupId : defaultGroupId; + final String v = this.version != null ? this.version : defaultVersion; + final String javaPackage = javaPackageBase != null ? javaPackageBase + : getJavaPackage(gId, javaPackageInfix, artifactId); + final String gpGroupId = grandParentGroupId != null ? grandParentGroupId : defaultGpGroupId; + final String gpArtifactId = grandParentArtifactId != null ? grandParentArtifactId : defaultGpArtifactId; + final String gpVersion = grandParentVersion != null ? grandParentVersion : defaultGpVersion; + final String gpRelativePath = grandParentRelativePath != null ? grandParentRelativePath : gpRelPath; + + final TemplateParams model = new TemplateParams(multipleExtensions, gpGroupId, gpArtifactId, gpVersion, + gpRelativePath, gId, artifactId, artifactIdPrefix, artifactIdBase, v, namePrefix, nameBase, + nameSegmentDelimiter, javaPackage, detectAssumeManaged(), quarkusVersion.replace('@', '$')); + return model; + } + + private Configuration freeMarkerConfig(Charset charset) throws IOException { + final Configuration cfg = new Configuration(Configuration.VERSION_2_3_28); + cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); + cfg.setTemplateLoader(createTemplateLoader(basedir, templatesUriBase)); + cfg.setDefaultEncoding(charset.name()); + cfg.setInterpolationSyntax(Configuration.SQUARE_BRACKET_INTERPOLATION_SYNTAX); + cfg.setTagSyntax(Configuration.SQUARE_BRACKET_TAG_SYNTAX); + return cfg; + } + boolean detectAssumeManaged() { if (assumeManaged != null) { return assumeManaged.booleanValue(); @@ -541,9 +560,21 @@ static String getJavaPackage(String groupId, String javaPackageInfix, String art .collect(Collectors.joining(".")); } - void newParent(Path path) { - throw new UnsupportedOperationException( - "Creating standalone extension projects is not supported yet. Only adding modules under and existing pom.xml file is supported."); + static void evalTemplates(Path basedir, Charset charset, final Configuration cfg, final TemplateParams model) + throws IOException, TemplateException { + evalTemplate(cfg, "parent-pom.xml", basedir.resolve(model.artifactIdBase + "/pom.xml"), charset, model); + + Files.createDirectories(basedir + .resolve(model.artifactIdBase + "/runtime/src/main/java/" + model.javaPackageBase.replace('.', '/'))); + evalTemplate(cfg, "runtime-pom.xml", basedir.resolve(model.artifactIdBase + "/runtime/pom.xml"), charset, + model); + + evalTemplate(cfg, "deployment-pom.xml", basedir.resolve(model.artifactIdBase + "/deployment/pom.xml"), charset, + model); + final Path processorPath = basedir + .resolve(model.artifactIdBase + "/deployment/src/main/java/" + model.javaPackageBase.replace('.', '/') + + "/deployment/" + model.artifactIdBaseCamelCase + "Processor.java"); + evalTemplate(cfg, "Processor.java", processorPath, charset, model); } static TemplateLoader createTemplateLoader(Path basedir, String templatesUriBase) throws IOException { @@ -601,22 +632,51 @@ public void setDeploymentBomPath(String deploymentBomPath) { } public static class TemplateParams { - String grandParentRelativePath; - String grandParentVersion; - String grandParentArtifactId; - String grandParentGroupId; - String groupId; - String artifactId; - String artifactIdPrefix; - String artifactIdBase; - String artifactIdBaseCamelCase; - String version; - String namePrefix; - String nameBase; - String nameSegmentDelimiter; - String javaPackageBase; - boolean assumeManaged; - String quarkusVersion; + private final boolean multipleExtensions; + private final String grandParentRelativePath; + private final String grandParentVersion; + private final String grandParentArtifactId; + private final String grandParentGroupId; + private final String groupId; + private final String artifactId; + private final String artifactIdPrefix; + private final String artifactIdBase; + private final String artifactIdBaseCamelCase; + private final String version; + private final String namePrefix; + private final String nameBase; + private final String nameSegmentDelimiter; + private final String javaPackageBase; + private final boolean assumeManaged; + private final String quarkusVersion; + + public TemplateParams(boolean multipleExtensions, String grandParentGroupId, String grandParentArtifactId, + String grandParentVersion, String grandParentRelativePath, String groupId, String artifactId, + String artifactIdPrefix, String artifactIdBase, String version, + + String namePrefix, String nameBase, String nameSegmentDelimiter, String javaPackageBase, + boolean assumeManaged, String quarkusVersion) { + super(); + this.multipleExtensions = multipleExtensions; + + this.grandParentGroupId = grandParentGroupId; + this.grandParentArtifactId = grandParentArtifactId; + this.grandParentVersion = grandParentVersion; + this.grandParentRelativePath = grandParentRelativePath; + + this.groupId = groupId; + this.artifactId = artifactId; + this.artifactIdPrefix = artifactIdPrefix; + this.artifactIdBase = artifactIdBase; + this.artifactIdBaseCamelCase = toCapCamelCase(artifactIdBase); + this.version = version; + this.namePrefix = namePrefix; + this.nameBase = nameBase; + this.nameSegmentDelimiter = nameSegmentDelimiter; + this.javaPackageBase = javaPackageBase; + this.assumeManaged = assumeManaged; + this.quarkusVersion = quarkusVersion; + } public String getJavaPackageBase() { return javaPackageBase; @@ -681,5 +741,9 @@ public String getVersion() { public String getArtifactId() { return artifactId; } + + public boolean isMultipleExtensions() { + return multipleExtensions; + } } } diff --git a/devtools/maven/src/main/resources/create-extension-templates/deployment-pom.xml b/devtools/maven/src/main/resources/create-extension-templates/deployment-pom.xml index 13933a831cd6b..8c54d2fdf3745 100644 --- a/devtools/maven/src/main/resources/create-extension-templates/deployment-pom.xml +++ b/devtools/maven/src/main/resources/create-extension-templates/deployment-pom.xml @@ -12,6 +12,20 @@ [=artifactId]-deployment [#if nameBase?? ] [=namePrefix][=nameBase][=nameSegmentDelimiter]Deployment +[/#if] +[#if !multipleExtensions ] + + + + + io.quarkus + quarkus-bom-deployment + [=quarkusVersion] + pom + import + + + [/#if] @@ -24,7 +38,7 @@ [=groupId] [=artifactId] -[#if !assumeManaged ] [=r"$"]{project.version} +[#if !assumeManaged ] ${project.version} [/#if] diff --git a/devtools/maven/src/main/resources/create-extension-templates/parent-pom.xml b/devtools/maven/src/main/resources/create-extension-templates/parent-pom.xml index cdd46a5a0e165..e4166ec569363 100644 --- a/devtools/maven/src/main/resources/create-extension-templates/parent-pom.xml +++ b/devtools/maven/src/main/resources/create-extension-templates/parent-pom.xml @@ -7,7 +7,8 @@ [=grandParentGroupId] [=grandParentArtifactId] [=grandParentVersion] - [=grandParentRelativePath] +[#if grandParentRelativePath?? ] [=grandParentRelativePath] +[/#if] [/#if] @@ -20,6 +21,23 @@ [/#if] pom +[#if !multipleExtensions ] + + + + + [=groupId] + [=artifactId] + ${project.version} + + + [=groupId] + [=artifactId]-deployment + ${project.version} + + + +[/#if] deployment runtime diff --git a/devtools/maven/src/main/resources/create-extension-templates/runtime-pom.xml b/devtools/maven/src/main/resources/create-extension-templates/runtime-pom.xml index 44afab4d71a4d..927d086d48978 100644 --- a/devtools/maven/src/main/resources/create-extension-templates/runtime-pom.xml +++ b/devtools/maven/src/main/resources/create-extension-templates/runtime-pom.xml @@ -27,7 +27,7 @@ compile - [=r"$"]{project.groupId}:[=r"$"]{project.artifactId}-deployment:[=r"$"]{project.version} + ${project.groupId}:${project.artifactId}-deployment:${project.version} diff --git a/devtools/maven/src/test/java/io/quarkus/maven/CreateExtensionMojoTest.java b/devtools/maven/src/test/java/io/quarkus/maven/CreateExtensionMojoTest.java index d60894c23d40d..30093427f3db5 100644 --- a/devtools/maven/src/test/java/io/quarkus/maven/CreateExtensionMojoTest.java +++ b/devtools/maven/src/test/java/io/quarkus/maven/CreateExtensionMojoTest.java @@ -16,7 +16,7 @@ public class CreateExtensionMojoTest { - static CreateExtensionMojo createMojo(String testProjectName) throws IllegalArgumentException, + static CreateExtensionMojo copyTestTree(String testProjectName, String testName) throws IllegalArgumentException, IllegalAccessException, IOException, NoSuchFieldException, SecurityException { final Path srcDir = Paths.get("src/test/resources/projects/" + testProjectName); /* @@ -24,7 +24,7 @@ static CreateExtensionMojo createMojo(String testProjectName) throws IllegalArgu * suffix */ final Path copyDir = Paths - .get("target/test-classes/projects/" + testProjectName + "-" + ((int) (Math.random() * 1000))); + .get("target/test-classes/projects/" + testProjectName + "-" + testName); Files.walk(srcDir).forEach(source -> { try { final Path dest = copyDir.resolve(srcDir.relativize(source)); @@ -34,8 +34,12 @@ static CreateExtensionMojo createMojo(String testProjectName) throws IllegalArgu } }); + return defaultMojo(copyDir); + } + + public static CreateExtensionMojo defaultMojo(Path basedir) { final CreateExtensionMojo mojo = new CreateExtensionMojo(); - mojo.basedir = copyDir; + mojo.basedir = basedir; mojo.encoding = CreateExtensionMojo.DEFAULT_ENCODING; mojo.templatesUriBase = CreateExtensionMojo.DEFAULT_TEMPLATES_URI_BASE; mojo.quarkusVersion = CreateExtensionMojo.DEFAULT_QUARKUS_VERSION; @@ -44,22 +48,36 @@ static CreateExtensionMojo createMojo(String testProjectName) throws IllegalArgu return mojo; } + @Test + void singleExtensionFromScratch() throws IOException, MojoExecutionException, MojoFailureException { + final Path basedir = Paths + .get("target/test-classes/projects/single-from-scratch"); + Files.createDirectories(basedir); + final CreateExtensionMojo mojo = defaultMojo(basedir); + mojo.groupId = "io.quarkus.example"; + mojo.artifactId = "single-ext"; + mojo.execute(); + + assertTreesMatch(Paths.get("target/test-classes/expected/single-from-scratch"), + mojo.basedir); + } + @Test void createExtensionUnderExistingPomMinimal() throws MojoExecutionException, MojoFailureException, IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException, IOException { - final CreateExtensionMojo mojo = createMojo("create-extension-pom"); + final CreateExtensionMojo mojo = copyTestTree("create-extension-pom", "minimal"); mojo.artifactId = "my-project-(minimal-extension)"; mojo.assumeManaged = false; mojo.execute(); - assertTreesMatch(Paths.get("src/test/resources/expected/create-extension-pom-minimal"), + assertTreesMatch(Paths.get("target/test-classes/expected/create-extension-pom-minimal"), mojo.basedir); } @Test void createExtensionUnderExistingPomCustomGrandParent() throws MojoExecutionException, MojoFailureException, IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException, IOException { - final CreateExtensionMojo mojo = createMojo("create-extension-pom"); + final CreateExtensionMojo mojo = copyTestTree("create-extension-pom", "grand-parent"); mojo.artifactId = "myproject-(with-grand-parent)"; mojo.grandParentArtifactId = "build-bom"; mojo.grandParentRelativePath = "../../build-bom/pom.xml"; @@ -70,7 +88,7 @@ void createExtensionUnderExistingPomCustomGrandParent() throws MojoExecutionExce mojo.execute(); assertTreesMatch( - Paths.get("src/test/resources/expected/create-extension-pom-with-grand-parent"), + Paths.get("target/test-classes/expected/create-extension-pom-with-grand-parent"), mojo.basedir); } diff --git a/devtools/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml b/devtools/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml index cccab7d27e622..1e98af68c19ec 100644 --- a/devtools/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml +++ b/devtools/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml @@ -17,12 +17,12 @@ io.quarkus quarkus-core-deployment - ${quarkus.version} + @@${quarkus.version} org.acme my-project-minimal-extension - ${project.version} + @@${project.version} @@ -36,7 +36,7 @@ io.quarkus quarkus-extension-processor - ${quarkus.version} + @@${quarkus.version} diff --git a/devtools/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/runtime/pom.xml b/devtools/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/runtime/pom.xml index 487e07fb65867..ff885a0bac36c 100644 --- a/devtools/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/runtime/pom.xml +++ b/devtools/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/runtime/pom.xml @@ -18,7 +18,7 @@ io.quarkus quarkus-bootstrap-maven-plugin - ${quarkus.version} + @@${quarkus.version} @@ -26,7 +26,7 @@ compile - ${project.groupId}:${project.artifactId}-deployment:${project.version} + @@${project.groupId}:@@${project.artifactId}-deployment:@@${project.version} @@ -40,7 +40,7 @@ io.quarkus quarkus-extension-processor - ${quarkus.version} + @@${quarkus.version} diff --git a/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/boms/deployment/pom.xml b/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/boms/deployment/pom.xml index 964dc369fa4f5..b3ef40de26e43 100644 --- a/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/boms/deployment/pom.xml +++ b/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/boms/deployment/pom.xml @@ -16,7 +16,7 @@ org.acme myproject-with-grand-parent-deployment - ${project.version} + @@${project.version} diff --git a/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/boms/runtime/pom.xml b/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/boms/runtime/pom.xml index eafc3d1633e89..f6b7867cc212c 100644 --- a/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/boms/runtime/pom.xml +++ b/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/boms/runtime/pom.xml @@ -16,7 +16,7 @@ org.acme myproject-with-grand-parent - ${project.version} + @@${project.version} diff --git a/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml b/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml index ce7a99fad7dbd..a03b3cc0dd3ef 100644 --- a/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml +++ b/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml @@ -34,7 +34,7 @@ io.quarkus quarkus-extension-processor - ${quarkus.version} + @@${quarkus.version} diff --git a/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/runtime/pom.xml b/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/runtime/pom.xml index 35b4d7f69b2b6..0b2549fe180f8 100644 --- a/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/runtime/pom.xml +++ b/devtools/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/runtime/pom.xml @@ -27,7 +27,7 @@ io.quarkus quarkus-extension-processor - ${quarkus.version} + @@${quarkus.version} diff --git a/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/deployment/pom.xml b/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/deployment/pom.xml new file mode 100644 index 0000000000000..2dffa11a9a37e --- /dev/null +++ b/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/deployment/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + io.quarkus.example + single-ext-parent + 0.0.1-SNAPSHOT + ../pom.xml + + + single-ext-deployment + Single Ext - Deployment + + + + + io.quarkus + quarkus-bom-deployment + @@${quarkus.version} + pom + import + + + + + + + io.quarkus + quarkus-core-deployment + + + io.quarkus.example + single-ext + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + @@${quarkus.version} + + + + + + + + diff --git a/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/deployment/src/main/java/io/quarkus/example/single/ext/deployment/SingleExtProcessor.java b/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/deployment/src/main/java/io/quarkus/example/single/ext/deployment/SingleExtProcessor.java new file mode 100644 index 0000000000000..b8c637207fb26 --- /dev/null +++ b/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/deployment/src/main/java/io/quarkus/example/single/ext/deployment/SingleExtProcessor.java @@ -0,0 +1,15 @@ +package io.quarkus.example.single.ext.deployment; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; + +class SingleExtProcessor { + + private static final String FEATURE = "single-ext"; + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } + +} diff --git a/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/pom.xml b/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/pom.xml new file mode 100644 index 0000000000000..0623d24f943fe --- /dev/null +++ b/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + io.quarkus + quarkus-build-parent + ${project.version} + + + io.quarkus.example + single-ext-parent + 0.0.1-SNAPSHOT + Single Ext - Parent + + pom + + + + + io.quarkus.example + single-ext + @@${project.version} + + + io.quarkus.example + single-ext-deployment + @@${project.version} + + + + + deployment + runtime + + diff --git a/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/runtime/pom.xml b/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/runtime/pom.xml new file mode 100644 index 0000000000000..f0f2a64085ff2 --- /dev/null +++ b/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/runtime/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + io.quarkus.example + single-ext-parent + 0.0.1-SNAPSHOT + ../pom.xml + + + single-ext + Single Ext - Runtime + + + + + io.quarkus + quarkus-bootstrap-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + @@${quarkus.version} + + + + + + +