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

Jump to bottom

4.x: Archetype : generate module-info file #7232

Merged
merged 2 commits into from
Jul 25, 2023
Merged

4.x: Archetype : generate module-info file #7232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97caadc
generate module-info
tvallin Jul 21, 2023
3f43710
Review changes
tvallin Jul 25, 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
1 change: 1 addition & 0 deletions archetypes/helidon/src/main/archetype/common/common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<includes>
<include>.helidon.mustache</include>
<include>README.md.mustache</include>
<include>src/main/java/module-info.java.mustache</include>
</includes>
</templates>
<model>
Expand Down
7 changes: 6 additions & 1 deletion 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 @@ -44,6 +44,9 @@
<value key="artifactId">helidon-microprofile-metrics</value>
</map>
</list>
<list key="modules">
<value>io.helidon.microprofile.faulttolerance</value>
</list>
<list key="Main-helidon-imports">
<value>io.helidon.common.http.Http</value>
</list>
Expand Down Expand Up @@ -88,7 +91,9 @@
<value>jakarta.ws.rs.core.Response</value>
<value>jakarta.ws.rs.HttpMethod</value>
</list>

<list key="modules">
<value>io.helidon.microprofile.cors</value>
</list>
<list key="FileServiceTest-annotations" if="${media} contains 'multipart'">
<value>@AddExtension(CorsCdiExtension.class)</value>
</list>
Expand Down
6 changes: 6 additions & 0 deletions archetypes/helidon/src/main/archetype/common/files/src/main/java/module-info.java.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

module {{package}} {
{{#modules}}
requires {{.}};
{{/modules}}
}
18 changes: 18 additions & 0 deletions archetypes/helidon/src/main/archetype/common/media.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
}
]]></value>
</list>
<list key="modules">
<value>jakarta.json</value>
</list>
</model>
</output>
</option>
Expand All @@ -80,6 +83,9 @@
<value key="scope">runtime</value>
</map>
</list>
<list key="modules">
<value>com.fasterxml.jackson.annotation</value>
</list>
</model>
</output>
</option>
Expand Down Expand Up @@ -123,6 +129,9 @@
}
]]></value>
</list>
<list key="modules">
<value>jakarta.json</value>
</list>
</model>
</output>
</option>
Expand Down Expand Up @@ -154,6 +163,15 @@
<value key="artifactId">jakarta.json-api</value>
</map>
</list>
<list key="modules" if="${flavor} == 'nima'">
<value>jakarta.json</value>
<value>io.helidon.nima.http.media.multipart</value>
<value>io.helidon.nima.webserver.staticcontent</value>
</list>
<list key="modules" if="${flavor} == 'mp'">
<value>jakarta.json</value>
<value>jersey.media.multipart</value>
</list>
<list key="Main-helidon-imports" if="${flavor} == 'nima'">
<value>io.helidon.common.http.Http</value>
<value>io.helidon.common.http.Http.Header</value>
Expand Down
3 changes: 3 additions & 0 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 @@ -127,6 +127,9 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
@Inject
private MetricRegistry registry;]]></value>
</list>
<list key="modules">
<value if="${flavor} == 'mp'">io.helidon.microprofile.metrics</value>
</list>
</model>
</output>
</option>
Expand Down
1 change: 0 additions & 1 deletion archetypes/helidon/src/main/archetype/mp/common/common-mp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<map>
<value key="groupId">jakarta.activation</value>
<value key="artifactId">jakarta.activation-api</value>
<value key="scope">runtime</value>
</map>
<map order="0">
<value key="groupId">org.junit.jupiter</value>
Expand Down
6 changes: 6 additions & 0 deletions archetypes/helidon/src/main/archetype/mp/custom/custom-mp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@
<value key="artifactId">helidon-microprofile-core</value>
</map>
</list>
<list key="modules">
<value>jakarta.cdi</value>
<value>jakarta.inject</value>
<value>jakarta.ws.rs</value>
<value>io.helidon.microprofile.config</value>
</list>
</model>
</output>
</archetype-script>
3 changes: 3 additions & 0 deletions archetypes/helidon/src/main/archetype/mp/custom/database.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,9 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
<value key="scope">runtime</value>
</map>
</list>
<list key="modules">
<value>jakarta.xml.bind</value>
</list>
<list key="maven-plugins">
<value><![CDATA[ <plugin>
<groupId>com.evolvedbinary.maven.jvnet</groupId>
Expand Down
5 changes: 5 additions & 0 deletions archetypes/helidon/src/main/archetype/mp/database/database-mp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
<list key="readme-exercise-the-application">
<value file="files/README.md"/>
</list>
<list key="modules">
<value>jakarta.annotation</value>
<value>jakarta.persistence</value>
<value>jakarta.transaction</value>
</list>
</model>
</output>
</archetype-script>
3 changes: 3 additions & 0 deletions archetypes/helidon/src/main/archetype/mp/quickstart/quickstart-mp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@
<value key="artifactId">helidon-microprofile-openapi</value>
</map>
</list>
<list key="modules">
<value>io.helidon.microprofile.openapi</value>
</list>
</model>
</output>
</archetype-script>
5 changes: 5 additions & 0 deletions archetypes/helidon/src/main/archetype/nima/common/common-nima.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
<value>static org.hamcrest.MatcherAssert.assertThat</value>
<value>static org.hamcrest.Matchers.is</value>
</list>
<list key="modules">
<value>io.helidon.nima.webserver</value>
<value>io.helidon.common.http</value>
<value>io.helidon.config</value>
</list>
</model>
</output>
</archetype-script>
3 changes: 3 additions & 0 deletions archetypes/helidon/src/main/archetype/nima/custom/custom-nima.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ curl -X GET http://localhost:8080/simple-greet
```
]]></value>
</list>
<list key="modules">
<value>io.helidon.logging.common</value>
</list>
</model>
</output>
</archetype-script>
10 changes: 10 additions & 0 deletions archetypes/helidon/src/main/archetype/nima/custom/observability.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,16 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/observe/metrics

]]></value>
</list>
<list key="modules">
<value>io.helidon.nima.observe</value>
<value if="${health}">io.helidon.nima.observe.health</value>
<value if="${health}">io.helidon.health.checks</value>
<value if="${metrics}">io.helidon.nima.observe.metrics</value>
<value if="${metrics}">io.helidon.metrics.api</value>
<value if="${tracing}">io.helidon.nima.http2.webserver</value>
<value if="${tracing}">io.helidon.nima.webserver.tracing</value>
<value if="${tracing}">io.helidon.tracing</value>
</list>
</model>
</output>
</archetype-script>
3 changes: 3 additions & 0 deletions archetypes/helidon/src/main/archetype/nima/quickstart/quickstart-nima.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ curl -X GET http://localhost:8080/greet/Jose
<value key="artifactId">helidon-nima-webclient</value>
</map>
</list>
<list key="modules">
<value>io.helidon.nima.webclient</value>
</list>
</model>
</output>
</archetype-script>
Loading