Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.x: Remove unnecessary metrics dependencies MP quickstart archetype #7710

Merged
merged 5 commits into from
Oct 6, 2023
Merged

4.x: Remove unnecessary metrics dependencies MP quickstart archetype #7710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c39da6
fix metrics dependencies
tvallin Oct 3, 2023
f67f433
remove metrics duplicate
tvallin Oct 3, 2023
fe28e06
remove unused import
tvallin Oct 3, 2023
a45fc48
review changes
tvallin Oct 4, 2023
2cb2203
remove oci metric dependencies
tvallin Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions archetypes/helidon/src/main/archetype/common/extra.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,6 @@ java -cp "target/classes:target/libs/*" {{package}}.WebClientMain PORT
<value key="groupId">io.helidon.microprofile.metrics</value>
<value key="artifactId">helidon-microprofile-metrics</value>
</map>
<map>
<value key="groupId">io.helidon.metrics</value>
<value key="artifactId">helidon-metrics</value>
<value key="scope">runtime</value>
</map>
</list>
<list key="modules">
<value if="${flavor} == 'mp'">io.helidon.microprofile.faulttolerance</value>
Expand Down
16 changes: 3 additions & 13 deletions archetypes/helidon/src/main/archetype/common/observability.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
]]></value>
</list>
<list key="dependencies">
<map>
<value key="groupId">io.helidon.metrics</value>
<value key="artifactId">helidon-metrics</value>
<value key="scope">runtime</value>
</map>
<map>
tvallin marked this conversation as resolved.
Show resolved Hide resolved
<value key="groupId">org.eclipse.microprofile.metrics</value>
<value key="artifactId">microprofile-metrics-api</value>
Expand Down Expand Up @@ -160,13 +155,12 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
<model>
<list key="dependencies">
<map>
<value key="groupId">io.helidon.metrics</value>
<value key="artifactId">helidon-metrics-api</value>
<value key="scope">runtime</value>
<value key="groupId">io.helidon.webserver.observe</value>
<value key="artifactId">helidon-webserver-observe-metrics</value>
</map>
<map>
<value key="groupId">io.helidon.metrics</value>
<value key="artifactId">helidon-metrics</value>
<value key="artifactId">helidon-metrics-system-meters</value>
<value key="scope">runtime</value>
</map>
<map>
Expand Down Expand Up @@ -274,10 +268,6 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
<value key="artifactId">helidon-metrics-system-meters</value>
<value key="scope">runtime</value>
</map>
<map if="${flavor} == 'mp'">
<value key="groupId">io.helidon.metrics</value>
<value key="artifactId">helidon-metrics</value>
</map>
</list>
<list key="Abstract-tests" if="${flavor} == 'se'">
<value><![CDATA[
Expand Down
3 changes: 0 additions & 3 deletions ...in/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.json.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@

package {{package}};

import java.util.Collections;

{{#SimpleGreetService-imports}}
import {{.}};
{{/SimpleGreetService-imports}}

import jakarta.enterprise.context.RequestScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
Expand Down
3 changes: 0 additions & 3 deletions ...n/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.jsonp.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@

package {{package}};

import java.util.Collections;

{{#SimpleGreetService-imports}}
import {{.}};
{{/SimpleGreetService-imports}}

import jakarta.enterprise.context.RequestScoped;
import jakarta.inject.Inject;
import jakarta.json.Json;
import jakarta.json.JsonBuilderFactory;
Expand Down
3 changes: 0 additions & 3 deletions ...rc/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@

package {{package}};

import java.util.Collections;

{{#SimpleGreetService-imports}}
import {{.}};
{{/SimpleGreetService-imports}}

import jakarta.enterprise.context.RequestScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
Expand Down
5 changes: 0 additions & 5 deletions archetypes/helidon/src/main/archetype/mp/oci/oci-mp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,6 @@ ocimetrics:
<value key="artifactId">jandex</value>
<value key="scope">runtime</value>
</map>
<map order="0">
<value key="groupId">io.helidon.metrics</value>
<value key="artifactId">helidon-metrics</value>
<value key="scope">runtime</value>
</map>
<map order="0">
<value key="groupId">org.junit.jupiter</value>
<value key="artifactId">junit-jupiter-api</value>
Expand Down
4 changes: 0 additions & 4 deletions archetypes/helidon/src/main/archetype/se/custom/database.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,10 +345,6 @@ docker run --rm --name mongo -p 27017:27017 mongo
<value key="groupId">io.helidon.config</value>
<value key="artifactId">helidon-config-yaml</value>
</map>
<map>
<value key="groupId">io.helidon.metrics</value>
<value key="artifactId">helidon-metrics</value>
</map>
<map if="${server} != 'h2'">
<value key="groupId">com.h2database</value>
<value key="artifactId">h2</value>
Expand Down