Skip to content

Commit 6851d97

Browse files
Maven site: wcm-io-devops/conga
1 parent 352912e commit 6851d97

File tree

10 files changed

+76
-50
lines changed

10 files changed

+76
-50
lines changed

conga/changes.html

Lines changed: 67 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -116,218 +116,243 @@ <h2 id="release_history">Release History</h2>
116116
</thead>
117117
<tbody>
118118
<tr class="b">
119+
<td><a href="#a1.19.0">1.19.0</a></td>
120+
<td>not released</td>
121+
<td>&nbsp;</td>
122+
</tr>
123+
<tr class="a">
119124
<td><a href="#a1.18.0">1.18.0</a></td>
120125
<td>2025-09-25</td>
121126
<td>&nbsp;</td>
122127
</tr>
123-
<tr class="a">
128+
<tr class="b">
124129
<td><a href="#a1.17.6">1.17.6</a></td>
125130
<td>2025-09-19</td>
126131
<td>&nbsp;</td>
127132
</tr>
128-
<tr class="b">
133+
<tr class="a">
129134
<td><a href="#a1.17.4">1.17.4</a></td>
130135
<td>2025-06-18</td>
131136
<td>&nbsp;</td>
132137
</tr>
133-
<tr class="a">
138+
<tr class="b">
134139
<td><a href="#a1.17.2">1.17.2</a></td>
135140
<td>2025-03-31</td>
136141
<td>&nbsp;</td>
137142
</tr>
138-
<tr class="b">
143+
<tr class="a">
139144
<td><a href="#a1.17.0">1.17.0</a></td>
140145
<td>2024-01-26</td>
141146
<td>&nbsp;</td>
142147
</tr>
143-
<tr class="a">
148+
<tr class="b">
144149
<td><a href="#a1.16.4">1.16.4</a></td>
145150
<td>2023-10-18</td>
146151
<td>&nbsp;</td>
147152
</tr>
148-
<tr class="b">
153+
<tr class="a">
149154
<td><a href="#a1.16.2">1.16.2</a></td>
150155
<td>2023-08-31</td>
151156
<td>&nbsp;</td>
152157
</tr>
153-
<tr class="a">
158+
<tr class="b">
154159
<td><a href="#a1.16.0">1.16.0</a></td>
155160
<td>2023-07-03</td>
156161
<td>&nbsp;</td>
157162
</tr>
158-
<tr class="b">
163+
<tr class="a">
159164
<td><a href="#a1.15.0">1.15.0</a></td>
160165
<td>2023-03-27</td>
161166
<td>&nbsp;</td>
162167
</tr>
163-
<tr class="a">
168+
<tr class="b">
164169
<td><a href="#a1.14.12">1.14.12</a></td>
165170
<td>2022-09-29</td>
166171
<td>&nbsp;</td>
167172
</tr>
168-
<tr class="b">
173+
<tr class="a">
169174
<td><a href="#a1.14.10">1.14.10</a></td>
170175
<td>2022-06-16</td>
171176
<td>&nbsp;</td>
172177
</tr>
173-
<tr class="a">
178+
<tr class="b">
174179
<td><a href="#a1.14.8">1.14.8</a></td>
175180
<td>2022-05-11</td>
176181
<td>&nbsp;</td>
177182
</tr>
178-
<tr class="b">
183+
<tr class="a">
179184
<td><a href="#a1.14.6">1.14.6</a></td>
180185
<td>2022-03-15</td>
181186
<td>&nbsp;</td>
182187
</tr>
183-
<tr class="a">
188+
<tr class="b">
184189
<td><a href="#a1.14.4">1.14.4</a></td>
185190
<td>2021-12-18</td>
186191
<td>&nbsp;</td>
187192
</tr>
188-
<tr class="b">
193+
<tr class="a">
189194
<td><a href="#a1.14.2">1.14.2</a></td>
190195
<td>2020-11-06</td>
191196
<td>&nbsp;</td>
192197
</tr>
193-
<tr class="a">
198+
<tr class="b">
194199
<td><a href="#a1.14.0">1.14.0</a></td>
195200
<td>2020-09-15</td>
196201
<td>&nbsp;</td>
197202
</tr>
198-
<tr class="b">
203+
<tr class="a">
199204
<td><a href="#a1.13.4">1.13.4</a></td>
200205
<td>2020-07-10</td>
201206
<td>&nbsp;</td>
202207
</tr>
203-
<tr class="a">
208+
<tr class="b">
204209
<td><a href="#a1.13.2">1.13.2</a></td>
205210
<td>2020-04-28</td>
206211
<td>&nbsp;</td>
207212
</tr>
208-
<tr class="b">
213+
<tr class="a">
209214
<td><a href="#a1.13.0">1.13.0</a></td>
210215
<td>2020-04-23</td>
211216
<td>&nbsp;</td>
212217
</tr>
213-
<tr class="a">
218+
<tr class="b">
214219
<td><a href="#a1.12.0">1.12.0</a></td>
215220
<td>2020-01-09</td>
216221
<td>&nbsp;</td>
217222
</tr>
218-
<tr class="b">
223+
<tr class="a">
219224
<td><a href="#a1.11.4">1.11.4</a></td>
220225
<td>2019-10-01</td>
221226
<td>&nbsp;</td>
222227
</tr>
223-
<tr class="a">
228+
<tr class="b">
224229
<td><a href="#a1.11.2">1.11.2</a></td>
225230
<td>2019-06-26</td>
226231
<td>&nbsp;</td>
227232
</tr>
228-
<tr class="b">
233+
<tr class="a">
229234
<td><a href="#a1.11.0">1.11.0</a></td>
230235
<td>2019-03-14</td>
231236
<td>&nbsp;</td>
232237
</tr>
233-
<tr class="a">
238+
<tr class="b">
234239
<td><a href="#a1.10.2">1.10.2</a></td>
235240
<td>2018-08-27</td>
236241
<td>&nbsp;</td>
237242
</tr>
238-
<tr class="b">
243+
<tr class="a">
239244
<td><a href="#a1.10.0">1.10.0</a></td>
240245
<td>2018-08-17</td>
241246
<td>&nbsp;</td>
242247
</tr>
243-
<tr class="a">
248+
<tr class="b">
244249
<td><a href="#a1.9.2">1.9.2</a></td>
245250
<td>2018-07-13</td>
246251
<td>&nbsp;</td>
247252
</tr>
248-
<tr class="b">
253+
<tr class="a">
249254
<td><a href="#a1.9.0">1.9.0</a></td>
250255
<td>2018-05-04</td>
251256
<td>&nbsp;</td>
252257
</tr>
253-
<tr class="a">
258+
<tr class="b">
254259
<td><a href="#a1.8.0">1.8.0</a></td>
255260
<td>2018-03-23</td>
256261
<td>&nbsp;</td>
257262
</tr>
258-
<tr class="b">
263+
<tr class="a">
259264
<td><a href="#a1.7.0">1.7.0</a></td>
260265
<td>2018-02-15</td>
261266
<td>&nbsp;</td>
262267
</tr>
263-
<tr class="a">
268+
<tr class="b">
264269
<td><a href="#a1.6.2">1.6.2</a></td>
265270
<td>2018-02-07</td>
266271
<td>&nbsp;</td>
267272
</tr>
268-
<tr class="b">
273+
<tr class="a">
269274
<td><a href="#a1.6.0">1.6.0</a></td>
270275
<td>2018-02-05</td>
271276
<td>&nbsp;</td>
272277
</tr>
273-
<tr class="a">
278+
<tr class="b">
274279
<td><a href="#a1.5.0">1.5.0</a></td>
275280
<td>2018-01-15</td>
276281
<td>&nbsp;</td>
277282
</tr>
278-
<tr class="b">
283+
<tr class="a">
279284
<td><a href="#a1.4.4">1.4.4</a></td>
280285
<td>2017-11-22</td>
281286
<td>&nbsp;</td>
282287
</tr>
283-
<tr class="a">
288+
<tr class="b">
284289
<td><a href="#a1.4.2">1.4.2</a></td>
285290
<td>2017-10-17</td>
286291
<td>&nbsp;</td>
287292
</tr>
288-
<tr class="b">
293+
<tr class="a">
289294
<td><a href="#a1.4.0">1.4.0</a></td>
290295
<td>2017-09-12</td>
291296
<td>&nbsp;</td>
292297
</tr>
293-
<tr class="a">
298+
<tr class="b">
294299
<td><a href="#a1.3.4">1.3.4</a></td>
295300
<td>2017-05-29</td>
296301
<td>&nbsp;</td>
297302
</tr>
298-
<tr class="b">
303+
<tr class="a">
299304
<td><a href="#a1.3.2">1.3.2</a></td>
300305
<td>2017-04-04</td>
301306
<td>&nbsp;</td>
302307
</tr>
303-
<tr class="a">
308+
<tr class="b">
304309
<td><a href="#a1.3.0">1.3.0</a></td>
305310
<td>2017-02-09</td>
306311
<td>&nbsp;</td>
307312
</tr>
308-
<tr class="b">
313+
<tr class="a">
309314
<td><a href="#a1.2.0">1.2.0</a></td>
310315
<td>2016-06-15</td>
311316
<td>&nbsp;</td>
312317
</tr>
313-
<tr class="a">
318+
<tr class="b">
314319
<td><a href="#a1.1.2">1.1.2</a></td>
315320
<td>2015-08-27</td>
316321
<td>&nbsp;</td>
317322
</tr>
318-
<tr class="b">
323+
<tr class="a">
319324
<td><a href="#a1.1.0">1.1.0</a></td>
320325
<td>2015-07-22</td>
321326
<td>&nbsp;</td>
322327
</tr>
323-
<tr class="a">
328+
<tr class="b">
324329
<td><a href="#a1.0.0">1.0.0</a></td>
325330
<td>2015-07-06</td>
326331
<td>&nbsp;</td>
327332
</tr>
328333
</tbody>
329334
</table>
330335
</section>
336+
<section>
337+
<a id="a1.19.0"></a>
338+
<h2 id="release_1.19.0__not_released">Release 1.19.0 – not released</h2>
339+
<table class="bodyTable table table-striped table-hover">
340+
<thead>
341+
<tr class="a">
342+
<th>Type</th>
343+
<th>Changes</th>
344+
<th>By</th>
345+
</tr>
346+
</thead>
347+
<tbody>
348+
<tr class="b">
349+
<td><i class="icon-plus"></i></td>
350+
<td>Support deep merge of list entries with 'key' field: When merging lists with map objects containing a 'key' field, entries with the same key are now merged instead of replaced, preserving fields from base configuration that are not overridden in variants. Fixes <a class="externalLink" href="https://github.com/wcm-io-devops/conga/issues/149">149</a>.</td>
351+
<td><a href="team.html#bsommerfeld">bsommerfeld</a></td>
352+
</tr>
353+
</tbody>
354+
</table>
355+
</section>
331356
<section>
332357
<a id="a1.18.0"></a>
333358
<h2 id="release_1.18.0__2025-09-25">Release 1.18.0 – 2025-09-25</h2>
@@ -1499,6 +1524,7 @@ <h2 id="release_1.0.0__2015-07-06">Release 1.0.0 – 2015-07-06</h2>
14991524
<li class="dropdown"><a href="#changes_report" title="Changes Report">Changes Report <b class="caret"></b></a>
15001525
<ul class="nav nav-list">
15011526
<li><a href="#release_history" title="Release History">Release History</a>
1527+
<li><a href="#release_1.19.0__not_released" title="Release 1.19.0 – not released">Release 1.19.0 – not released</a>
15021528
<li><a href="#release_1.18.0__2025-09-25" title="Release 1.18.0 – 2025-09-25">Release 1.18.0 – 2025-09-25</a>
15031529
<li><a href="#release_1.17.6__2025-09-19" title="Release 1.17.6 – 2025-09-19">Release 1.17.6 – 2025-09-19</a>
15041530
<li><a href="#release_1.17.4__2025-06-18" title="Release 1.17.4 – 2025-06-18">Release 1.17.4 – 2025-06-18</a>

conga/generator/dependencies.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@ <h1 id="dependency_file_details">Dependency File Details</h1>
16381638
</tr>
16391639
<tr class="a">
16401640
<td style="text-align: left;">io.wcm.devops.conga.model-1.18.1-SNAPSHOT.jar</td>
1641-
<td style="text-align: right;">32.5 kB</td>
1641+
<td style="text-align: right;">33.2 kB</td>
16421642
<td style="text-align: right;">48</td>
16431643
<td style="text-align: right;">31</td>
16441644
<td style="text-align: right;">5</td>

conga/generator/jacoco-unit/jacoco-sessions.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

conga/generator/jacoco-unit/jacoco.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

conga/generator/jacoco/jacoco-sessions.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

conga/generator/jacoco/jacoco.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

conga/tooling/conga-maven-plugin/dependencies.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2880,7 +2880,7 @@ <h1 id="dependency_file_details">Dependency File Details</h1>
28802880
</tr>
28812881
<tr class="b">
28822882
<td style="text-align: left;">io.wcm.devops.conga.model-1.18.1-SNAPSHOT.jar</td>
2883-
<td style="text-align: right;">32.5 kB</td>
2883+
<td style="text-align: right;">33.2 kB</td>
28842884
<td style="text-align: right;">48</td>
28852885
<td style="text-align: right;">31</td>
28862886
<td style="text-align: right;">5</td>

conga/tooling/conga-maven-plugin/jacoco/jacoco-sessions.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

conga/tooling/conga-maven-plugin/jacoco/jacoco.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

conga/yaml-definitions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ <h3 id="configuration_parameter_maps">Configuration parameter maps</h3>
190190
<li>Variant configuration from node</li>
191191
<li>Configuration from multiply plugins, e.g. the tenant-specific configuration</li>
192192
</ol>
193-
<p>There is a special support when merging list parameter. By default a list value on a deeper lever overwrites a list inherited from a parameter map on a higher level completely. If you insert the keyword <code>_merge_</code> as list item on either of the list values, they are merged and the special keyword entry is removed.</p>
193+
<p>There is a special support when merging list parameter. By default a list value on a deeper lever overwrites a list inherited from a parameter map on a higher level completely. If you insert the keyword <code>_merge_</code> as list item on either of the list values, they are merged and the special keyword entry is removed. If a merged list contains child objects with <code>key</code> properties, merging logic checks for the keys and merges the list as key-value list.</p>
194194
</section>
195195
<section>
196196
<a id="Variable_references"></a>

0 commit comments

Comments
 (0)