Compilation fixes.

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

examples/cors/pom.xml

@@ -69,8 +69,8 @@
             <artifactId>helidon-reactive-webserver-cors</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.reactive.health</groupId>

examples/cors/src/main/java/io/helidon/examples/cors/Main.java

@@ -21,15 +21,15 @@
 
 import io.helidon.common.reactive.Single;
 import io.helidon.config.Config;
+import io.helidon.cors.CrossOriginConfig;
 import io.helidon.health.checks.HealthChecks;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.health.HealthSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 import io.helidon.reactive.webserver.cors.CorsSupport;
-import io.helidon.reactive.webserver.cors.CrossOriginConfig;
 
 /**
  * Simple Hello World rest application.

examples/cors/src/test/java/io/helidon/examples/cors/MainTest.java

@@ -23,14 +23,14 @@
 import io.helidon.common.http.Headers;
 import io.helidon.common.media.type.MediaTypes;
 import io.helidon.config.Config;
+import io.helidon.cors.CrossOriginConfig;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
 import io.helidon.reactive.webclient.WebClient;
 import io.helidon.reactive.webclient.WebClientRequestBuilder;
 import io.helidon.reactive.webclient.WebClientRequestHeaders;
 import io.helidon.reactive.webclient.WebClientResponse;
 import io.helidon.reactive.webclient.WebClientResponseHeaders;
 import io.helidon.reactive.webserver.WebServer;
-import io.helidon.reactive.webserver.cors.CrossOriginConfig;
 
 import jakarta.json.JsonObject;
 import org.junit.jupiter.api.AfterAll;

examples/dbclient/jdbc/pom.xml

@@ -39,8 +39,8 @@
             <artifactId>helidon-reactive-health</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.tracing</groupId>

examples/dbclient/jdbc/src/main/java/io/helidon/examples/dbclient/jdbc/JdbcExampleMain.java

@@ -18,12 +18,12 @@
 
 import io.helidon.config.Config;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.dbclient.DbClient;
 import io.helidon.reactive.dbclient.health.DbClientHealthCheck;
 import io.helidon.reactive.health.HealthSupport;
 import io.helidon.reactive.media.jsonb.JsonbSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 import io.helidon.tracing.TracerBuilder;

examples/dbclient/mongodb/pom.xml

@@ -67,8 +67,8 @@
             <artifactId>helidon-reactive-health</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.tracing</groupId>

examples/dbclient/mongodb/src/main/java/io/helidon/examples/dbclient/mongo/MongoDbExampleMain.java

@@ -18,7 +18,6 @@
 
 import io.helidon.config.Config;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.dbclient.DbClient;
 import io.helidon.reactive.dbclient.DbStatementType;
 import io.helidon.reactive.dbclient.health.DbClientHealthCheck;
@@ -27,6 +26,7 @@
 import io.helidon.reactive.health.HealthSupport;
 import io.helidon.reactive.media.jsonb.JsonbSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 import io.helidon.tracing.TracerBuilder;

examples/dbclient/pokemons/pom.xml

@@ -40,8 +40,8 @@
             <artifactId>helidon-reactive-health</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.tracing</groupId>

examples/dbclient/pokemons/src/main/java/io/helidon/examples/dbclient/pokemons/PokemonMain.java

@@ -19,12 +19,12 @@
 import io.helidon.config.Config;
 import io.helidon.config.ConfigSources;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.dbclient.DbClient;
 import io.helidon.reactive.dbclient.health.DbClientHealthCheck;
 import io.helidon.reactive.health.HealthSupport;
 import io.helidon.reactive.media.jsonb.JsonbSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 import io.helidon.tracing.TracerBuilder;

examples/employee-app/pom.xml

@@ -67,8 +67,8 @@
             <artifactId>helidon-health-checks</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.reactive.dbclient</groupId>

examples/employee-app/src/main/java/io/helidon/service/employee/Main.java

@@ -20,9 +20,9 @@
 import io.helidon.config.Config;
 import io.helidon.health.checks.HealthChecks;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.health.HealthSupport;
 import io.helidon.reactive.media.jsonb.JsonbSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 import io.helidon.reactive.webserver.staticcontent.StaticContentSupport;

examples/integrations/microstream/greetings-se/pom.xml

@@ -52,8 +52,8 @@
             <artifactId>helidon-health-checks</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>

examples/integrations/microstream/greetings-se/src/main/java/io/helidon/examples/integrations/microstream/greetings/se/Main.java

@@ -22,9 +22,9 @@
 import io.helidon.config.Config;
 import io.helidon.health.checks.HealthChecks;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.health.HealthSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 

examples/integrations/neo4j/neo4j-se/pom.xml

@@ -62,8 +62,8 @@
             <artifactId>helidon-health-checks</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>

examples/integrations/neo4j/neo4j-se/src/main/java/io/helidon/examples/integrations/neo4j/se/Main.java

@@ -28,10 +28,10 @@
 import io.helidon.integrations.neo4j.health.Neo4jHealthCheck;
 import io.helidon.integrations.neo4j.metrics.Neo4jMetricsSupport;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.health.HealthSupport;
 import io.helidon.reactive.media.jsonb.JsonbSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 

examples/metrics/exemplar/pom.xml

@@ -46,12 +46,8 @@
             <artifactId>helidon-reactive-media-jsonp</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>

examples/metrics/exemplar/src/main/java/io/helidon/examples/metrics/exemplar/Main.java

@@ -19,8 +19,8 @@
 import io.helidon.common.reactive.Single;
 import io.helidon.config.Config;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 import io.helidon.tracing.TracerBuilder;

examples/metrics/filtering/se/pom.xml

@@ -43,12 +43,8 @@
             <artifactId>helidon-reactive-media-jsonp</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>

examples/metrics/filtering/se/src/main/java/io/helidon/examples/metrics/filtering/se/Main.java

@@ -23,8 +23,8 @@
 import io.helidon.metrics.api.RegistryFactory;
 import io.helidon.metrics.api.RegistryFilterSettings;
 import io.helidon.metrics.api.RegistrySettings;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 

examples/metrics/http-status-count-se/pom.xml

@@ -46,9 +46,14 @@
             <groupId>io.helidon.config</groupId>
             <artifactId>helidon-config-yaml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
             <artifactId>helidon-metrics</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.reactive.health</groupId>

examples/metrics/http-status-count-se/src/main/java/io/helidon/examples/se/httpstatuscount/Main.java

@@ -19,9 +19,9 @@
 import io.helidon.config.Config;
 import io.helidon.health.checks.HealthChecks;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.MetricsSupport;
 import io.helidon.reactive.health.HealthSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 

examples/metrics/kpi/pom.xml

@@ -43,12 +43,8 @@
             <artifactId>helidon-reactive-media-jsonp</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>

examples/metrics/kpi/src/main/java/io/helidon/examples/metrics/kpi/Main.java

@@ -21,8 +21,8 @@
 import io.helidon.logging.common.LogConfig;
 import io.helidon.metrics.api.KeyPerformanceIndicatorMetricsSettings;
 import io.helidon.metrics.api.MetricsSettings;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 

examples/openapi/pom.xml

@@ -51,16 +51,16 @@
             <artifactId>helidon-reactive-health</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.health</groupId>
-            <artifactId>helidon-health-checks</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.openapi</groupId>
+            <artifactId>helidon-reactive-openapi</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.openapi</groupId>
-            <artifactId>helidon-openapi</artifactId>
+            <groupId>io.helidon.health</groupId>
+            <artifactId>helidon-health-checks</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>

examples/openapi/src/main/java/io/helidon/examples/openapi/Main.java

@@ -20,10 +20,10 @@
 import io.helidon.config.Config;
 import io.helidon.health.checks.HealthChecks;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.serviceapi.MetricsSupport;
-import io.helidon.openapi.OpenAPISupport;
 import io.helidon.reactive.health.HealthSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
+import io.helidon.reactive.openapi.OpenAPISupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 

examples/todo-app/frontend/pom.xml

@@ -103,12 +103,8 @@
             <artifactId>helidon-security-integration-jersey-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>

examples/todo-app/frontend/src/main/java/io/helidon/demo/todos/frontend/Main.java

@@ -23,8 +23,8 @@
 import io.helidon.config.Config;
 import io.helidon.config.FileSystemWatcher;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;
 import io.helidon.reactive.webserver.accesslog.AccessLogSupport;

examples/webclient/standalone/pom.xml

@@ -44,8 +44,8 @@
             <artifactId>helidon-config-yaml</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>

examples/webclient/standalone/src/main/java/io/helidon/examples/webclient/standalone/ServerMain.java

@@ -17,7 +17,7 @@
 
 import io.helidon.common.reactive.Single;
 import io.helidon.config.Config;
-import io.helidon.metrics.serviceapi.MetricsSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.media.jsonp.JsonpSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;

examples/webserver/multiport/pom.xml

@@ -52,8 +52,8 @@
             <artifactId>helidon-health-checks</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-service-api</artifactId>
+            <groupId>io.helidon.reactive.metrics</groupId>
+            <artifactId>helidon-reactive-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>

examples/webserver/multiport/src/main/java/io/helidon/examples/webserver/multiport/Main.java

@@ -20,8 +20,8 @@
 import io.helidon.config.Config;
 import io.helidon.health.checks.HealthChecks;
 import io.helidon.logging.common.LogConfig;
-import io.helidon.metrics.serviceapi.MetricsSupport;
 import io.helidon.reactive.health.HealthSupport;
+import io.helidon.reactive.metrics.MetricsSupport;
 import io.helidon.reactive.webserver.Routing;
 import io.helidon.reactive.webserver.WebServer;