Skip to content

Commit

Permalink
CARGO-1613: Add support for Jetty 12.x. Default is now EE 10.
Browse files Browse the repository at this point in the history
  • Loading branch information
@alitokmen
alitokmen committed Jul 26, 2023
1 parent ca6e7d6 commit f4490a6
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cargo/Jetty+10.x.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ <h3 id="Jetty10.x-DeployerFeatures">Deployer Features</h3>
<td class="confluenceTd">
<p><a class="unresolved" href="#">Installed Deployer</a></p></td>
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"> <code>o.<wbr>c.<wbr>c.<wbr>c.<wbr>jetty.<wbr>Jetty9x10x11x12xInstalledLocalDeployer</code></p></td>
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"> <code>o.<wbr>c.<wbr>c.<wbr>c.<wbr>jetty.<wbr>Jetty9x10x11xInstalledLocalDeployer</code></p></td>
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
<td class="confluenceTd">
Expand Down
2 changes: 1 addition & 1 deletion cargo/Jetty+11.x.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ <h3 id="Jetty11.x-DeployerFeatures">Deployer Features</h3>
<td class="confluenceTd">
<p><a class="unresolved" href="#">Installed Deployer</a></p></td>
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"> <code>o.<wbr>c.<wbr>c.<wbr>c.<wbr>jetty.<wbr>Jetty9x10x11x12xInstalledLocalDeployer</code></p></td>
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"> <code>o.<wbr>c.<wbr>c.<wbr>c.<wbr>jetty.<wbr>Jetty9x10x11xInstalledLocalDeployer</code></p></td>
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
<td class="confluenceTd">
Expand Down
32 changes: 28 additions & 4 deletions cargo/Jetty+12.x.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ <h3 class="heading3">RSS Feeds</h3>
<div class="confluence-information-macro confluence-information-macro-note conf-macro output-block">
<span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"> </span>
<div class="confluence-information-macro-body">
<p>Jetty 12.x onwards support various versions of Jakarta EE, by adapting the <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#MODULES">JettyPropertySet.MODULES</a></code> configuration property accordingly.</p>
<p>Jetty 12.x onwards support various versions of Jakarta EE, by adapting the <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#MODULES">JettyPropertySet.MODULES</a></code> and <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#EE_VERSION">JettyPropertySet.EE_VERSION</a></code> configuration properties accordingly.</p>
<p>Users of the Jakarta EE 9 and above versions should be aware that, as a result of the move from Java EE to Jakarta EE as part of the transfer of Java EE to the Eclipse Foundation, the primary package for all implemented APIs has changed from <code>javax.*</code> to <code>jakarta.*</code>. This will almost certainly require code changes to enable applications to migrate to EE 9 and later.</p>
</div>
</div>
Expand Down Expand Up @@ -649,7 +649,7 @@ <h3 id="Jetty12.x-DeployerFeatures">Deployer Features</h3>
<td class="confluenceTd">
<p><a class="unresolved" href="#">Installed Deployer</a></p></td>
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"> <code>o.<wbr>c.<wbr>c.<wbr>c.<wbr>jetty.<wbr>Jetty9x10x11x12xInstalledLocalDeployer</code></p></td>
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"> <code>o.<wbr>c.<wbr>c.<wbr>c.<wbr>jetty.<wbr>Jetty12xInstalledLocalDeployer</code></p></td>
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
<td class="confluenceTd">
Expand Down Expand Up @@ -770,6 +770,18 @@ <h5 id="Jetty12.x-Forinstalledcontainero.c.c.c.jetty.Jetty12xInstalledLocalConta
<td class="confluenceTd">
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#CREATE_CONTEXT_XML"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
</tr>
<tr>
<td class="confluenceTd">
<p><a href="Configuration+properties.html">cargo.jetty.ee.version</a></p></td>
<td class="confluenceTd">
<p><a href="Configuration+properties.html">JettyPropertySet.EE_VERSION</a></p></td>
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
<td class="confluenceTd">
<p><code>ee10</code></p></td>
<td class="confluenceTd">
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#EE_VERSION"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
</tr>
<tr>
<td class="confluenceTd">
<p><a href="Configuration+properties.html">cargo.jetty.modules</a></p></td>
Expand All @@ -778,7 +790,7 @@ <h5 id="Jetty12.x-Forinstalledcontainero.c.c.c.jetty.Jetty12xInstalledLocalConta
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
<td class="confluenceTd">
<p><code>server,http,http2c,ee8-annotations,ee8-plus,websocket-jetty,ee8-jsp,ext,ee8-deploy</code></p></td>
<p><code>server,http,http2c,ee10-annotations,ee10-plus,ee10-websocket-jetty,ee10-jsp,ext,ee10-deploy</code></p></td>
<td class="confluenceTd">
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#MODULES"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
</tr>
Expand Down Expand Up @@ -996,6 +1008,18 @@ <h5 id="Jetty12.x-Forinstalledcontainero.c.c.c.jetty.Jetty12xInstalledLocalConta
<td class="confluenceTd">
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/property/GeneralPropertySet.html#JAVA_HOME"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
</tr>
<tr>
<td class="confluenceTd">
<p><a href="Configuration+properties.html">cargo.jetty.ee.version</a></p></td>
<td class="confluenceTd">
<p><a href="Configuration+properties.html">JettyPropertySet.EE_VERSION</a></p></td>
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
<td class="confluenceTd">
<p><code>ee10</code></p></td>
<td class="confluenceTd">
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#EE_VERSION"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
</tr>
<tr>
<td class="confluenceTd">
<p><a href="Configuration+properties.html">cargo.jetty.modules</a></p></td>
Expand All @@ -1004,7 +1028,7 @@ <h5 id="Jetty12.x-Forinstalledcontainero.c.c.c.jetty.Jetty12xInstalledLocalConta
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
<td class="confluenceTd">
<p><code>server,http,http2c,ee8-annotations,ee8-plus,websocket-jetty,ee8-jsp,ext,ee8-deploy</code></p></td>
<p><code>server,http,http2c,ee10-annotations,ee10-plus,ee10-websocket-jetty,ee10-jsp,ext,ee10-deploy</code></p></td>
<td class="confluenceTd">
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#MODULES"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion cargo/Jetty+9.x.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ <h3 id="Jetty9.x-DeployerFeatures">Deployer Features</h3>
<td class="confluenceTd">
<p><a class="unresolved" href="#">Installed Deployer</a></p></td>
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"> <code>o.<wbr>c.<wbr>c.<wbr>c.<wbr>jetty.<wbr>Jetty9x10x11x12xInstalledLocalDeployer</code></p></td>
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"> <code>o.<wbr>c.<wbr>c.<wbr>c.<wbr>jetty.<wbr>Jetty9x10x11xInstalledLocalDeployer</code></p></td>
<td class="confluenceTd">
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
<td class="confluenceTd">
Expand Down

0 comments on commit f4490a6

Please sign in to comment.