Skip to content

Commit 8402d35

Browse files
committed
Upgrade various container versions
1 parent e50a0b4 commit 8402d35

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

cargo/Jetty+12.x.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ <h5 id="Jetty12.x-Forinstalledcontainero.c.c.c.jetty.Jetty12xInstalledLocalConta
998998
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
999999
</td>
10001000
<td class="confluenceTd">
1001-
<p><code>ee11</code></p>
1001+
<p><code>ee10</code></p>
10021002
</td>
10031003
<td class="confluenceTd">
10041004
<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>
@@ -1015,7 +1015,7 @@ <h5 id="Jetty12.x-Forinstalledcontainero.c.c.c.jetty.Jetty12xInstalledLocalConta
10151015
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
10161016
</td>
10171017
<td class="confluenceTd">
1018-
<p><code>server,ext,http,ee11-annotations,ee11-plus,ee11-jsp,ee11-deploy</code></p>
1018+
<p><code>server,ext,http,ee10-annotations,ee10-plus,ee10-jsp,ee10-deploy</code></p>
10191019
</td>
10201020
<td class="confluenceTd">
10211021
<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>
@@ -1356,7 +1356,7 @@ <h5 id="Jetty12.x-Forembeddedcontainero.c.c.c.jetty.Jetty12xEmbeddedLocalContain
13561356
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
13571357
</td>
13581358
<td class="confluenceTd">
1359-
<p><code>ee11</code></p>
1359+
<p><code>ee10</code></p>
13601360
</td>
13611361
<td class="confluenceTd">
13621362
<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>
@@ -1712,7 +1712,7 @@ <h5 id="Jetty12.x-Forinstalledcontainero.c.c.c.jetty.Jetty12xInstalledLocalConta
17121712
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
17131713
</td>
17141714
<td class="confluenceTd">
1715-
<p><code>ee11</code></p>
1715+
<p><code>ee10</code></p>
17161716
</td>
17171717
<td class="confluenceTd">
17181718
<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>
@@ -1729,7 +1729,7 @@ <h5 id="Jetty12.x-Forinstalledcontainero.c.c.c.jetty.Jetty12xInstalledLocalConta
17291729
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
17301730
</td>
17311731
<td class="confluenceTd">
1732-
<p><code>server,ext,http,ee11-annotations,ee11-plus,ee11-jsp,ee11-deploy</code></p>
1732+
<p><code>server,ext,http,ee10-annotations,ee10-plus,ee10-jsp,ee10-deploy</code></p>
17331733
</td>
17341734
<td class="confluenceTd">
17351735
<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>

cargo/Project+Structure.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,6 @@ <h3 id="Navigation-Development">Development</h3>
311311
<li><span style="color: red;"><strong>classpath-war/</strong></span>: Cargo test data for samples - Classpath WAR</li>
312312
<li><span style="color: red;"><strong>datasource-cmt-local-war/</strong></span>: Cargo test data for samples - Local Transaction DataSource WAR</li>
313313
<li><span style="color: red;"><strong>datasource-war/</strong></span>: Cargo test data for samples - DataSource WAR</li>
314-
<li><span style="color: red;"><strong>empty-ear/</strong></span>: Cargo test data for samples - Empty EAR</li>
315-
<li><span style="color: red;"><strong>empty-jar/</strong></span>: Cargo test data for samples - Empty JAR.
316-
<br>
317-
We need this empty jar because an EAR's application.xml requires at least one &lt;module&gt; element so we've chosen to define an empty jar.</li>
318314
<li><span style="color: red;"><strong>expanded-war/</strong></span>: Cargo test data for samples - Expanded WAR</li>
319315
<li><span style="color: red;"><strong>jms-queue-war/</strong></span>: Cargo test data for samples - JMS Queue WAR</li>
320316
<li><span style="color: red;"><strong>jms-topic-war/</strong></span>: Cargo test data for samples - JMS Topic WAR</li>
@@ -437,6 +433,7 @@ <h3 id="Navigation-Development">Development</h3>
437433
<li><span style="color: red;"><strong>jetty12x-ee8-embedded-test/</strong></span>: Sample application that exercises the Cargo Maven 3 plugin with an embedded Jetty 12.x container with EE8 profile</li>
438434
<li><span style="color: red;"><strong>jetty12x-ee9-embedded-test/</strong></span>: Sample application that exercises the Cargo Maven 3 plugin with an embedded Jetty 12.x container with EE9 profile</li>
439435
<li><span style="color: red;"><strong>jetty12x-ee10-embedded-test/</strong></span>: Sample application that exercises the Cargo Maven 3 plugin with an embedded Jetty 12.x container with EE10 profile</li>
436+
<li><span style="color: red;"><strong>jetty12x-ee11-embedded-test/</strong></span>: Sample application that exercises the Cargo Maven 3 plugin with an embedded Jetty 12.x container with EE11 profile</li>
440437
<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>
441438
<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>
442439
<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>

cargo/Tomcat+10.x.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2503,7 +2503,7 @@ <h5 id="Tomcat10.x-Forremotecontainero.c.c.c.tomcat.Tomcat10xRemoteContainer">Fo
25032503
<h3 id="Tomcat10.x-TestedOn">Tested On</h3>
25042504
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration (CI) system</a> every time there is a code change.
25052505
<br>
2506-
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.46/tomcat-10.1.46.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.46/tomcat-10.1.46.zip</a></p>
2506+
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.47/tomcat-10.1.47.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.47/tomcat-10.1.47.zip</a></p>
25072507
<p>Moreover, the below other branch is also tested by the CI system:</p>
25082508
<ul>
25092509
<li><a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.0.27/tomcat-10.0.27.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.0.27/tomcat-10.0.27.zip</a></li>

cargo/Tomcat+11.x.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2495,7 +2495,7 @@ <h5 id="Tomcat11.x-Forremotecontainero.c.c.c.tomcat.Tomcat11xRemoteContainer">Fo
24952495
<h3 id="Tomcat11.x-TestedOn">Tested On</h3>
24962496
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration (CI) system</a> every time there is a code change.
24972497
<br>
2498-
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/11.0.11/tomcat-11.0.11.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/11.0.11/tomcat-11.0.11.zip</a></p>
2498+
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/11.0.12/tomcat-11.0.12.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/11.0.12/tomcat-11.0.12.zip</a></p>
24992499
</td>
25002500
</tr>
25012501
</tbody>

cargo/Tomcat+9.x.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2428,7 +2428,7 @@ <h5 id="Tomcat9.x-Forremotecontainero.c.c.c.tomcat.Tomcat9xRemoteContainer">For
24282428
<h3 id="Tomcat9.x-TestedOn">Tested On</h3>
24292429
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration (CI) system</a> every time there is a code change.
24302430
<br>
2431-
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.109/tomcat-9.0.109.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.109/tomcat-9.0.109.zip</a></p>
2431+
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.110/tomcat-9.0.110.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.110/tomcat-9.0.110.zip</a></p>
24322432
</td>
24332433
</tr>
24342434
</tbody>

0 commit comments

Comments
 (0)