Skip to content

Commit 8e927ce

Browse files
committed
Improve CARGO-1636 (Jetty 12.x embedded type) by adding Maven 3 support as well, currently limited to EE10 only.
1 parent 0f4d947 commit 8e927ce

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

cargo/Jetty+12.x.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,9 @@ <h3 id="Jetty12.x-ContainerFeatures">Container Features</h3>
376376
<td class="confluenceTd">
377377
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
378378
<td class="confluenceTd">
379-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p></td>
379+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
380380
<td class="confluenceTd">
381-
<p>Jetty 12.x Embedded only supports EE10 profile</p></td>
381+
<p>Jetty 12.x Embedded only supports the <code>ee10</code> profile</p></td>
382382
</tr>
383383
<tr>
384384
<td class="confluenceTd">
@@ -467,9 +467,9 @@ <h3 id="Jetty12.x-ConfigurationFeatures">Configuration Features</h3>
467467
<td class="confluenceTd">
468468
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
469469
<td class="confluenceTd">
470-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p></td>
470+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
471471
<td class="confluenceTd">
472-
<p>Jetty 12.x Embedded only supports EE10 profile</p></td>
472+
<p>Jetty 12.x Embedded only supports the <code>ee10</code> profile</p></td>
473473
</tr>
474474
<tr>
475475
<td class="confluenceTd">
@@ -630,9 +630,9 @@ <h3 id="Jetty12.x-DeployerFeatures">Deployer Features</h3>
630630
<td class="confluenceTd">
631631
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
632632
<td class="confluenceTd">
633-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p></td>
633+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
634634
<td class="confluenceTd">
635-
<p>Jetty 12.x Embedded only supports EE10 profile</p></td>
635+
<p>Jetty 12.x Embedded only supports the <code>ee10</code> profile</p></td>
636636
</tr>
637637
<tr>
638638
<td class="confluenceTd">

cargo/Project+Structure.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ <h3 id="Navigation-Development">Development</h3>
422422
<li><span style="color: red;"><strong>jetty9x-embedded-test/</strong></span>: Sample application that exercises the Cargo Maven 3 plugin with an embedded Jetty 9.x container</li>
423423
<li><span style="color: red;"><strong>jetty10x-embedded-test/</strong></span>: Sample application that exercises the Cargo Maven 3 plugin with an embedded Jetty 10.x container</li>
424424
<li><span style="color: red;"><strong>jetty11x-embedded-test/</strong></span>: Sample application that exercises the Cargo Maven 3 plugin with an embedded Jetty 11.x container</li>
425+
<li><span style="color: red;"><strong>jetty12x-embedded-test/</strong></span>: Sample application that exercises the Cargo Maven 3 plugin with an embedded Jetty 12.x container</li>
425426
<li><span style="color: red;"><strong>license-test/</strong></span>: Sample application that exercises checks the Uberjar with regards to its license needs (<a href="https://codehaus-cargo.atlassian.net/browse/CARGO-1489">CARGO-1489</a> and <a href="https://codehaus-cargo.atlassian.net/browse/CARGO-1494">CARGO-1494</a>)</li>
426427
<li><span style="color: red;"><strong>multi-datasource-test/</strong></span>: Sample application that exercises the Cargo Maven 3 plugin with a Tomcat 6.x container and multiple datasources</li>
427428
<li><span style="color: red;"><strong>ping-test/</strong></span>: Sample application that exercises the Cargo Maven 3 plugin's deployable pinging capabilities</li>

0 commit comments

Comments
 (0)