Skip to content

Commit be27e30

Browse files
authored
fix Json code duplication (helidon-io#8507)
Signed-off-by: tvallin <thibault.vallin@oracle.com>
1 parent 977c567 commit be27e30

1 file changed

Lines changed: 13 additions & 24 deletions

File tree

  • archetypes/archetypes/src/main/archetype/common

archetypes/archetypes/src/main/archetype/common/media.xml

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@
3434
<option value="jsonp" name="JSON-P" description="Jakarta JSON Processing" if="${flavor} == 'se'">
3535
<output>
3636
<model>
37-
<list key="dependencies">
38-
<map>
39-
<value key="groupId">jakarta.json</value>
40-
<value key="artifactId">jakarta.json-api</value>
41-
</map>
42-
<map>
43-
<value key="groupId">io.helidon.http.media</value>
44-
<value key="artifactId">helidon-http-media-jsonp</value>
45-
</map>
46-
</list>
4737
<list key="MainTest-other-imports">
4838
<value>jakarta.json.JsonObject</value>
4939
</list>
@@ -57,9 +47,6 @@
5747
}
5848
]]></value>
5949
</list>
60-
<list key="module-requires">
61-
<value>jakarta.json</value>
62-
</list>
6350
</model>
6451
</output>
6552
</option>
@@ -129,7 +116,6 @@
129116
]]></value>
130117
</list>
131118
<list key="module-requires">
132-
<value>jakarta.json</value>
133119
<value>jakarta.json.bind</value>
134120
</list>
135121
</model>
@@ -150,26 +136,16 @@
150136
<value key="groupId">io.helidon.http.media</value>
151137
<value key="artifactId">helidon-http-media-multipart</value>
152138
</map>
153-
<map order="500" if="${flavor} == 'se'">
154-
<value key="groupId">io.helidon.http.media</value>
155-
<value key="artifactId">helidon-http-media-jsonp</value>
156-
</map>
157139
<map order="500" if="${flavor} == 'se'">
158140
<value key="groupId">io.helidon.webserver</value>
159141
<value key="artifactId">helidon-webserver-static-content</value>
160142
</map>
161-
<map order="500" if="${flavor} == 'se'">
162-
<value key="groupId">jakarta.json</value>
163-
<value key="artifactId">jakarta.json-api</value>
164-
</map>
165143
</list>
166144
<list key="module-requires" if="${flavor} == 'se'">
167-
<value>jakarta.json</value>
168145
<value>io.helidon.http.media.multipart</value>
169146
<value>io.helidon.webserver.staticcontent</value>
170147
</list>
171148
<list key="module-requires" if="${flavor} == 'mp'">
172-
<value>jakarta.json</value>
173149
<value>jersey.media.multipart</value>
174150
</list>
175151
<list key="module-opens" if="${flavor} == 'se'">
@@ -239,6 +215,19 @@ curl -X GET http://localhost:8080/greet/Jose
239215
```
240216
]]></value>
241217
</list>
218+
<list key="dependencies" if="${media} contains 'multipart' || ${media.json-lib} == 'jsonp'">
219+
<map order="500" if="${flavor} == 'se'">
220+
<value key="groupId">jakarta.json</value>
221+
<value key="artifactId">jakarta.json-api</value>
222+
</map>
223+
<map order="500" if="${flavor} == 'se'">
224+
<value key="groupId">io.helidon.http.media</value>
225+
<value key="artifactId">helidon-http-media-jsonp</value>
226+
</map>
227+
</list>
228+
<list key="module-requires" if="${media} contains 'multipart' || ['jsonp', 'jsonb'] contains ${media.json-lib}">
229+
<value>jakarta.json</value>
230+
</list>
242231
</model>
243232
</output>
244233
</step>

0 commit comments

Comments
 (0)