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.
helidon-io · Sep 13, 2019 · be5bbd9 · be5bbd9
1 parent b5a2836
commit be5bbd9
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 27 deletions.
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -36,6 +36,13 @@
     </modules>
 
     <build>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.archetype</groupId>
+                <artifactId>archetype-packaging</artifactId>
+                <version>${version.plugin.archetype-packaging}</version>
+            </extension>
+        </extensions>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -61,6 +68,7 @@
                         <execution>
                             <id>default-resources</id>
                             <configuration>
+                                <useDefaultDelimiters>false</useDefaultDelimiters>
                                 <delimiters>
                                     <delimiter>@</delimiter>
                                 </delimiters>

diff --git 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") )
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics2</artifactId>
+            <artifactId>helidon-metrics</artifactId>
         </dependency>
 #end
 #if( $unitTest.matches("y|yes|true") )

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -417,11 +417,6 @@
                 <artifactId>helidon-metrics</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.helidon.metrics</groupId>
-                <artifactId>helidon-metrics2</artifactId>
-                <version>${helidon.version}</version>
-            </dependency>
             <!-- health checks -->
             <dependency>
                 <groupId>io.helidon.health</groupId>

diff --git a/examples/employee-app/pom.xml b/examples/employee-app/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics2</artifactId>
+            <artifactId>helidon-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.media.jsonb</groupId>

diff --git 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
 ```
diff --git a/examples/grpc/metrics/pom.xml b/examples/grpc/metrics/pom.xml
@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics2</artifactId>
+            <artifactId>helidon-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.grpc</groupId>

diff --git a/examples/openapi/pom.xml b/examples/openapi/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics2</artifactId>
+            <artifactId>helidon-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.openapi</groupId>

diff --git a/examples/quickstarts/helidon-quickstart-se/pom.xml b/examples/quickstarts/helidon-quickstart-se/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics2</artifactId>
+            <artifactId>helidon-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/examples/todo-app/frontend/pom.xml b/examples/todo-app/frontend/pom.xml
@@ -95,7 +95,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics2</artifactId>
+            <artifactId>helidon-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>

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
@@ -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
@@ -51,6 +51,7 @@
         <dependency>
             <groupId>io.helidon.metrics</groupId>
             <artifactId>helidon-metrics2</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>

diff --git a/pom.xml b/pom.xml
@@ -576,11 +576,6 @@
                         </dependency>
                     </dependencies>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.archetype</groupId>
-                    <artifactId>archetype-packaging</artifactId>
-                    <version>${version.plugin.archetype-packaging}</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-archetype-plugin</artifactId>

diff --git a/tests/apps/bookstore/bookstore-se/pom.xml b/tests/apps/bookstore/bookstore-se/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics2</artifactId>
+            <artifactId>helidon-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.media.jsonb</groupId>