Skip to content

Commit f2c9e0d

Browse files
committed
Complete CARGO-1636 (Jetty 12.x embedded type) by adding EE version support
1 parent 8e927ce commit f2c9e0d

File tree

1 file changed

+22
-3
lines changed

1 file changed

+22
-3
lines changed

cargo/Jetty+12.x.html

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ <h3 id="Jetty12.x-ContainerFeatures">Container Features</h3>
378378
<td class="confluenceTd">
379379
<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 the <code>ee10</code> profile</p></td>
381+
<p>&nbsp;</p></td>
382382
</tr>
383383
<tr>
384384
<td class="confluenceTd">
@@ -469,7 +469,7 @@ <h3 id="Jetty12.x-ConfigurationFeatures">Configuration Features</h3>
469469
<td class="confluenceTd">
470470
<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 the <code>ee10</code> profile</p></td>
472+
<p>&nbsp;</p></td>
473473
</tr>
474474
<tr>
475475
<td class="confluenceTd">
@@ -632,7 +632,7 @@ <h3 id="Jetty12.x-DeployerFeatures">Deployer Features</h3>
632632
<td class="confluenceTd">
633633
<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 the <code>ee10</code> profile</p></td>
635+
<p>&nbsp;</p></td>
636636
</tr>
637637
<tr>
638638
<td class="confluenceTd">
@@ -1044,6 +1044,18 @@ <h5 id="Jetty12.x-Forembeddedcontainero.c.c.c.jetty.Jetty12xEmbeddedLocalContain
10441044
<td class="confluenceTd">
10451045
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#DEPLOYER_CREATE_CONTEXT_XML"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
10461046
</tr>
1047+
<tr>
1048+
<td class="confluenceTd">
1049+
<p><a href="Configuration+properties.html">cargo.jetty.deployer.ee.version</a></p></td>
1050+
<td class="confluenceTd">
1051+
<p><a href="Configuration+properties.html">JettyPropertySet.DEPLOYER_EE_VERSION</a></p></td>
1052+
<td class="confluenceTd">
1053+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
1054+
<td class="confluenceTd">
1055+
<p><code>ee10</code></p></td>
1056+
<td class="confluenceTd">
1057+
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#DEPLOYER_EE_VERSION"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
1058+
</tr>
10471059
<tr>
10481060
<td class="confluenceTd">
10491061
<p><a href="Configuration+properties.html">cargo.jetty.realm.name</a></p></td>
@@ -1191,6 +1203,13 @@ <h5 id="Jetty12.x-Forembeddedcontainero.c.c.c.jetty.Jetty12xEmbeddedLocalContain
11911203
</tbody>
11921204
</table>
11931205
</div>
1206+
<div class="confluence-information-macro confluence-information-macro-information conf-macro output-block">
1207+
<p class="title">Jetty 12.x Embedded container and EE versions</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"> </span>
1208+
<div class="confluence-information-macro-body">
1209+
<p>Jetty 12.x supports multiple Java / Jakarta EE versions, for the Embedded container this is steered through the <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#DEPLOYER_EE_VERSION">JettyPropertySet.DEPLOYER_EE_VERSION</a></code> property.</p>
1210+
<p>When using this feature through the <a href="Javadocs.html">Java API</a> or <a href="Ant+support.html">Ant tasks</a>, you will have to set the classpath accordingly. Because of the pre-programmed dependency management logic, the <a href="Maven+3+Plugin.html">Maven 3 plugin</a> for Jetty 12.x Embedded only supports <code>ee10</code>.</p>
1211+
</div>
1212+
</div>
11941213
<h4 id="Jetty12.x-ExistingLocalConfigurationProperties">Existing Local Configuration Properties</h4>
11951214
<h5 id="Jetty12.x-Forinstalledcontainero.c.c.c.jetty.Jetty12xInstalledLocalContainer.1">For installed container o.c.c.c.jetty.Jetty12xInstalledLocalContainer</h5>
11961215
<div class="table-wrap">

0 commit comments

Comments
 (0)