Skip to content

Commit 2c4d021

Browse files
alitokmenalitokmen
committed
Upgrade various container versions
1 parent 7d39847 commit 2c4d021

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

‎cargo/GlassFish+7.x.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,7 @@ <h5 id="GlassFish7.x-Forinstalledcontainero.c.c.c.glassfish.GlassFish7xInstalled
16161616
<h3 id="GlassFish7.x-TestedOn">Tested On</h3>
16171617
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change.
16181618
<br>
1619-
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.24/glassfish-7.0.24.zip">https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.24/glassfish-7.0.24.zip</a></p>
1619+
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.25/glassfish-7.0.25.zip">https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.25/glassfish-7.0.25.zip</a></p>
16201620
</td>
16211621
</tr>
16221622
</tbody>

‎cargo/GlassFish+8.x.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,7 @@ <h5 id="GlassFish8.x-Forinstalledcontainero.c.c.c.glassfish.GlassFish8xInstalled
16161616
<h3 id="GlassFish8.x-TestedOn">Tested On</h3>
16171617
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change.
16181618
<br>
1619-
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M11/glassfish-8.0.0-M11.zip">https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M11/glassfish-8.0.0-M11.zip</a></p>
1619+
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M12.zip">https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M12.zip</a></p>
16201620
</td>
16211621
</tr>
16221622
</tbody>

‎cargo/Jetty+12.x.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1859,7 +1859,7 @@ <h5 id="Jetty12.x-Forinstalledcontainero.c.c.c.jetty.Jetty12xInstalledLocalConta
18591859
<h3 id="Jetty12.x-TestedOn">Tested On</h3>
18601860
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change.
18611861
<br>
1862-
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-home/12.0.21/jetty-home-12.0.21.tar.gz">https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-home/12.0.21/jetty-home-12.0.21.tar.gz</a></p>
1862+
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-home/12.0.22/jetty-home-12.0.22.tar.gz">https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-home/12.0.22/jetty-home-12.0.22.tar.gz</a></p>
18631863
</td>
18641864
</tr>
18651865
</tbody>

‎cargo/Tomcat+10.x.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2502,7 +2502,7 @@ <h5 id="Tomcat10.x-Forremotecontainero.c.c.c.tomcat.Tomcat10xRemoteContainer">Fo
25022502
<h3 id="Tomcat10.x-TestedOn">Tested On</h3>
25032503
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change.
25042504
<br>
2505-
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.41/tomcat-10.1.41.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.41/tomcat-10.1.41.zip</a></p>
2505+
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.42/tomcat-10.1.42.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.42/tomcat-10.1.42.zip</a></p>
25062506
</td>
25072507
</tr>
25082508
</tbody>

‎cargo/Tomcat+11.x.html‎

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

‎cargo/Tomcat+9.x.html‎

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

‎cargo/WebSphere+Liberty.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ <h5 id="WebSphereLiberty-Forinstalledcontainero.c.c.c.liberty.LibertyInstalledLo
10901090
<h3 id="WebSphereLiberty-TestedOn">Tested On</h3>
10911091
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change.
10921092
<br>
1093-
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/25.0.0.4/wlp-javaee8-25.0.0.4.zip">https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/25.0.0.4/wlp-javaee8-25.0.0.4.zip</a></p>
1093+
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/25.0.0.5/wlp-javaee8-25.0.0.5.zip">https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/25.0.0.5/wlp-javaee8-25.0.0.5.zip</a></p>
10941094
</td>
10951095
</tr>
10961096
</tbody>

‎generator/src/main/java/org/codehaus/cargo/website/WebsiteGenerator.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public class WebsiteGenerator implements Runnable
9191
/**
9292
* Whether the download attachments.
9393
*/
94-
private static final boolean downloadAttachments =
94+
private static final boolean DOWNLOAD_ATTACHMENTS =
9595
Boolean.parseBoolean(System.getProperty("cargo.downloadAttachments", "true"));
9696

9797
/**
@@ -215,7 +215,7 @@ private static void download() throws Exception
215215
}
216216
blogpostIdentifiers.put("476119041", "Configuring+HTTP+2+for+Tomcat+8.5+and+above");
217217

218-
if (downloadAttachments)
218+
if (DOWNLOAD_ATTACHMENTS)
219219
{
220220
String[] banners = new String[]
221221
{
@@ -241,8 +241,8 @@ private static void download() throws Exception
241241
}
242242
}
243243

244-
while (CONTENT_DOWNLOADERS.getCompletedTaskCount() <
245-
pages.length() + blogposts.length() + attachments.size())
244+
while (CONTENT_DOWNLOADERS.getCompletedTaskCount()
245+
< pages.length() + blogposts.length() + attachments.size())
246246
{
247247
Thread.sleep(5000);
248248
System.out.println(" - Completed " + CONTENT_DOWNLOADERS.getCompletedTaskCount() + "/"
@@ -251,8 +251,8 @@ private static void download() throws Exception
251251
+ "download speed since last message has been " + (WebsiteGenerator.speed / 1024 / 5) + " KB/s");
252252
WebsiteGenerator.speed = 0;
253253
}
254-
if (CONTENT_DOWNLOADERS.getCompletedTaskCount() <
255-
pages.length() + blogposts.length() + attachments.size())
254+
if (CONTENT_DOWNLOADERS.getCompletedTaskCount()
255+
< pages.length() + blogposts.length() + attachments.size())
256256
{
257257
throw new Exception("WARNING: Only completed " + CONTENT_DOWNLOADERS.getCompletedTaskCount()
258258
+ " tasks out of " + (pages.length() + blogposts.length() + attachments.size()));
@@ -553,7 +553,7 @@ public void run()
553553
{
554554
attachment = "https://codehaus-cargo.atlassian.net" + attachment;
555555
}
556-
if (downloadAttachments)
556+
if (DOWNLOAD_ATTACHMENTS)
557557
{
558558
URL attachmentUrl = new URL(attachment);
559559
synchronized (attachments)

0 commit comments

Comments
 (0)