Skip to content

Commit

Permalink
Fix UI + rebase on main
Browse files Browse the repository at this point in the history
Signed-off-by: tvallin <thibault.vallin@oracle.com>
  • Loading branch information
tvallin committed Jun 7, 2024
1 parent f2a3b63 commit ccdb972
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,6 @@ Exercise the application as described above.
<include>src/*/resources/META-INF/**/*.mustache</include>
</includes>
</templates>
<files if="${flavor} == 'mp' &amp;&amp; ${media.json-lib} == 'jackson'">
<directory>files</directory>
<includes>
<include>src/**/native-image/**/resource-config.json</include>
</includes>
</files>
<templates engine="mustache" transformations="mustache" if="${docker.native-image}">
<directory>files</directory>
<includes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@
<value key="artifactId">jakarta.xml.bind-api</value>
</map>
</list>
<list key="initialize-at-build-time">
<value>com.fasterxml.jackson.core</value>
</list>
<list key="MainTest-methods">
<value order="0"><![CDATA[
@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</methods>
<call method="metric-micrometer-json"/>
<call method="metric-micrometer"/>
<output>
<output if="${metrics.provider} == 'micrometer'">
<model>
<list key="dependencies">
<map>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
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">

<exec src="includes/output-microprofile.xml" if="${metrics.provider} == 'microprofile'"/>
<exec src="includes/output-micrometer.xml" if="${metrics.provider} == 'micrometer'"/>
<!-- <exec src="includes/output-microprofile.xml" if="${metrics.provider} == 'microprofile'"/>-->
<!-- <exec src="includes/output-micrometer.xml" if="${metrics.provider} == 'micrometer'"/>-->
<exec src="includes/output-microprofile.xml"/>
<exec src="includes/output-micrometer.xml"/>
</archetype-script>
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
<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">
<exec src="common/output.xml"/>

<exec src="media/output.xml"/>
<exec src="extra/output.xml"/>
<exec src="observability/output.xml"/>
<exec src="packaging/output.xml"/>
<exec src="security/output.xml" if="${security}"/>
<exec src="database/output.xml" if="${db}"/>
<exec src="common/output.xml"/>
</archetype-script>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@
<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">
<output>
<output if="${docker}">
<files if="${media} contains 'json' &amp;&amp; ${media.json-lib} == 'jackson'">
<directory>files</directory>
<includes>
<include>src/**/native-image/**/resource-config.json</include>
</includes>
</files>
<model>
<list key="docker-phase1-options">
<value>-Declipselink.weave.skip</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<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">
<exec src="docker/output.xml" if="${docker}"/>
<exec src="jpms/output.xml" if="${jpms}"/>
<exec src="docker/output.xml"/>
<exec src="jpms/output.xml"/>
</archetype-script>
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
<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">
<exec src="common/output.xml"/>

<exec src="media/output.xml"/>
<exec src="security/output.xml" if="${security}"/>
<exec src="database/output.xml" if="${db}"/>
<exec src="extra/output.xml"/>
<exec src="observability/output.xml"/>
<exec src="packaging/output.xml" if="${docker}"/>
<exec src="common/output.xml"/>
</archetype-script>
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
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">

<exec src="docker/output.xml" if="${docker}"/>
<exec src="docker/output.xml"/>
</archetype-script>
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,8 @@ curl -v -u "john:changeit" http://localhost:8080/service1
</output>
</method>
<method name="security-abac">
<output if="${security.atz} contains ['abac']">
<model>
<output if="${security}">
<model if="${security.atz} contains ['abac']">
<list key="dependencies">
<map>
<value key="groupId">io.helidon.security.abac</value>
Expand Down

0 comments on commit ccdb972

Please sign in to comment.