Skip to content

Commit de8f443

Browse files
committed
Upgrade various container versions
1 parent 1242009 commit de8f443

5 files changed

Lines changed: 23 additions & 6 deletions

File tree

‎cargo/Installation.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ <h3 id="Installation-JavaAPI">Java API</h3>
650650
<td class="confluenceTd">
651651
<ul>
652652
<li>
653-
<p><a href="https://repo.maven.apache.org/maven2/jaxen/jaxen/2.0.1/jaxen-2.0.1.jar">jaxen 2.0.1</a> or greater</p>
653+
<p><a href="https://repo.maven.apache.org/maven2/jaxen/jaxen/2.0.2/jaxen-2.0.2.jar">jaxen 2.0.2</a> or greater</p>
654654
</li>
655655
<li>
656656
<p><a href="https://repo.maven.apache.org/maven2/org/jdom/jdom2/2.0.6.1/jdom2-2.0.6.1.jar">JDOM 2.0.6.1</a> or greater</p>

‎cargo/Payara.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2066,7 +2066,7 @@ <h5 id="Payara-Forremotecontainero.c.c.c.payara.PayaraRemoteContainer">For remot
20662066
<h3 id="Payara-TestedOn">Tested On</h3>
20672067
<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.
20682068
<br>
2069-
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/fish/payara/distributions/payara/7.2026.4/payara-7.2026.4.zip">https://repo.maven.apache.org/maven2/fish/payara/distributions/payara/7.2026.4/payara-7.2026.4.zip</a></p>
2069+
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/fish/payara/distributions/payara/7.2026.5/payara-7.2026.5.zip">https://repo.maven.apache.org/maven2/fish/payara/distributions/payara/7.2026.5/payara-7.2026.5.zip</a></p>
20702070
<p>Moreover, the below other branches are also tested by the CI system:</p>
20712071
<ul>
20722072
<li><a href="https://repo.maven.apache.org/maven2/fish/payara/distributions/payara/4.1.2.181/payara-4.1.2.181.zip">https://repo.maven.apache.org/maven2/fish/payara/distributions/payara/4.1.2.181/payara-4.1.2.181.zip</a></li>

‎cargo/Tomcat+10.x.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2870,7 +2870,7 @@ <h5 id="Tomcat10.x-Forremotecontainero.c.c.c.tomcat.Tomcat10xRemoteContainer">Fo
28702870
<h3 id="Tomcat10.x-TestedOn">Tested On</h3>
28712871
<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.
28722872
<br>
2873-
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.54/tomcat-10.1.54.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.54/tomcat-10.1.54.zip</a></p>
2873+
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.55/tomcat-10.1.55.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.55/tomcat-10.1.55.zip</a></p>
28742874
<p>Moreover, the below other branch is also tested by the CI system:</p>
28752875
<ul>
28762876
<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+9.x.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2795,7 +2795,7 @@ <h5 id="Tomcat9.x-Forremotecontainero.c.c.c.tomcat.Tomcat9xRemoteContainer">For
27952795
<h3 id="Tomcat9.x-TestedOn">Tested On</h3>
27962796
<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.
27972797
<br>
2798-
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.117/tomcat-9.0.117.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.117/tomcat-9.0.117.zip</a></p>
2798+
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.118/tomcat-9.0.118.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.118/tomcat-9.0.118.zip</a></p>
27992799
</td>
28002800
</tr>
28012801
</tbody>

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

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ private static void download() throws Exception
312312
{
313313
for (HashMap.Entry<URL, Throwable> exception : exceptions.entrySet())
314314
{
315-
System.out.println(" - Pending exception for URL " + exception.getKey() + ": " + exception);
315+
System.out.println(" - Pending exception for URL " + exception.getKey() + ": " + exception.getValue());
316+
exception.getValue().printStackTrace();
316317
}
317318
throw new Exception("Some files have failed download");
318319
}
@@ -498,13 +499,17 @@ private static void writeFile(File f, String value) throws IOException
498499
@Override
499500
public void run()
500501
{
502+
boolean tryWithAuthentication = true;
501503
try
502504
{
503505
String value = "";
504506
for (int i = 0; i < WebsiteGenerator.NUMBER_RETRIES; i++)
505507
{
506508
URLConnection connection = url.openConnection();
507-
connection.addRequestProperty("Authorization", WebsiteGenerator.confluenceAuthentication);
509+
if (tryWithAuthentication)
510+
{
511+
connection.addRequestProperty("Authorization", WebsiteGenerator.confluenceAuthentication);
512+
}
508513
try (InputStream is = connection.getInputStream())
509514
{
510515
String filePath = url.getPath();
@@ -538,6 +543,18 @@ public void run()
538543
}
539544
catch (IOException e)
540545
{
546+
if (e.getMessage().contains("HTTP response code: 401"))
547+
{
548+
if (tryWithAuthentication)
549+
{
550+
tryWithAuthentication = false;
551+
}
552+
else
553+
{
554+
// 401 won't fix itself by retrying
555+
throw new IllegalStateException("Got error 401 after " + i + " retries", e);
556+
}
557+
}
541558
if (i == WebsiteGenerator.NUMBER_RETRIES - 1)
542559
{
543560
throw new IllegalStateException("Failed after " + i + " retries", e);

0 commit comments

Comments
 (0)