fix archetype jackson native image config

Signed-off-by: tvallin <thibault.vallin@oracle.com>
tvallin · Apr 25, 2024 · 5761bff · 5761bff
1 parent 971158c
commit 5761bff
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -157,6 +157,13 @@ jobs:
         run: |
           etc/scripts/test-archetypes.sh
           etc/scripts/test-archetypes-executable.sh
+      - name: Update failing project
+        uses: actions/upload-artifact@v3.1.2
+        with:
+          if-no-files-found: 'ignore'
+          name: test-results
+          path: |
+            **/target/projects/myproject-24/**/*
   packaging:
     timeout-minutes: 60
     strategy:

diff --git a/archetypes/archetypes/src/main/archetype/common/docker.xml b/archetypes/archetypes/src/main/archetype/common/docker.xml
@@ -36,7 +36,8 @@
                         <templates engine="mustache" transformations="mustache,native-image">
                             <directory>files</directory>
                             <includes>
-                                <include>src/*/resources/META-INF/**/*.mustache</include>
+                                <include>src/*/resources/META-INF/**/native-image.properties.mustache</include>
+                                <include if="${flavor} == 'mp' &amp;&amp; ${media.json-lib} == 'jackson'">src/*/resources/META-INF/**/resource-config.json.mustache</include>
                             </includes>
                         </templates>
                     </output>
@@ -63,7 +64,10 @@
                 </templates>
                 <model>
                     <list key="native-image-initialize-at-build-time" if="${flavor} == 'mp'">
-                        <value if="${media} contains 'jackson'">com.fasterxml.jackson.core</value>
+                        <value if="${media.json-lib} == 'jackson'">com.fasterxml.jackson.core</value>
+                    </list>
+                    <list key="bundles" if="${flavor} == 'mp'">
+                        <value if="${media.json-lib} == 'jackson'">{"name":"jakarta.xml.bind.Messages"}</value>
                     </list>
                     <list key="poms" if="!${multi-module}">
                         <value>ADD pom.xml .</value>

diff --git a/...src/main/resources/META-INF/native-image/groupid/artifactid/resource-config.json.mustache b/...src/main/resources/META-INF/native-image/groupid/artifactid/resource-config.json.mustache
@@ -0,0 +1,7 @@
+{
+  "bundles": [
+    {{#bundles}}
+    {{.}}
+    {{/bundles}}
+  ]
+}