From 6239b1044412efe2c15671e6ef34ad6b4fb21e7c Mon Sep 17 00:00:00 2001
From: tvallin <thibault.vallin@oracle.com>
Date: Fri, 7 Jun 2024 12:03:10 +0200
Subject: [PATCH] Fix UI + rebase on main

Signed-off-by: tvallin <thibault.vallin@oracle.com>
---
 .../main/archetype/features/packaging/docker/output.xml   | 6 ------
 .../src/main/archetype/mp/features/media/output.xml       | 3 +++
 .../observability/metrics/includes/output-micrometer.xml  | 2 +-
 .../mp/features/observability/metrics/output.xml          | 6 ++++--
 .../archetypes/src/main/archetype/mp/features/output.xml  | 1 +
 .../xml/bind/jakarta.xml.bind-api/resource-config.json    | 0
 .../archetype/mp/features/packaging/docker/output.xml     | 8 +++++++-
 .../src/main/archetype/mp/features/packaging/output.xml   | 4 ++--
 .../archetypes/src/main/archetype/se/features/output.xml  | 1 +
 .../src/main/archetype/se/features/packaging/output.xml   | 2 +-
 .../src/main/archetype/se/features/security/output.xml    | 4 ++--
 11 files changed, 22 insertions(+), 15 deletions(-)
 rename archetypes/archetypes/src/main/archetype/{common => mp/features/packaging/docker}/files/src/main/resources/META-INF/native-image/jakarta/xml/bind/jakarta.xml.bind-api/resource-config.json (100%)

diff --git a/archetypes/archetypes/src/main/archetype/features/packaging/docker/output.xml b/archetypes/archetypes/src/main/archetype/features/packaging/docker/output.xml
index 88d576a0d81..7b13a3bf37e 100644
--- a/archetypes/archetypes/src/main/archetype/features/packaging/docker/output.xml
+++ b/archetypes/archetypes/src/main/archetype/features/packaging/docker/output.xml
@@ -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>
diff --git a/archetypes/archetypes/src/main/archetype/mp/features/media/output.xml b/archetypes/archetypes/src/main/archetype/mp/features/media/output.xml
index fa969261ee9..a0b1752dd25 100644
--- a/archetypes/archetypes/src/main/archetype/mp/features/media/output.xml
+++ b/archetypes/archetypes/src/main/archetype/mp/features/media/output.xml
@@ -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
diff --git a/archetypes/archetypes/src/main/archetype/mp/features/observability/metrics/includes/output-micrometer.xml b/archetypes/archetypes/src/main/archetype/mp/features/observability/metrics/includes/output-micrometer.xml
index 4299cde88c0..660f09d2d7c 100644
--- a/archetypes/archetypes/src/main/archetype/mp/features/observability/metrics/includes/output-micrometer.xml
+++ b/archetypes/archetypes/src/main/archetype/mp/features/observability/metrics/includes/output-micrometer.xml
@@ -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>
diff --git a/archetypes/archetypes/src/main/archetype/mp/features/observability/metrics/output.xml b/archetypes/archetypes/src/main/archetype/mp/features/observability/metrics/output.xml
index e6eafea60eb..51dbd7be5f7 100644
--- a/archetypes/archetypes/src/main/archetype/mp/features/observability/metrics/output.xml
+++ b/archetypes/archetypes/src/main/archetype/mp/features/observability/metrics/output.xml
@@ -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>
diff --git a/archetypes/archetypes/src/main/archetype/mp/features/output.xml b/archetypes/archetypes/src/main/archetype/mp/features/output.xml
index b78eb1d22f5..f588b4c3178 100644
--- a/archetypes/archetypes/src/main/archetype/mp/features/output.xml
+++ b/archetypes/archetypes/src/main/archetype/mp/features/output.xml
@@ -20,6 +20,7 @@
 <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"/>
diff --git a/archetypes/archetypes/src/main/archetype/common/files/src/main/resources/META-INF/native-image/jakarta/xml/bind/jakarta.xml.bind-api/resource-config.json b/archetypes/archetypes/src/main/archetype/mp/features/packaging/docker/files/src/main/resources/META-INF/native-image/jakarta/xml/bind/jakarta.xml.bind-api/resource-config.json
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/src/main/resources/META-INF/native-image/jakarta/xml/bind/jakarta.xml.bind-api/resource-config.json
rename to archetypes/archetypes/src/main/archetype/mp/features/packaging/docker/files/src/main/resources/META-INF/native-image/jakarta/xml/bind/jakarta.xml.bind-api/resource-config.json
diff --git a/archetypes/archetypes/src/main/archetype/mp/features/packaging/docker/output.xml b/archetypes/archetypes/src/main/archetype/mp/features/packaging/docker/output.xml
index 80a0b3c8d4f..21d5ee47ecf 100644
--- a/archetypes/archetypes/src/main/archetype/mp/features/packaging/docker/output.xml
+++ b/archetypes/archetypes/src/main/archetype/mp/features/packaging/docker/output.xml
@@ -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>
diff --git a/archetypes/archetypes/src/main/archetype/mp/features/packaging/output.xml b/archetypes/archetypes/src/main/archetype/mp/features/packaging/output.xml
index 0ed59d73550..68b165ccc37 100644
--- a/archetypes/archetypes/src/main/archetype/mp/features/packaging/output.xml
+++ b/archetypes/archetypes/src/main/archetype/mp/features/packaging/output.xml
@@ -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>
diff --git a/archetypes/archetypes/src/main/archetype/se/features/output.xml b/archetypes/archetypes/src/main/archetype/se/features/output.xml
index 33ea2ec029d..7f4e895f798 100644
--- a/archetypes/archetypes/src/main/archetype/se/features/output.xml
+++ b/archetypes/archetypes/src/main/archetype/se/features/output.xml
@@ -20,6 +20,7 @@
 <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}"/>
diff --git a/archetypes/archetypes/src/main/archetype/se/features/packaging/output.xml b/archetypes/archetypes/src/main/archetype/se/features/packaging/output.xml
index 2e950c854fb..e724c6a50c3 100644
--- a/archetypes/archetypes/src/main/archetype/se/features/packaging/output.xml
+++ b/archetypes/archetypes/src/main/archetype/se/features/packaging/output.xml
@@ -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>
diff --git a/archetypes/archetypes/src/main/archetype/se/features/security/output.xml b/archetypes/archetypes/src/main/archetype/se/features/security/output.xml
index 9556c77e6a3..3f655899b62 100644
--- a/archetypes/archetypes/src/main/archetype/se/features/security/output.xml
+++ b/archetypes/archetypes/src/main/archetype/se/features/security/output.xml
@@ -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>