From be5bbd9e2ceed514b0d7080475f24a4b00946d17 Mon Sep 17 00:00:00 2001 From: Romain Grecourt Date: Thu, 12 Sep 2019 21:38:25 -0700 Subject: [PATCH] Fixes #1024 - Bad build time subsitution for bare archetypes pom Fixes #1025 - archetype-packaging plugin needs to be declared as an extension Reverting dependencies on helidon-metrics2 back helidon-metrics for all SE examples Removing helidon-metrics2 from the BOM pom to prevent end-user from using it Update examples/grpc/metrics README to fix test step. --- archetypes/pom.xml | 8 ++++++++ .../se/src/main/resources/archetype-resources/pom.xml | 2 +- bom/pom.xml | 5 ----- examples/employee-app/pom.xml | 2 +- examples/grpc/metrics/README.md | 5 ++--- examples/grpc/metrics/pom.xml | 2 +- examples/openapi/pom.xml | 2 +- examples/quickstarts/helidon-quickstart-se/pom.xml | 2 +- examples/todo-app/frontend/pom.xml | 2 +- .../java/io/helidon/demo/todos/frontend/TodosHandler.java | 8 +------- microprofile/metrics2/pom.xml | 1 + pom.xml | 5 ----- tests/apps/bookstore/bookstore-se/pom.xml | 2 +- 13 files changed, 19 insertions(+), 27 deletions(-) diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 5dce4af851e..2e05a231e05 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -36,6 +36,13 @@ + + + org.apache.maven.archetype + archetype-packaging + ${version.plugin.archetype-packaging} + + src/main/resources @@ -61,6 +68,7 @@ default-resources + false @ diff --git a/archetypes/se/src/main/resources/archetype-resources/pom.xml b/archetypes/se/src/main/resources/archetype-resources/pom.xml index 6c6cd9452d4..2b402f4e454 100644 --- a/archetypes/se/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/se/src/main/resources/archetype-resources/pom.xml @@ -49,7 +49,7 @@ #if( $metricsSupport.matches("y|yes|true") ) io.helidon.metrics - helidon-metrics2 + helidon-metrics #end #if( $unitTest.matches("y|yes|true") ) diff --git a/bom/pom.xml b/bom/pom.xml index aff5833763a..7e1d1128bcb 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -417,11 +417,6 @@ helidon-metrics ${helidon.version} - - io.helidon.metrics - helidon-metrics2 - ${helidon.version} - io.helidon.health diff --git a/examples/employee-app/pom.xml b/examples/employee-app/pom.xml index ee63a94e9af..b77ea7c258d 100644 --- a/examples/employee-app/pom.xml +++ b/examples/employee-app/pom.xml @@ -55,7 +55,7 @@ io.helidon.metrics - helidon-metrics2 + helidon-metrics io.helidon.media.jsonb diff --git a/examples/grpc/metrics/README.md b/examples/grpc/metrics/README.md index 6beb4fa09bc..449b01ccdb1 100644 --- a/examples/grpc/metrics/README.md +++ b/examples/grpc/metrics/README.md @@ -10,8 +10,7 @@ mvn package java -jar target/helidon-examples-grpc-metrics.jar ``` -Exercise the example: +Try the metrics: ```bash -java -cp target/helidon-examples-grpc-metrics.jar \ - io.helidon.grpc.examples.metrics.SecureStringClient +curl http://localhost:8080/metrics ``` \ No newline at end of file diff --git a/examples/grpc/metrics/pom.xml b/examples/grpc/metrics/pom.xml index 044474bbbb1..2114473e290 100644 --- a/examples/grpc/metrics/pom.xml +++ b/examples/grpc/metrics/pom.xml @@ -58,7 +58,7 @@ io.helidon.metrics - helidon-metrics2 + helidon-metrics io.helidon.grpc diff --git a/examples/openapi/pom.xml b/examples/openapi/pom.xml index 6f8b84787cf..fd04ec1a1b6 100644 --- a/examples/openapi/pom.xml +++ b/examples/openapi/pom.xml @@ -55,7 +55,7 @@ io.helidon.metrics - helidon-metrics2 + helidon-metrics io.helidon.openapi diff --git a/examples/quickstarts/helidon-quickstart-se/pom.xml b/examples/quickstarts/helidon-quickstart-se/pom.xml index 42b17741df9..af2bd2576ac 100644 --- a/examples/quickstarts/helidon-quickstart-se/pom.xml +++ b/examples/quickstarts/helidon-quickstart-se/pom.xml @@ -55,7 +55,7 @@ io.helidon.metrics - helidon-metrics2 + helidon-metrics org.junit.jupiter diff --git a/examples/todo-app/frontend/pom.xml b/examples/todo-app/frontend/pom.xml index 290cacdf1e1..8d2138b1ade 100644 --- a/examples/todo-app/frontend/pom.xml +++ b/examples/todo-app/frontend/pom.xml @@ -95,7 +95,7 @@ io.helidon.metrics - helidon-metrics2 + helidon-metrics org.glassfish.jersey.core diff --git a/examples/todo-app/frontend/src/main/java/io/helidon/demo/todos/frontend/TodosHandler.java b/examples/todo-app/frontend/src/main/java/io/helidon/demo/todos/frontend/TodosHandler.java index ac1134db0e6..3f5de26f366 100644 --- a/examples/todo-app/frontend/src/main/java/io/helidon/demo/todos/frontend/TodosHandler.java +++ b/examples/todo-app/frontend/src/main/java/io/helidon/demo/todos/frontend/TodosHandler.java @@ -33,7 +33,6 @@ import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.Metadata; -import org.eclipse.microprofile.metrics.MetadataBuilder; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.MetricType; import org.eclipse.microprofile.metrics.MetricUnits; @@ -95,12 +94,7 @@ public TodosHandler(BackendServiceClient bsc) { } private Metadata counterMetadata(String name, String description) { - return new MetadataBuilder() - .withName(name) - .withDescription(description) - .withType(MetricType.COUNTER) - .withUnit(MetricUnits.NONE) - .build(); + return new Metadata(name, name, description, MetricType.COUNTER, MetricUnits.NONE); } @Override diff --git a/microprofile/metrics2/pom.xml b/microprofile/metrics2/pom.xml index 48e016fbe79..26fdde7dcb3 100644 --- a/microprofile/metrics2/pom.xml +++ b/microprofile/metrics2/pom.xml @@ -51,6 +51,7 @@ io.helidon.metrics helidon-metrics2 + ${project.version} io.helidon.microprofile.bundles diff --git a/pom.xml b/pom.xml index 7933eaa1074..d0498c8e233 100644 --- a/pom.xml +++ b/pom.xml @@ -576,11 +576,6 @@ - - org.apache.maven.archetype - archetype-packaging - ${version.plugin.archetype-packaging} - org.apache.maven.plugins maven-archetype-plugin diff --git a/tests/apps/bookstore/bookstore-se/pom.xml b/tests/apps/bookstore/bookstore-se/pom.xml index 17a95822866..823ff95048e 100644 --- a/tests/apps/bookstore/bookstore-se/pom.xml +++ b/tests/apps/bookstore/bookstore-se/pom.xml @@ -52,7 +52,7 @@ io.helidon.metrics - helidon-metrics2 + helidon-metrics io.helidon.media.jsonb