Skip to content

Commit

Permalink
fix Json code duplication (helidon-io#8507)
Browse files Browse the repository at this point in the history 
Signed-off-by: tvallin <[email protected]>
  • Loading branch information
@tvallin
tvallin authored Mar 21, 2024
1 parent 977c567 commit be27e30
Showing 1 changed file with 13 additions and 24 deletions.
37 changes: 13 additions & 24 deletions archetypes/archetypes/src/main/archetype/common/media.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,6 @@
<option value="jsonp" name="JSON-P" description="Jakarta JSON Processing" if="${flavor} == 'se'">
<output>
<model>
<list key="dependencies">
<map>
<value key="groupId">jakarta.json</value>
<value key="artifactId">jakarta.json-api</value>
</map>
<map>
<value key="groupId">io.helidon.http.media</value>
<value key="artifactId">helidon-http-media-jsonp</value>
</map>
</list>
<list key="MainTest-other-imports">
<value>jakarta.json.JsonObject</value>
</list>
Expand All @@ -57,9 +47,6 @@
}
]]></value>
</list>
<list key="module-requires">
<value>jakarta.json</value>
</list>
</model>
</output>
</option>
Expand Down Expand Up @@ -129,7 +116,6 @@
]]></value>
</list>
<list key="module-requires">
<value>jakarta.json</value>
<value>jakarta.json.bind</value>
</list>
</model>
Expand All @@ -150,26 +136,16 @@
<value key="groupId">io.helidon.http.media</value>
<value key="artifactId">helidon-http-media-multipart</value>
</map>
<map order="500" if="${flavor} == 'se'">
<value key="groupId">io.helidon.http.media</value>
<value key="artifactId">helidon-http-media-jsonp</value>
</map>
<map order="500" if="${flavor} == 'se'">
<value key="groupId">io.helidon.webserver</value>
<value key="artifactId">helidon-webserver-static-content</value>
</map>
<map order="500" if="${flavor} == 'se'">
<value key="groupId">jakarta.json</value>
<value key="artifactId">jakarta.json-api</value>
</map>
</list>
<list key="module-requires" if="${flavor} == 'se'">
<value>jakarta.json</value>
<value>io.helidon.http.media.multipart</value>
<value>io.helidon.webserver.staticcontent</value>
</list>
<list key="module-requires" if="${flavor} == 'mp'">
<value>jakarta.json</value>
<value>jersey.media.multipart</value>
</list>
<list key="module-opens" if="${flavor} == 'se'">
Expand Down Expand Up @@ -239,6 +215,19 @@ curl -X GET http://localhost:8080/greet/Jose
```
]]></value>
</list>
<list key="dependencies" if="${media} contains 'multipart' || ${media.json-lib} == 'jsonp'">
<map order="500" if="${flavor} == 'se'">
<value key="groupId">jakarta.json</value>
<value key="artifactId">jakarta.json-api</value>
</map>
<map order="500" if="${flavor} == 'se'">
<value key="groupId">io.helidon.http.media</value>
<value key="artifactId">helidon-http-media-jsonp</value>
</map>
</list>
<list key="module-requires" if="${media} contains 'multipart' || ['jsonp', 'jsonb'] contains ${media.json-lib}">
<value>jakarta.json</value>
</list>
</model>
</output>
</step>
Expand Down

0 comments on commit be27e30

Please sign in to comment.