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: Archetype - Generated projects does not contains empty application.yaml #7942

Merged
merged 1 commit into from
Nov 6, 2023
+18 −1
Merged

4.x: Archetype - Generated projects does not contains empty application.yaml #7942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions archetypes/helidon/src/main/archetype/common/security.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,5 +342,8 @@ security:
</output>
</boolean>
</inputs>
<variables>
<boolean path="application-yaml" if="${security}">true</boolean>
</variables>
</step>
</archetype-script>
10 changes: 9 additions & 1 deletion 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 @@ -20,7 +20,9 @@
<archetype-script xmlns="https://helidon.io/archetype/2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">

<variables>
<boolean path="application-yaml">false</boolean>
</variables>
<exec src="/mp/common/common-mp.xml"/>
<exec src="/common/media.xml"/>
<source src="/common/media-sources.xml"/>
Expand All @@ -32,6 +34,12 @@
<source src="observability.xml"/>
<exec src="database-outputs.xml" if="${db}"/>
<output>
<templates engine="mustache" transformations="mustache" if="${application-yaml}">
<directory>files</directory>
<includes>
<include>src/*/resources/**/application.yaml.mustache</include>
</includes>
</templates>
<model>
<value key="helidon-test">true</value>
<value key="mainClass" if="${jpms}">${package}.Main</value>
Expand Down
0 .../main/resources/application.yaml.mustache → .../main/resources/application.yaml.mustache
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 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 @@ -51,6 +51,12 @@ This will mount `~/.oci` as a volume in the running docker container.
<exec src="/common/common.xml"/>
<exec src="/common/packaging.xml"/>
<output>
<templates engine="mustache" transformations="mustache,module-dir">
<directory>../custom/files</directory>
<includes>
<include>src/*/resources/**/application.yaml.mustache</include>
</includes>
</templates>
<templates engine="mustache" transformations="mustache,packaged">
<directory>files</directory>
<includes>
Expand Down