From 69fed9e46d6f106f9b0007f40a500457b2c47840 Mon Sep 17 00:00:00 2001
From: tvallin <thibault.vallin@oracle.com>
Date: Thu, 21 Mar 2024 11:11:27 +0100
Subject: [PATCH] Add opens WEB to module info for multipart

Signed-off-by: tvallin <thibault.vallin@oracle.com>
---
 .../common/files/src/main/java/module-info.java.mustache     | 5 ++++-
 archetypes/archetypes/src/main/archetype/common/media.xml    | 5 ++++-
 .../archetypes/src/main/archetype/mp/custom/custom-mp.xml    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/archetypes/archetypes/src/main/archetype/common/files/src/main/java/module-info.java.mustache b/archetypes/archetypes/src/main/archetype/common/files/src/main/java/module-info.java.mustache
index 3b0a8490f84..4e520db9fc8 100644
--- a/archetypes/archetypes/src/main/archetype/common/files/src/main/java/module-info.java.mustache
+++ b/archetypes/archetypes/src/main/archetype/common/files/src/main/java/module-info.java.mustache
@@ -7,6 +7,9 @@ module {{package}} {
     exports {{package}};
 
 {{#module-opens}}
-    opens {{package}};
+    opens {{.}};
 {{/module-opens}}
+{{#module-opens-package}}
+    opens {{package}};
+{{/module-opens-package}}
 }
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/common/media.xml b/archetypes/archetypes/src/main/archetype/common/media.xml
index ac069349f06..7d38a3103c5 100644
--- a/archetypes/archetypes/src/main/archetype/common/media.xml
+++ b/archetypes/archetypes/src/main/archetype/common/media.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -172,6 +172,9 @@
                                 <value>jakarta.json</value>
                                 <value>jersey.media.multipart</value>
                             </list>
+                            <list key="module-opens" if="${flavor} == 'se'">
+                                <value>WEB</value>
+                            </list>
                             <list key="Main-helidon-imports" if="${flavor} == 'se'">
                                 <value>io.helidon.http.Status</value>
                                 <value>io.helidon.http.HeaderNames</value>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/custom-mp.xml b/archetypes/archetypes/src/main/archetype/mp/custom/custom-mp.xml
index 158b84d8bdc..da43804981e 100644
--- a/archetypes/archetypes/src/main/archetype/mp/custom/custom-mp.xml
+++ b/archetypes/archetypes/src/main/archetype/mp/custom/custom-mp.xml
@@ -97,7 +97,7 @@ Hello World!
                 <value>io.helidon.microprofile.config</value>
                 <value>io.helidon.microprofile.server</value>
             </list>
-            <value key="module-opens">true</value>
+            <value key="module-opens-package">true</value>
         </model>
     </output>
 </archetype-script>