Skip to content

Commit 36b9930

Browse files
committed
remove coherence local workaround + 118 permutations
1 parent 8b6e6ab commit 36b9930

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

archetypes/archetypes/src/main/archetype/nodes/se/features/coherence/output.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@
8282
<list key="readme-exercise-the-application">
8383
<value file="files/README-Exercise-Application.md" template="mustache"/>
8484
</list>
85-
<list key="maven-plugins">
86-
<value file="files/maven-plugins.xml"/>
87-
</list>
85+
<!-- <list key="maven-plugins">-->
86+
<!-- <value file="files/maven-plugins.xml"/>-->
87+
<!-- </list>-->
8888
</model>
8989
</output>
9090
</archetype-script>

archetypes/archetypes/src/main/archetype/nodes/se/features/media/output.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<text path="media.json-lib" if="!(${media} contains 'json')"/>
2626
</variables>
2727

28-
<exec src="nodes/jackson/output.xml" if="${media.json-lib} != 'jackson'"/>
29-
<exec src="nodes/jsonb/output.xml" if="${media.json-lib} != 'jsonb'"/>
30-
<exec src="nodes/jsonp/output.xml" if="${media.json-lib} != 'jsonp'"/>
28+
<exec src="nodes/jackson/output.xml" if="${media.json-lib} == 'jackson'"/>
29+
<exec src="nodes/jsonb/output.xml" if="${media.json-lib} == 'jsonb'"/>
30+
<exec src="nodes/jsonp/output.xml" if="${media.json-lib} == 'jsonp'"/>
3131
<exec src="nodes/multipart/output.xml" if="${media} contains 'multipart'"/>
3232

3333
<output>

archetypes/archetypes/src/main/archetype/output.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<replace regex="version" replacement="${version}"/>
3636
</transformation>
3737
<transformation id="basedir">
38-
<replace regex="^(?!\Qmodule1\E)(.*)$" replacement="${basedir}/$1"/>
38+
<replace regex="^(?![^}]+(?:[\\/]|$))(.*)$" replacement="${basedir}/$1"/>
3939
</transformation>
4040
</output>
4141
</method>

archetypes/archetypes/src/test/archetype/rules.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
1818
-->
1919
<rules>
20-
<rule if="${app-type} != 'oci'">
21-
<exclude if="${app-type} != 'oci'"/>
22-
</rule>
2320
<rule if="${app-type} == 'quickstart'">
2421
<!-- Enforce the preset for quickstart using rule -->
2522
<exclude if="${media} != ['json']"/>
@@ -76,6 +73,16 @@
7673
<exclude if="${jpms}"/>
7774
<exclude if="!(${db})"/>
7875
<exclude if="${multi-module}"/>
76+
77+
<!-- do not combine auto-ddl and jackson -->
78+
<rule if="${db.auto-ddl}">
79+
<exclude if="${media.json-lib} == 'jackson'"/>
80+
</rule>
81+
82+
<!-- do not combine hikaricp and jackson -->
83+
<rule if="${db.cp} == 'hikaricp'">
84+
<exclude if="${media.json-lib} == 'jackson'"/>
85+
</rule>
7986
</rule>
8087
<rule if="${app-type} == 'custom'">
8188

0 commit comments

Comments
 (0)