From d4f4da280fb7bc1dbd0b5236adaa46b30462e712 Mon Sep 17 00:00:00 2001 From: Max Rydahl Andersen Date: Mon, 28 Oct 2019 16:24:41 +0100 Subject: [PATCH] Move from quarkus-extension.json to .yaml Why: * Humans read and write .yaml better than .json and yaml is a superset of json. This change addreses the need by: * ExtensionDescriptorMojo - updated to read .yaml OR .json and then still massage the structure into new structure for backwards compatability. * GenerateExtensonsMojo - reads .yaml or .json per extension. Still some javax.json code present so do a double-parse to convert back to java.json. Not pretty but minimal change for v1 that can be cleaned up afterwards. * ValidateExtensionJsonMojo - just updated to check if .yaml or .json file exists and can be read. --- .../resources/META-INF/quarkus-extension.json | 4 - .../resources/META-INF/quarkus-extension.yaml | 2 + .../platform-descriptor-json-plugin/pom.xml | 7 +- .../maven/GenerateExtensionsJsonMojo.java | 118 ++++++++++++++---- .../maven/ValidateExtensionsJsonMojo.java | 22 +++- .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 13 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 12 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 13 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 12 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 8 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 8 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 8 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 8 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 15 --- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 8 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 15 --- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 16 --- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 12 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 12 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 15 --- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 15 --- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 14 --- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 13 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 14 --- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 15 --- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 13 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 8 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 8 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 13 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 12 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 14 --- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 12 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 14 --- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 13 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 9 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 15 --- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 10 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 11 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 12 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../resources/META-INF/quarkus-extension.json | 12 -- .../resources/META-INF/quarkus-extension.yaml | 2 + .../quarkus/bootstrap/BootstrapConstants.java | 7 ++ .../maven/ExtensionDescriptorMojo.java | 88 ++++++++++--- 153 files changed, 351 insertions(+), 844 deletions(-) delete mode 100644 core/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 core/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/agroal/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/agroal/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/amazon-dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/amazon-dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/arc/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/arc/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/artemis-core/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/artemis-core/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/artemis-jms/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/artemis-jms/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/elytron-security-jdbc/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/elytron-security-jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/elytron-security-oauth2/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/elytron-security-oauth2/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/elytron-security-properties-file/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/elytron-security-properties-file/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/flyway/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/flyway/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/hibernate-orm/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/hibernate-orm/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/hibernate-validator/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/hibernate-validator/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/infinispan-client/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/infinispan-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/infinispan-embedded/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/infinispan-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/jackson/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/jaeger/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/jaeger/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/jdbc/jdbc-mssql/jdbc-mssql-runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/jdbc/jdbc-mssql/jdbc-mssql-runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/jdbc/jdbc-mysql/jdbc-mysql-runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/jdbc/jdbc-mysql/jdbc-mysql-runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/jgit/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/jgit/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/jsonb/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/jsonb/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/jsonp/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/jsonp/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/kafka-client/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/kafka-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/kafka-streams/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/kafka-streams/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/keycloak-authorization/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/keycloak-authorization/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/kogito/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/kogito/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/kubernetes-client/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/kubernetes-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/mailer/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/mailer/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/mongodb-client/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/mongodb-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/narayana-jta/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/narayana-jta/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/narayana-stm/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/narayana-stm/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/neo4j/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/neo4j/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/panache/hibernate-orm-panache/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/panache/hibernate-orm-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/panache/mongodb-panache/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/panache/mongodb-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/reactive-mysql-client/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/reactive-mysql-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/reactive-pg-client/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/reactive-pg-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/rest-client/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/rest-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/resteasy-jsonb/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/resteasy-jsonb/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/scheduler/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/scheduler/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/security/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/security/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/smallrye-context-propagation/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/smallrye-context-propagation/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/smallrye-fault-tolerance/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/smallrye-fault-tolerance/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/smallrye-health/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/smallrye-health/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/smallrye-jwt/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/smallrye-jwt/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/smallrye-metrics/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/smallrye-metrics/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/smallrye-openapi/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/smallrye-openapi/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/smallrye-opentracing/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/smallrye-opentracing/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/spring-data-jpa/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/spring-data-jpa/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/spring-di/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/spring-di/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/swagger-ui/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/swagger-ui/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/tika/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/tika/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/undertow-websockets/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/undertow-websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/vault/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/vault/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/vertx-core/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/vertx-core/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/vertx-http/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/vertx-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/vertx/runtime/src/main/resources/META-INF/quarkus-extension.json create mode 100644 extensions/vertx/runtime/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/core/runtime/src/main/resources/META-INF/quarkus-extension.json b/core/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 183f25e793eb09..00000000000000 --- a/core/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name" : "Quarkus - Core", - "metadata" : { } -} \ No newline at end of file diff --git a/core/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/core/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/core/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/devtools/platform-descriptor-json-plugin/pom.xml b/devtools/platform-descriptor-json-plugin/pom.xml index fa7c174c774b76..766f046960cda1 100644 --- a/devtools/platform-descriptor-json-plugin/pom.xml +++ b/devtools/platform-descriptor-json-plugin/pom.xml @@ -57,7 +57,12 @@ com.fasterxml.jackson.core jackson-databind - + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + org.jboss.slf4j slf4j-jboss-logging diff --git a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/GenerateExtensionsJsonMojo.java b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/GenerateExtensionsJsonMojo.java index c801e2aff0f9f3..4b441135080b20 100644 --- a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/GenerateExtensionsJsonMojo.java +++ b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/GenerateExtensionsJsonMojo.java @@ -5,6 +5,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.StringReader; import java.nio.file.FileSystem; import java.nio.file.Files; import java.nio.file.Path; @@ -44,6 +45,14 @@ import org.eclipse.aether.resolution.ArtifactResolutionException; import org.eclipse.aether.resolution.ArtifactResult; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; + import io.quarkus.bootstrap.BootstrapConstants; import io.quarkus.bootstrap.util.ZipUtils; import io.quarkus.dependencies.Extension; @@ -208,6 +217,19 @@ public void execute() throws MojoExecutionException, MojoFailureException { } private JsonObject processDependency(Artifact artifact) throws IOException { + JsonNode onode = processDependencyToObjectNode(artifact); + + if (onode != null) { + // TODO: this is a dirty hack to avoid redoing existing javax.json code + String json = getMapper(false).writeValueAsString(onode); + JsonReader jsonReader = Json.createReader(new StringReader(json)); + return jsonReader.readObject(); + } else { + return null; + } + } + + private JsonNode processDependencyToObjectNode(Artifact artifact) throws IOException { final Path path = artifact.getFile().toPath(); if (Files.isDirectory(path)) { return processMetaInfDir(artifact, path.resolve(BootstrapConstants.META_INF)); @@ -218,37 +240,70 @@ private JsonObject processDependency(Artifact artifact) throws IOException { } } - private JsonObject processMetaInfDir(Artifact artifact, Path metaInfDir) + /** + * Load and return javax.jsonObject based on yaml, json or properties file. + * + * @param artifact + * @param metaInfDir + * @return + * @throws IOException + */ + private JsonNode processMetaInfDir(Artifact artifact, Path metaInfDir) throws IOException { + + ObjectMapper mapper = null; + if (!Files.exists(metaInfDir)) { return null; } - final Path p = metaInfDir.resolve(BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME); - if (!Files.exists(p)) { - final Path props = metaInfDir.resolve(BootstrapConstants.DESCRIPTOR_FILE_NAME); - if (Files.exists(props)) { - return Json.createObjectBuilder() - .add(Extension.ARTIFACT_ID, artifact.getArtifactId()) - .add(Extension.GROUP_ID, artifact.getGroupId()) - .add("version", artifact.getVersion()) - .add("name", artifact.getArtifactId()) - .build(); + Path jsonOrYaml = null; + + Path yaml = metaInfDir.resolve(BootstrapConstants.QUARKUS_EXTENSION_FILE_NAME); + if (Files.exists(yaml)) { + mapper = getMapper(true); + jsonOrYaml = yaml; + } else { + Path json = metaInfDir.resolve(BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME); + if (!Files.exists(json)) { + final Path props = metaInfDir.resolve(BootstrapConstants.DESCRIPTOR_FILE_NAME); + if (Files.exists(props)) { + return mapper.createObjectNode() + .put(Extension.ARTIFACT_ID, artifact.getArtifactId()) + .put(Extension.GROUP_ID, artifact.getGroupId()) + .put("version", artifact.getVersion()) + .put("name", artifact.getArtifactId()); + } else { + return null; + } + } else { + jsonOrYaml = json; + mapper = getMapper(false); } - return null; } - return processPlatformArtifact(artifact, p); + return processPlatformArtifact(artifact, jsonOrYaml, mapper); } - private JsonObject processPlatformArtifact(Artifact artifact, Path descriptor) + private JsonNode processPlatformArtifact(Artifact artifact, Path descriptor, ObjectMapper mapper) throws IOException { try (InputStream is = Files.newInputStream(descriptor)) { - try (JsonReader reader = Json.createReader(is)) { - final JsonObject object = reader.readObject(); - debug("Adding Quarkus extension %s:%s", object.get(Extension.GROUP_ID), object.get(Extension.ARTIFACT_ID)); - return object; - } - } catch (IOException e) { - throw new IOException("Failed to parse " + descriptor, e); + JsonNode object = mapper.readTree(is); + debug("Adding Quarkus extension %s:%s", object.get(Extension.GROUP_ID), object.get(Extension.ARTIFACT_ID)); + return object; + } catch (IOException io) { + throw new IOException("Failed to parse " + descriptor, io); + } + } + + private ObjectMapper getMapper(boolean yaml) { + + if (yaml) { + YAMLFactory yf = new YAMLFactory(); + return new ObjectMapper(yf) + .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE); + } else { + return new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT) + .enable(JsonParser.Feature.ALLOW_COMMENTS).enable(JsonParser.Feature.ALLOW_NUMERIC_LEADING_ZEROS) + .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE); } } @@ -265,6 +320,27 @@ private String extensionId(JsonObject extObject) { } } + private String extensionId(ObjectNode extObject) { + String artId = extObject.get(Extension.ARTIFACT_ID).asText(""); + if (artId.isEmpty()) { + getLog().warn("Missing artifactId in extension overrides in " + extObject.toString()); + } + String groupId = extObject.get(Extension.GROUP_ID).asText(""); + if (groupId.isEmpty()) { + return artId; + } else { + return extObject.get(Extension.GROUP_ID).asText("") + ":" + artId; + } + } + + private String safeGet(ObjectNode extObject, String field, String defaultValue) { + if (extObject.has(field)) { + return extObject.asText(defaultValue); + } else { + return defaultValue; + } + } + private JsonObject mergeObject(JsonObject extObject, JsonObject extOverride) { final JsonObjectBuilder mergedObject = Json.createObjectBuilder(); for (Map.Entry e : extOverride.entrySet()) { diff --git a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/ValidateExtensionsJsonMojo.java b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/ValidateExtensionsJsonMojo.java index de0730058b0813..bce95c1d4a3760 100644 --- a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/ValidateExtensionsJsonMojo.java +++ b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/ValidateExtensionsJsonMojo.java @@ -153,18 +153,34 @@ private void analyzeArtifact(Artifact artifact, Map extensions if (!file.exists()) { throw new MojoExecutionException("Failed to locate " + artifact + " at " + file); } + + if (!doesDescriptorExistAndCanBeRead(artifact, extensions, file, BootstrapConstants.QUARKUS_EXTENSION_FILE_NAME) && + !doesDescriptorExistAndCanBeRead(artifact, extensions, file, + BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME)) { + + throw new MojoExecutionException("Failed to locate and read neither " + + BootstrapConstants.QUARKUS_EXTENSION_FILE_NAME + + " or " + BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME + + " for '" + artifact + "' in " + file); + } + } + + private boolean doesDescriptorExistAndCanBeRead(Artifact artifact, Map extensions, final File file, + String descriptorName) + throws MojoExecutionException { if (file.isDirectory()) { processExtensionDescriptor(artifact, file.toPath().resolve(BootstrapConstants.META_INF) - .resolve(BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME), extensions); + .resolve(descriptorName), extensions); } else { try (FileSystem fs = FileSystems.newFileSystem(file.toPath(), null)) { processExtensionDescriptor(artifact, - fs.getPath("/", BootstrapConstants.META_INF, BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME), + fs.getPath("/", BootstrapConstants.META_INF, descriptorName), extensions); } catch (IOException e) { - throw new MojoExecutionException("Failed to read " + file, e); + return false; } } + return true; } private void processExtensionDescriptor(Artifact artifact, Path p, Map extensions) { diff --git a/extensions/agroal/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/agroal/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 62fa757693cb4b..00000000000000 --- a/extensions/agroal/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Agroal - Database connection pool", - "metadata" : { - "keywords" : [ - "agroal", - "database-connection-pool" - ] - } -} \ No newline at end of file diff --git a/extensions/agroal/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/agroal/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/agroal/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/amazon-dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/amazon-dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 36b8757af95a69..00000000000000 --- a/extensions/amazon-dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "Amazon DynamoDB client", - "metadata" : { - "keywords" : [ - "dynamodb", - "dynamo", - "aws", - "amazon" - ] - } -} \ No newline at end of file diff --git a/extensions/amazon-dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/amazon-dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index abf0decf136443..00000000000000 --- a/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "AWS Lambda", - "metadata" : { - "keywords" : [ - "lambda", - "aws", - "amazon" - ] - } -} \ No newline at end of file diff --git a/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/arc/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/arc/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index eb7fb570fc9734..00000000000000 --- a/extensions/arc/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name" : "ArC", - "short-name" : "CDI", - "metadata" : { - "keywords" : [ - "arc", - "cdi", - "dependency-injection", - "di" - ], - "guide" : "https://quarkus.io/guides/cdi-reference" - } -} \ No newline at end of file diff --git a/extensions/arc/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/arc/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/arc/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/artemis-core/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/artemis-core/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index bde67cf95a9544..00000000000000 --- a/extensions/artemis-core/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Artemis Core", - "metadata" : { - "keywords" : [ - "artemis-core", - "artemis" - ] - } -} \ No newline at end of file diff --git a/extensions/artemis-core/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/artemis-core/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/artemis-core/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/artemis-jms/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/artemis-jms/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 082a433fb560da..00000000000000 --- a/extensions/artemis-jms/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Artemis JMS", - "metadata" : { - "keywords" : [ - "artemis-jms", - "artemis" - ] - } -} \ No newline at end of file diff --git a/extensions/artemis-jms/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/artemis-jms/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/artemis-jms/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/elytron-security-jdbc/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/elytron-security-jdbc/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 44244ab8f2fa91..00000000000000 --- a/extensions/elytron-security-jdbc/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "Elytron Security JDBC Realm", - "metadata" : { - "keywords" : [ - "security", - "jdbc" - ], - "guide" : "https://quarkus.io/guides/security-jdbc-guide" - } -} \ No newline at end of file diff --git a/extensions/elytron-security-jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/elytron-security-jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/elytron-security-jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/elytron-security-oauth2/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/elytron-security-oauth2/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 35435d0caa42d3..00000000000000 --- a/extensions/elytron-security-oauth2/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Elytron Security OAuth 2.0", - "metadata" : { - "keywords" : [ - "security", - "oauth2" - ] - } -} \ No newline at end of file diff --git a/extensions/elytron-security-oauth2/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/elytron-security-oauth2/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/elytron-security-oauth2/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/elytron-security-properties-file/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/elytron-security-properties-file/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index f2269ae16581ea..00000000000000 --- a/extensions/elytron-security-properties-file/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Properties File based Security", - "metadata" : { - "keywords" : [ - "security" - ], - "guide" : "https://quarkus.io/guides/elytron-properties-guide" - } -} \ No newline at end of file diff --git a/extensions/elytron-security-properties-file/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/elytron-security-properties-file/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/elytron-security-properties-file/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/flyway/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/flyway/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index cd4ebb24f496d6..00000000000000 --- a/extensions/flyway/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "Flyway", - "metadata" : { - "keywords" : [ - "flyway", - "database", - "data" - ], - "guide" : "https://quarkus.io/guides/flyway-guide" - } -} \ No newline at end of file diff --git a/extensions/flyway/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/flyway/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/flyway/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/hibernate-orm/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/hibernate-orm/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 1ccd6b57e9266b..00000000000000 --- a/extensions/hibernate-orm/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "Hibernate ORM", - "short-name" : "JPA", - "metadata" : { - "keywords" : [ - "hibernate-orm", - "jpa", - "hibernate" - ], - "guide" : "https://quarkus.io/guides/hibernate-orm-guide" - } -} \ No newline at end of file diff --git a/extensions/hibernate-orm/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/hibernate-orm/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/hibernate-orm/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index c4013a9fd2b9a6..00000000000000 --- a/extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name" : "Hibernate Search + Elasticsearch", - "metadata" : { - "keywords" : [ - "hibernate-search-elasticsearch", - "search", - "full-text", - "hibernate", - "elasticsearch" - ], - "guide" : "https://quarkus.io/guides/hibernate-search-guide" - } -} \ No newline at end of file diff --git a/extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/hibernate-validator/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/hibernate-validator/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index f0389933a22d38..00000000000000 --- a/extensions/hibernate-validator/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "Hibernate Validator", - "short-name" : "bean validation", - "metadata" : { - "keywords" : [ - "hibernate-validator", - "bean-validation", - "validation" - ], - "guide" : "https://quarkus.io/guides/validation-guide" - } -} \ No newline at end of file diff --git a/extensions/hibernate-validator/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/hibernate-validator/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/hibernate-validator/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/infinispan-client/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/infinispan-client/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 558419dbb4ea70..00000000000000 --- a/extensions/infinispan-client/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "Infinispan Client", - "metadata" : { - "keywords" : [ - "infinispan-client", - "data-grid-client", - "infinispan" - ], - "guide" : "https://quarkus.io/guides/infinispan-client-guide" - } -} \ No newline at end of file diff --git a/extensions/infinispan-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/infinispan-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/infinispan-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/infinispan-embedded/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/infinispan-embedded/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 022ae48da05598..00000000000000 --- a/extensions/infinispan-embedded/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name" : "Infinispan Embedded", - "metadata" : { - "keywords" : [ - "infinispan" - ] - } -} \ No newline at end of file diff --git a/extensions/infinispan-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/infinispan-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/infinispan-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/jackson/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/jackson/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index ac2c917aa9db8a..00000000000000 --- a/extensions/jackson/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Jackson", - "metadata" : { - "keywords" : [ - "jackson", - "json" - ] - } -} \ No newline at end of file diff --git a/extensions/jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/jaeger/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/jaeger/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index f6fddcfea80328..00000000000000 --- a/extensions/jaeger/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name" : "Security", - "metadata" : { - "keywords" : [ - "security" - ] - } -} \ No newline at end of file diff --git a/extensions/jaeger/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jaeger/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/jaeger/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index ada4c73037e97a..00000000000000 --- a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "JDBC Driver - H2", - "metadata" : { - "keywords" : [ - "jdbc-h2", - "jdbc", - "h2" - ] - } -} \ No newline at end of file diff --git a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 511106771d3385..00000000000000 --- a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "JDBC Driver - MariaDB", - "metadata" : { - "keywords" : [ - "jdbc-mariadb", - "jdbc", - "mariadb" - ] - } -} \ No newline at end of file diff --git a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/jdbc/jdbc-mssql/jdbc-mssql-runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/jdbc/jdbc-mssql/jdbc-mssql-runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 18ce41ceb96914..00000000000000 --- a/extensions/jdbc/jdbc-mssql/jdbc-mssql-runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "JDBC Driver - Microsoft SQL Server", - "metadata" : { - "keywords" : [ - "jdbc-mssql", - "jdbc", - "mssql", - "sql-server" - ] - } -} \ No newline at end of file diff --git a/extensions/jdbc/jdbc-mssql/jdbc-mssql-runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jdbc/jdbc-mssql/jdbc-mssql-runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/jdbc/jdbc-mssql/jdbc-mssql-runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/jdbc/jdbc-mysql/jdbc-mysql-runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/jdbc/jdbc-mysql/jdbc-mysql-runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index c65bddbfb4d2e3..00000000000000 --- a/extensions/jdbc/jdbc-mysql/jdbc-mysql-runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "JDBC Driver - MySQL", - "metadata" : { - "keywords" : [ - "jdbc-mysql", - "jdbc", - "mysql" - ] - } -} \ No newline at end of file diff --git a/extensions/jdbc/jdbc-mysql/jdbc-mysql-runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jdbc/jdbc-mysql/jdbc-mysql-runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/jdbc/jdbc-mysql/jdbc-mysql-runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index a1bd11deec1d2c..00000000000000 --- a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "JDBC Driver - PostgreSQL", - "metadata" : { - "keywords" : [ - "jdbc-postgresql", - "jdbc", - "postgresql" - ] - } -} \ No newline at end of file diff --git a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/jgit/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/jgit/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 77da3bd3549cd9..00000000000000 --- a/extensions/jgit/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name" : "JGit", - "metadata" : { - "keywords" : [ - "git" - ] - } -} \ No newline at end of file diff --git a/extensions/jgit/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jgit/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/jgit/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/jsonb/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/jsonb/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index a61a15ca0b5055..00000000000000 --- a/extensions/jsonb/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "JSON-B", - "metadata" : { - "keywords" : [ - "jsonb", - "json-b", - "json" - ], - "guide" : "https://quarkus.io/guides/rest-json-guide" - } -} \ No newline at end of file diff --git a/extensions/jsonb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jsonb/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/jsonb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/jsonp/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/jsonp/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 426bf12c07da47..00000000000000 --- a/extensions/jsonp/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "JSON-P", - "metadata" : { - "keywords" : [ - "jsonp", - "json-p", - "json" - ] - } -} \ No newline at end of file diff --git a/extensions/jsonp/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jsonp/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/jsonp/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/kafka-client/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/kafka-client/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 87a46385e62b56..00000000000000 --- a/extensions/kafka-client/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name" : "Apache Kafka Client", - "metadata" : { - "keywords" : [ - "kafka" - ] - } -} \ No newline at end of file diff --git a/extensions/kafka-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kafka-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/kafka-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/kafka-streams/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/kafka-streams/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 6d6c1893a52c26..00000000000000 --- a/extensions/kafka-streams/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Apache Kafka Streams", - "metadata" : { - "keywords" : [ - "kafka", - "kafka-streams" - ] - } -} \ No newline at end of file diff --git a/extensions/kafka-streams/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kafka-streams/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/kafka-streams/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/keycloak-authorization/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/keycloak-authorization/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 2fb500f9e9ca0d..00000000000000 --- a/extensions/keycloak-authorization/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name" : "Keycloak Authorization", - "metadata" : { - "keywords" : [ - "oauth2", - "openid-connect", - "keycloak", - "authorization-services", - "policy-enforcer", - "fine-grained-permission", - "resource-based-authorization" - ], - "guide" : "https://quarkus.io/guides/keycloak-authorization-guide" - } -} \ No newline at end of file diff --git a/extensions/keycloak-authorization/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/keycloak-authorization/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/keycloak-authorization/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/kogito/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/kogito/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 9ab4537ae1fd5b..00000000000000 --- a/extensions/kogito/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "Kogito", - "metadata" : { - "keywords" : [ - "kogito", - "drools", - "jbpm" - ], - "guide" : "https://quarkus.io/guides/kogito-guide" - } -} \ No newline at end of file diff --git a/extensions/kogito/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kogito/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/kogito/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 4741e42d3fe318..00000000000000 --- a/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Kotlin", - "metadata" : { - "keywords" : [ - "kotlin" - ], - "guide" : "https://quarkus.io/guides/kotlin" - } -} \ No newline at end of file diff --git a/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/kubernetes-client/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/kubernetes-client/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 8eb8395053c75e..00000000000000 --- a/extensions/kubernetes-client/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name" : "Kubernetes Client", - "metadata" : { - "keywords" : [ - "kubernetes-client" - ] - } -} \ No newline at end of file diff --git a/extensions/kubernetes-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kubernetes-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/kubernetes-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 9ef4ff1e6796e8..00000000000000 --- a/extensions/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Kubernetes", - "metadata" : { - "keywords" : [ - "kubernetes" - ], - "guide" : "https://quarkus.io/guides/kubernetes-guide" - } -} \ No newline at end of file diff --git a/extensions/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/mailer/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/mailer/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 05ce44b1f93947..00000000000000 --- a/extensions/mailer/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "Mailer", - "metadata" : { - "keywords" : [ - "mail", - "mailer" - ], - "guide" : "https://quarkus.io/guides/sending-emails" - } -} \ No newline at end of file diff --git a/extensions/mailer/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/mailer/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/mailer/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/mongodb-client/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/mongodb-client/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 91d9834132152e..00000000000000 --- a/extensions/mongodb-client/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "MongoDB client", - "metadata" : { - "keywords" : [ - "mongo", - "mongodb", - "nosql", - "datastore" - ] - } -} \ No newline at end of file diff --git a/extensions/mongodb-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/mongodb-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/mongodb-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/narayana-jta/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/narayana-jta/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 096e946e22f879..00000000000000 --- a/extensions/narayana-jta/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name" : "Narayana JTA - Transaction manager", - "metadata" : { - "keywords" : [ - "narayana-jta", - "narayana", - "jta", - "transactions", - "transaction", - "tx", - "txs" - ], - "guide" : "https://quarkus.io/guides/transaction-guide" - } -} \ No newline at end of file diff --git a/extensions/narayana-jta/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/narayana-jta/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/narayana-jta/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/narayana-stm/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/narayana-stm/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index eb2147b363faee..00000000000000 --- a/extensions/narayana-stm/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name" : "Narayana STM - Software Transactional Memory", - "metadata" : { - "keywords" : [ - "narayana-stm", - "narayana", - "stm", - "transactions", - "transaction", - "software-transactional-memory", - "tx", - "txs" - ], - "guide" : "https://quarkus.io/guides/stm-guide" - } -} \ No newline at end of file diff --git a/extensions/narayana-stm/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/narayana-stm/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/narayana-stm/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/neo4j/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/neo4j/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index d40abb8dbea705..00000000000000 --- a/extensions/neo4j/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "Neo4j client", - "metadata" : { - "keywords" : [ - "neo4j", - "graph", - "nosql", - "datastore" - ] - } -} \ No newline at end of file diff --git a/extensions/neo4j/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/neo4j/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/neo4j/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index caad3c4e09864c..00000000000000 --- a/extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "OpenID Connect", - "metadata" : { - "keywords" : [ - "oauth2", - "openid-connect" - ], - "guide" : "https://quarkus.io/guides/oidc-guide" - } -} \ No newline at end of file diff --git a/extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/panache/hibernate-orm-panache/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 0d3ce117ee5940..00000000000000 --- a/extensions/panache/hibernate-orm-panache/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "Hibernate ORM with Panache", - "metadata" : { - "keywords" : [ - "hibernate-orm-panache", - "panache", - "hibernate", - "jpa" - ], - "guide" : "https://quarkus.io/guides/hibernate-orm-panache-guide" - } -} \ No newline at end of file diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/panache/hibernate-orm-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/panache/mongodb-panache/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/panache/mongodb-panache/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 73197c0a426c4c..00000000000000 --- a/extensions/panache/mongodb-panache/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "MongoDB with Panache", - "metadata" : { - "keywords" : [ - "mongo", - "mongodb", - "nosql", - "datastore", - "panache" - ] - } -} \ No newline at end of file diff --git a/extensions/panache/mongodb-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/panache/mongodb-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/panache/mongodb-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/reactive-mysql-client/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/reactive-mysql-client/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 2711d05f9c7b20..00000000000000 --- a/extensions/reactive-mysql-client/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name" : "Reactive MySQL client", - "metadata" : { - "keywords" : [ - "eclipse-vert.x", - "vertx", - "vert.x", - "reactive", - "database", - "data", - "mysql" - ], - "guide" : "https://quarkus.io/guides/reactive-sql-clients" - } -} \ No newline at end of file diff --git a/extensions/reactive-mysql-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/reactive-mysql-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/reactive-mysql-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/reactive-pg-client/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/reactive-pg-client/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index edc77b4f7b79d5..00000000000000 --- a/extensions/reactive-pg-client/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name" : "Reactive PostgreSQL client", - "metadata" : { - "keywords" : [ - "eclipse-vert.x", - "vertx", - "vert.x", - "reactive", - "database", - "data", - "postgresql" - ], - "guide" : "https://quarkus.io/guides/reactive-sql-clients" - } -} \ No newline at end of file diff --git a/extensions/reactive-pg-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/reactive-pg-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/reactive-pg-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 5d6e13b5054b87..00000000000000 --- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name" : "SmallRye Reactive Streams Operators", - "short-name" : "reactive streams", - "metadata" : { - "keywords" : [ - "smallrye-reactive-streams-operators", - "smallrye-reactive-streams", - "reactive-streams-operators", - "reactive-streams", - "microprofile-reactive-streams", - "reactive" - ] - } -} \ No newline at end of file diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 0c8f9173eaac89..00000000000000 --- a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name" : "SmallRye Reactive Type Converters", - "metadata" : { - "keywords" : [ - "smallrye-reactive-type-converters", - "reactive-type-converters", - "reactive-streams-operators", - "reactive-streams", - "microprofile-reactive-streams", - "reactive" - ] - } -} \ No newline at end of file diff --git a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/rest-client/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/rest-client/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 55851732f81074..00000000000000 --- a/extensions/rest-client/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "REST Client", - "metadata" : { - "keywords" : [ - "rest-client", - "web-client", - "microprofile-rest-client" - ], - "guide" : "https://quarkus.io/guides/rest-client-guide" - } -} \ No newline at end of file diff --git a/extensions/rest-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/rest-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/rest-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 4c03bcbff78da5..00000000000000 --- a/extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name" : "RESTEasy Jackson", - "metadata" : { - "keywords" : [ - "resteasy-jackson", - "jaxrs-json", - "resteasy-json", - "resteasy", - "jaxrs", - "json", - "jackson" - ] - } -} \ No newline at end of file diff --git a/extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/resteasy-jsonb/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/resteasy-jsonb/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 0efe049908641a..00000000000000 --- a/extensions/resteasy-jsonb/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name" : "RESTEasy JSON-B", - "metadata" : { - "keywords" : [ - "resteasy-jsonb", - "jaxrs-json", - "resteasy-json", - "resteasy", - "jaxrs", - "json", - "jsonb" - ], - "guide" : "https://quarkus.io/guides/rest-json-guide" - } -} \ No newline at end of file diff --git a/extensions/resteasy-jsonb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-jsonb/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/resteasy-jsonb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 1c8ba68395b7e4..00000000000000 --- a/extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name" : "RESTEasy JAX-RS", - "short-name" : "jax-rs", - "metadata" : { - "keywords" : [ - "resteasy", - "jaxrs", - "web", - "rest" - ], - "guide" : "https://quarkus.io/guides/rest-json-guide" - } -} \ No newline at end of file diff --git a/extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 2630e7176afa8b..00000000000000 --- a/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name" : "Scala", - "metadata" : { - "keywords" : [ - "scala" - ] - } -} \ No newline at end of file diff --git a/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/scheduler/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/scheduler/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index ebeced345ad844..00000000000000 --- a/extensions/scheduler/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "Scheduler - tasks", - "metadata" : { - "keywords" : [ - "scheduler", - "tasks", - "periodic-tasks" - ], - "guide" : "https://quarkus.io/guides/scheduled-guide" - } -} \ No newline at end of file diff --git a/extensions/scheduler/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/scheduler/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/scheduler/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/security/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/security/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 6f338cc02b5ad1..00000000000000 --- a/extensions/security/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name" : "Jaeger", - "metadata" : { - "keywords" : [ - "jaeger" - ] - } -} \ No newline at end of file diff --git a/extensions/security/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/security/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/security/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/smallrye-context-propagation/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/smallrye-context-propagation/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 28dbe8060e6e42..00000000000000 --- a/extensions/smallrye-context-propagation/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name" : "SmallRye Context Propagation", - "short-name" : "context propagation", - "metadata" : { - "keywords" : [ - "smallrye-context-propagation", - "microprofile-context-propagation", - "context-propagation", - "context", - "reactive" - ] - } -} \ No newline at end of file diff --git a/extensions/smallrye-context-propagation/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-context-propagation/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/smallrye-context-propagation/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/smallrye-fault-tolerance/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index bfb5dc310db106..00000000000000 --- a/extensions/smallrye-fault-tolerance/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "SmallRye Fault Tolerance", - "metadata" : { - "keywords" : [ - "smallrye-fault-tolerance", - "fault-tolerance", - "microprofile-fault-tolerance", - "circuit-breaker", - "bulkhead" - ] - } -} \ No newline at end of file diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-fault-tolerance/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/smallrye-fault-tolerance/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/smallrye-health/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/smallrye-health/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index c5219671276795..00000000000000 --- a/extensions/smallrye-health/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name" : "SmallRye Health", - "short-name" : "health", - "metadata" : { - "keywords" : [ - "smallrye-health", - "health-check", - "health", - "microprofile-health", - "microprofile-health-check" - ], - "guide" : "https://quarkus.io/guides/health-guide" - } -} \ No newline at end of file diff --git a/extensions/smallrye-health/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-health/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/smallrye-health/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/smallrye-jwt/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/smallrye-jwt/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 6b92d8d033ca30..00000000000000 --- a/extensions/smallrye-jwt/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "SmallRye JWT", - "metadata" : { - "keywords" : [ - "smallrye-jwt", - "jwt", - "json-web-token", - "rbac" - ], - "guide" : "https://quarkus.io/guides/jwt-guide" - } -} \ No newline at end of file diff --git a/extensions/smallrye-jwt/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-jwt/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/smallrye-jwt/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/smallrye-metrics/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/smallrye-metrics/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 5b8002d0f3a03d..00000000000000 --- a/extensions/smallrye-metrics/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name" : "SmallRye Metrics", - "short-name" : "metrics", - "metadata" : { - "keywords" : [ - "smallrye-metrics", - "metrics", - "metric", - "prometheus", - "monitoring" - ], - "guide" : "https://quarkus.io/guides/metrics-guide" - } -} \ No newline at end of file diff --git a/extensions/smallrye-metrics/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-metrics/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/smallrye-metrics/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/smallrye-openapi/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/smallrye-openapi/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 3fa43b83fc828b..00000000000000 --- a/extensions/smallrye-openapi/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "SmallRye OpenAPI", - "metadata" : { - "keywords" : [ - "smallrye-openapi", - "openapi", - "open-api" - ], - "guide" : "https://quarkus.io/guides/openapi-swaggerui-guide" - } -} \ No newline at end of file diff --git a/extensions/smallrye-openapi/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-openapi/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/smallrye-openapi/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/smallrye-opentracing/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/smallrye-opentracing/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 5369d4042e7599..00000000000000 --- a/extensions/smallrye-opentracing/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name" : "SmallRye OpenTracing", - "metadata" : { - "keywords" : [ - "smallrye-opentracing", - "opentracing", - "tracing", - "distributed-tracing", - "jaeger" - ], - "guide" : "https://quarkus.io/guides/opentracing-guide" - } -} \ No newline at end of file diff --git a/extensions/smallrye-opentracing/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-opentracing/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/smallrye-opentracing/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index bddfd649d10db7..00000000000000 --- a/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "SmallRye Reactive Messaging - AMQP Connector", - "metadata" : { - "keywords" : [ - "amqp", - "reactive-amqp" - ], - "guide" : "https://quarkus.io/guides/amqp-guide" - } -} \ No newline at end of file diff --git a/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 8bf74a11d55a61..00000000000000 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "SmallRye Reactive Messaging - Kafka Connector", - "short-name" : "kafka", - "metadata" : { - "keywords" : [ - "kafka", - "reactive-kafka" - ], - "guide" : "https://quarkus.io/guides/kafka-guide" - } -} \ No newline at end of file diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 453b6c96cdbbef..00000000000000 --- a/extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "SmallRye Reactive Messaging - MQTT Connector", - "metadata" : { - "keywords" : [ - "mqtt", - "reactive-mqtt" - ] - } -} \ No newline at end of file diff --git a/extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 62a5845f998a33..00000000000000 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "SmallRye Reactive Messaging", - "metadata" : { - "keywords" : [ - "smallrye-reactive-messaging", - "reactive-messaging", - "reactive" - ], - "guide" : "https://quarkus.io/guides/async-message-passing" - } -} \ No newline at end of file diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/spring-data-jpa/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/spring-data-jpa/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 5ebbb8344ecebd..00000000000000 --- a/extensions/spring-data-jpa/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Quarkus Extension for Spring Data JPA API", - "metadata" : { - "keywords" : [ - "spring-data" - ], - "guide" : "https://quarkus.io/guides/spring-data-jpa-guide" - } -} \ No newline at end of file diff --git a/extensions/spring-data-jpa/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/spring-data-jpa/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/spring-data-jpa/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/spring-di/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/spring-di/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 6dc64facaa0fa6..00000000000000 --- a/extensions/spring-di/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Quarkus Extension for Spring DI API", - "metadata" : { - "keywords" : [ - "spring-di" - ], - "guide" : "https://quarkus.io/guides/spring-di-guide" - } -} \ No newline at end of file diff --git a/extensions/spring-di/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/spring-di/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/spring-di/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index c66b578b76495a..00000000000000 --- a/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Quarkus Extension for Spring Web API", - "metadata" : { - "keywords" : [ - "spring-web" - ], - "guide" : "https://quarkus.io/guides/spring-web-guide" - } -} \ No newline at end of file diff --git a/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/swagger-ui/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/swagger-ui/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 1a15928899f841..00000000000000 --- a/extensions/swagger-ui/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Swagger UI", - "metadata" : { - "keywords" : [ - "swagger-ui" - ], - "guide" : "https://quarkus.io/guides/openapi-swaggerui-guide" - } -} \ No newline at end of file diff --git a/extensions/swagger-ui/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/swagger-ui/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/swagger-ui/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/tika/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/tika/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 53521acf9634c8..00000000000000 --- a/extensions/tika/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Apache Tika", - "metadata" : { - "keywords" : [ - "tika", - "parser" - ] - } -} \ No newline at end of file diff --git a/extensions/tika/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/tika/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/tika/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/undertow-websockets/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/undertow-websockets/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index acb4a1941766ea..00000000000000 --- a/extensions/undertow-websockets/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name" : "Undertow WebSockets", - "short-name" : "websockets", - "metadata" : { - "keywords" : [ - "undertow-websockets", - "undertow-websocket", - "websocket", - "websockets", - "web-socket", - "web-sockets" - ], - "guide" : "https://quarkus.io/guides/websocket-guide" - } -} \ No newline at end of file diff --git a/extensions/undertow-websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/undertow-websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/undertow-websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 7402b3677d96a9..00000000000000 --- a/extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "Undertow Servlet", - "short-name" : "servlet", - "metadata" : { - "keywords" : [ - "undertow", - "servlet" - ] - } -} \ No newline at end of file diff --git a/extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/vault/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/vault/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 98b52539f33f7e..00000000000000 --- a/extensions/vault/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "Vault", - "metadata" : { - "keywords" : [ - "vault", - "security" - ], - "guide" : "https://quarkus.io/guides/vault-guide" - } -} \ No newline at end of file diff --git a/extensions/vault/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/vault/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/vault/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/vertx-core/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/vertx-core/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index b71f866580b439..00000000000000 --- a/extensions/vertx-core/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name" : "Eclipse Vert.x - Core", - "metadata" : { - "keywords" : [ - "eclipse-vert.x", - "vertx", - "vert.x", - "reactive" - ] - } -} \ No newline at end of file diff --git a/extensions/vertx-core/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/vertx-core/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/vertx-core/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/vertx-http/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/vertx-http/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 0e9ba08d66f3f2..00000000000000 --- a/extensions/vertx-http/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "Eclipse Vert.x - HTTP", - "metadata" : { - "keywords" : [ - "eclipse-vert.x", - "vertx", - "vert.x", - "reactive", - "vertx-http" - ] - } -} \ No newline at end of file diff --git a/extensions/vertx-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/vertx-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/vertx-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/extensions/vertx/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/vertx/runtime/src/main/resources/META-INF/quarkus-extension.json deleted file mode 100644 index 9ae2131825d8e3..00000000000000 --- a/extensions/vertx/runtime/src/main/resources/META-INF/quarkus-extension.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "Eclipse Vert.x", - "metadata" : { - "keywords" : [ - "eclipse-vert.x", - "vertx", - "vert.x", - "reactive" - ], - "guide" : "https://quarkus.io/guides/using-vertx" - } -} \ No newline at end of file diff --git a/extensions/vertx/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/vertx/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..ac70f11a3bf21a --- /dev/null +++ b/extensions/vertx/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,2 @@ +--- +metadata: {} diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java index a0880200790fa9..8563051c981300 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java @@ -6,11 +6,18 @@ */ public interface BootstrapConstants { + @Deprecated String DESCRIPTOR_FILE_NAME = "quarkus-extension.properties"; + + @Deprecated String EXTENSION_PROPS_JSON_FILE_NAME = "quarkus-extension.json"; + + String QUARKUS_EXTENSION_FILE_NAME = "quarkus-extension.yaml"; + String META_INF = "META-INF"; + @Deprecated String DESCRIPTOR_PATH = META_INF + '/' + DESCRIPTOR_FILE_NAME; String PROP_DEPLOYMENT_ARTIFACT = "deployment-artifact"; diff --git a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java index 9dde00c0d6c12f..47bd245aa62180 100644 --- a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java +++ b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java @@ -4,6 +4,7 @@ import java.io.BufferedWriter; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; @@ -19,16 +20,21 @@ import org.apache.maven.project.MavenProject; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.repository.RemoteRepository; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.util.DefaultIndenter; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.node.ObjectNode; import io.quarkus.bootstrap.BootstrapConstants; + import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; /** @@ -48,6 +54,9 @@ public class ExtensionDescriptorMojo extends AbstractMojo { private static final String ARTIFACT_ID = "artifact-id"; private static DefaultPrettyPrinter prettyPrinter = null; + + private ObjectMapper mapper; + /** * The entry point to Aether, i.e. the component doing all the work. * @@ -84,8 +93,8 @@ public class ExtensionDescriptorMojo extends AbstractMojo { @Parameter(required = true, defaultValue = "${project.groupId}:${project.artifactId}-deployment:${project.version}") private String deployment; - @Parameter(required = true, defaultValue = "${project.build.outputDirectory}/META-INF/quarkus-extension.json") - private File extensionJson; + @Parameter(required = true, defaultValue = "${project.build.outputDirectory}/META-INF/quarkus-extension.yaml") + private File extensionFile; @Parameter(defaultValue = "${project}") protected MavenProject project; @@ -112,21 +121,24 @@ public void execute() throws MojoExecutionException { } // extension.json - ObjectMapper mapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT); - ObjectNode extObject; - if (extensionJson == null) { - extensionJson = new File(outputDirectory, - "META-INF" + File.separator + BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME); + if (extensionFile == null) { + extensionFile = new File(outputDirectory, + "META-INF" + File.separator + BootstrapConstants.QUARKUS_EXTENSION_FILE_NAME); } - if (extensionJson.exists()) { - try (BufferedReader reader = Files.newBufferedReader(extensionJson.toPath())) { - extObject = (ObjectNode) mapper.readTree(reader); + + ObjectNode extObject; + if (extensionFile.exists()) { + mapper = getMapper(extensionFile.toString().endsWith(".yaml")); + + try { + extObject = processPlatformArtifact(extensionFile.toPath(), mapper); } catch (IOException e) { - throw new MojoExecutionException("Failed to parse " + extensionJson, e); + throw new MojoExecutionException("Could not read extension file", e); } } else { - extObject = mapper.createObjectNode(); + mapper = getMapper(true); + extObject = getMapper(true).createObjectNode(); } transformLegacyToNew(output, extObject, mapper); @@ -178,11 +190,11 @@ public void execute() throws MojoExecutionException { } try (BufferedWriter bw = Files - .newBufferedWriter(output.resolve(BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME))) { + .newBufferedWriter(output.resolve(BootstrapConstants.QUARKUS_EXTENSION_FILE_NAME))) { bw.write(mapper.writer(prettyPrinter).writeValueAsString(extObject)); } catch (IOException e) { throw new MojoExecutionException( - "Failed to persist " + output.resolve(BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME), e); + "Failed to persist " + output.resolve(BootstrapConstants.QUARKUS_EXTENSION_FILE_NAME), e); } } @@ -226,7 +238,55 @@ private void transformLegacyToNew(final Path output, ObjectNode extObject, Objec } extObject.set("metadata", metadata); + + +// updateSourceFiles(output, extObject, mapper); + + } + + /** parse yaml or json and then return jackson JSonNode for furhter processing + * + * TODO: currently `mapper` gets set as a sideffect of calling this. Should find a way to avoid that. + * **/ + private ObjectNode processPlatformArtifact(Path descriptor, ObjectMapper mapper) + throws IOException { + try (InputStream is = Files.newInputStream(descriptor)) { + return mapper.readValue(is, ObjectNode.class); + } catch (IOException io) { + throw new IOException("Failed to parse " + descriptor, io); + } + } + + private ObjectMapper getMapper(boolean yaml) { + if (yaml) { + YAMLFactory yf = new YAMLFactory(); + return new ObjectMapper(yf) + .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE); + } else { + return new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT) + .enable(JsonParser.Feature.ALLOW_COMMENTS).enable(JsonParser.Feature.ALLOW_NUMERIC_LEADING_ZEROS).setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE); + } + } + + private void updateSourceFiles(final Path output, ObjectNode extObject, ObjectMapper mapper) throws MojoExecutionException { + // TODO: remove before going to master + Path source = output + .resolve("../../../src/main/resources/META-INF/"); + System.out.println("Try to save " + source); + if (source.toFile().exists()) { + try (BufferedWriter by = Files.newBufferedWriter(source.resolve(BootstrapConstants.QUARKUS_EXTENSION_FILE_NAME))) { + + YAMLFactory yf = new YAMLFactory(); + ObjectMapper ym = new ObjectMapper(yf).enable(SerializationFeature.INDENT_OUTPUT); + by.write(ym.writer(prettyPrinter).writeValueAsString(extObject)); + + // source.resolve(BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME).toFile().delete(); + } catch (IOException e) { + throw new MojoExecutionException( + "Failed to persist " + output.resolve(BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME), e); + } + } } }