diff --git a/cargo/Geronimo+2.x.html b/cargo/Geronimo+2.x.html
index eb6e977a9..0eb798dc6 100644
--- a/cargo/Geronimo+2.x.html
+++ b/cargo/Geronimo+2.x.html
@@ -790,7 +790,8 @@ <h5 id="Geronimo2.x-Forinstalledcontainero.c.c.c.geronimo.Geronimo2xInstalledLoc
               <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><em>JAVA_HOME version 5 or newer</em><br><em>Due to incompatibilities with its JSP environment, Geronimo 2.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 5 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, Geronimo 2.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -997,7 +998,8 @@ <h5 id="Geronimo2.x-Forinstalledcontainero.c.c.c.geronimo.Geronimo2xInstalledLoc
               <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><em>JAVA_HOME version 5 or newer</em><br><em>Due to incompatibilities with its JSP environment, Geronimo 2.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 5 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, Geronimo 2.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/Geronimo+3.x.html b/cargo/Geronimo+3.x.html
index 7180db38a..48d18ef22 100644
--- a/cargo/Geronimo+3.x.html
+++ b/cargo/Geronimo+3.x.html
@@ -790,7 +790,8 @@ <h5 id="Geronimo3.x-Forinstalledcontainero.c.c.c.geronimo.Geronimo3xInstalledLoc
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its OSGi environment, Geronimo 3.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its OSGi environment, Geronimo 3.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -997,7 +998,8 @@ <h5 id="Geronimo3.x-Forinstalledcontainero.c.c.c.geronimo.Geronimo3xInstalledLoc
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its OSGi environment, Geronimo 3.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its OSGi environment, Geronimo 3.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/GlassFish+3.x.html b/cargo/GlassFish+3.x.html
index 7f4b035a7..981430fba 100644
--- a/cargo/GlassFish+3.x.html
+++ b/cargo/GlassFish+3.x.html
@@ -916,7 +916,8 @@ <h5 id="GlassFish3.x-Forinstalledcontainero.c.c.c.glassfish.GlassFish3xInstalled
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its OSGi environment, GlassFish 3.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its OSGi environment, GlassFish 3.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/GlassFish+6.x.html b/cargo/GlassFish+6.x.html
index 04213f7fb..d0af54f18 100644
--- a/cargo/GlassFish+6.x.html
+++ b/cargo/GlassFish+6.x.html
@@ -929,7 +929,8 @@ <h5 id="GlassFish6.x-Forinstalledcontainero.c.c.c.glassfish.GlassFish6xInstalled
               <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><em>JAVA_HOME version 8 (GlassFish 6.0.x) or 11 (GlassFish 6.1.x and above) or newer</em><br><em>GlassFish 6.0.x <a href="https://github.com/eclipse-ee4j/glassfish/issues/23102">only runs on Java 8</a></em><br><em>Only GlassFish 6.2.1 onwards supports Java 17</em></p></td>
+               <p><em>JAVA_HOME version 8 (GlassFish 6.0.x) or 11 (GlassFish 6.1.x and above) or newer</em><br>
+                 &nbsp;<br><em>GlassFish 6.0.x <a href="https://github.com/eclipse-ee4j/glassfish/issues/23102">only runs on Java 8</a></em><br><em>Only GlassFish 6.2.1 onwards supports Java 17</em></p></td>
               <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>
diff --git a/cargo/JBoss+5.1.x.html b/cargo/JBoss+5.1.x.html
index 9d462722c..1fe6c5ff3 100644
--- a/cargo/JBoss+5.1.x.html
+++ b/cargo/JBoss+5.1.x.html
@@ -790,7 +790,8 @@ <h5 id="JBoss5.1.x-Forinstalledcontainero.c.c.c.jboss.JBoss51xInstalledLocalCont
               <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><em>JAVA_HOME version 5 or newer</em><br><em>Due to incompatibilities with its JSP environment, JBoss 5.1.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 5 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, JBoss 5.1.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1223,7 +1224,8 @@ <h5 id="JBoss5.1.x-Forinstalledcontainero.c.c.c.jboss.JBoss51xInstalledLocalCont
               <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><em>JAVA_HOME version 5 or newer</em><br><em>Due to incompatibilities with its JSP environment, JBoss 5.1.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 5 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, JBoss 5.1.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/JBoss+5.x.html b/cargo/JBoss+5.x.html
index 5cbeec536..20b21c86c 100644
--- a/cargo/JBoss+5.x.html
+++ b/cargo/JBoss+5.x.html
@@ -790,7 +790,8 @@ <h5 id="JBoss5.x-Forinstalledcontainero.c.c.c.jboss.JBoss5xInstalledLocalContain
               <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><em>JAVA_HOME version 5 or newer</em><br><em>Due to incompatibilities with its JSP environment, JBoss 5.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 5 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, JBoss 5.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1223,7 +1224,8 @@ <h5 id="JBoss5.x-Forinstalledcontainero.c.c.c.jboss.JBoss5xInstalledLocalContain
               <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><em>JAVA_HOME version 5 or newer</em><br><em>Due to incompatibilities with its JSP environment, JBoss 5.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 5 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, JBoss 5.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/JBoss+6.1.x.html b/cargo/JBoss+6.1.x.html
index 019d26ec6..659028ab2 100644
--- a/cargo/JBoss+6.1.x.html
+++ b/cargo/JBoss+6.1.x.html
@@ -811,7 +811,8 @@ <h5 id="JBoss6.1.x-Forinstalledcontainero.c.c.c.jboss.JBoss61xInstalledLocalCont
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its JSP environment, JBoss 6.1.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, JBoss 6.1.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1244,7 +1245,8 @@ <h5 id="JBoss6.1.x-Forinstalledcontainero.c.c.c.jboss.JBoss61xInstalledLocalCont
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its JSP environment, JBoss 6.1.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, JBoss 6.1.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/JBoss+6.x.html b/cargo/JBoss+6.x.html
index 6832d3b98..1548ebd17 100644
--- a/cargo/JBoss+6.x.html
+++ b/cargo/JBoss+6.x.html
@@ -811,7 +811,8 @@ <h5 id="JBoss6.x-Forinstalledcontainero.c.c.c.jboss.JBoss6xInstalledLocalContain
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its JSP environment, JBoss 6.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, JBoss 6.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1244,7 +1245,8 @@ <h5 id="JBoss6.x-Forinstalledcontainero.c.c.c.jboss.JBoss6xInstalledLocalContain
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its JSP environment, JBoss 6.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, JBoss 6.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/JBoss+7.1.x.html b/cargo/JBoss+7.1.x.html
index 01e608782..9f1c3582b 100644
--- a/cargo/JBoss+7.1.x.html
+++ b/cargo/JBoss+7.1.x.html
@@ -811,7 +811,8 @@ <h5 id="JBoss7.1.x-Forinstalledcontainero.c.c.c.jboss.JBoss71xInstalledLocalCont
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its OSGi environment, JBoss 7.1.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its OSGi environment, JBoss 7.1.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1150,7 +1151,8 @@ <h5 id="JBoss7.1.x-Forinstalledcontainero.c.c.c.jboss.JBoss71xInstalledLocalCont
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its OSGi environment, JBoss 7.1.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its OSGi environment, JBoss 7.1.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/JBoss+7.2.x.html b/cargo/JBoss+7.2.x.html
index 1e7dff4b7..482acc23f 100644
--- a/cargo/JBoss+7.2.x.html
+++ b/cargo/JBoss+7.2.x.html
@@ -811,7 +811,8 @@ <h5 id="JBoss7.2.x-Forinstalledcontainero.c.c.c.jboss.JBoss72xInstalledLocalCont
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its OSGi environment, JBoss 7.2.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its OSGi environment, JBoss 7.2.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1138,7 +1139,8 @@ <h5 id="JBoss7.2.x-Forinstalledcontainero.c.c.c.jboss.JBoss72xInstalledLocalCont
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its OSGi environment, JBoss 7.2.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its OSGi environment, JBoss 7.2.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/JBoss+7.3.x.html b/cargo/JBoss+7.3.x.html
index 1a03d5ddf..a270fcf67 100644
--- a/cargo/JBoss+7.3.x.html
+++ b/cargo/JBoss+7.3.x.html
@@ -811,7 +811,8 @@ <h5 id="JBoss7.3.x-Forinstalledcontainero.c.c.c.jboss.JBoss73xInstalledLocalCont
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its OSGi environment, JBoss 7.3.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its OSGi environment, JBoss 7.3.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1138,7 +1139,8 @@ <h5 id="JBoss7.3.x-Forinstalledcontainero.c.c.c.jboss.JBoss73xInstalledLocalCont
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its OSGi environment, JBoss 7.3.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its OSGi environment, JBoss 7.3.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/JBoss+7.x.html b/cargo/JBoss+7.x.html
index e0c76032c..8a96752c5 100644
--- a/cargo/JBoss+7.x.html
+++ b/cargo/JBoss+7.x.html
@@ -818,7 +818,8 @@ <h5 id="JBoss7.x-Forinstalledcontainero.c.c.c.jboss.JBoss7xInstalledLocalContain
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its OSGi environment, JBoss 7.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its OSGi environment, JBoss 7.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1181,7 +1182,8 @@ <h5 id="JBoss7.x-Forinstalledcontainero.c.c.c.jboss.JBoss7xInstalledLocalContain
               <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><em>JAVA_HOME version 6 or newer</em><br><em>Due to incompatibilities with its OSGi environment, JBoss 7.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its OSGi environment, JBoss 7.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/JOnAS+4.x.html b/cargo/JOnAS+4.x.html
index 4da8f3a6e..1c5df1cfc 100644
--- a/cargo/JOnAS+4.x.html
+++ b/cargo/JOnAS+4.x.html
@@ -761,7 +761,8 @@ <h5 id="JOnAS4.x-Forinstalledcontainero.c.c.c.jonas.Jonas4xInstalledLocalContain
               <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><em>JAVA_HOME version 4 or newer</em><br><em>Due to incompatibilities with its JSP environment, JOnAS 4.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 4 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, JOnAS 4.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1027,7 +1028,8 @@ <h5 id="JOnAS4.x-Forinstalledcontainero.c.c.c.jonas.Jonas4xInstalledLocalContain
               <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><em>JAVA_HOME version 4 or newer</em><br><em>Due to incompatibilities with its JSP environment, JOnAS 4.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 4 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, JOnAS 4.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/JOnAS+5.x.html b/cargo/JOnAS+5.x.html
index 650a7c6d8..73a16aafc 100644
--- a/cargo/JOnAS+5.x.html
+++ b/cargo/JOnAS+5.x.html
@@ -769,7 +769,8 @@ <h5 id="JOnAS5.x-Forinstalledcontainero.c.c.c.jonas.Jonas5xInstalledLocalContain
               <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><em>JAVA_HOME version 5 (JOnAS 5.0.x, 5.1.x and 5.2.x) or 6 (JOnAS 5.3.x) or newer</em><br><em>Due to a bug parsing the Java version in the OW2 utilities, JOnAS 5.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 5 (JOnAS 5.0.x, 5.1.x and 5.2.x) or 6 (JOnAS 5.3.x) or newer</em><br>
+                 &nbsp;<br><em>Due to a bug parsing the Java version in the OW2 utilities, JOnAS 5.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1035,7 +1036,8 @@ <h5 id="JOnAS5.x-Forinstalledcontainero.c.c.c.jonas.Jonas5xInstalledLocalContain
               <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><em>JAVA_HOME version 5 (JOnAS 5.0.x, 5.1.x and 5.2.x) or 6 (JOnAS 5.3.x) or newer</em><br><em>Due to a bug parsing the Java version in the OW2 utilities, JOnAS 5.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 5 (JOnAS 5.0.x, 5.1.x and 5.2.x) or 6 (JOnAS 5.3.x) or newer</em><br>
+                 &nbsp;<br><em>Due to a bug parsing the Java version in the OW2 utilities, JOnAS 5.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/Payara.html b/cargo/Payara.html
index 8fa586eda..e3c20110f 100644
--- a/cargo/Payara.html
+++ b/cargo/Payara.html
@@ -922,7 +922,14 @@ <h5 id="Payara-Forinstalledcontainero.c.c.c.payara.PayaraInstalledLocalContainer
               <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><em>JAVA_HOME version 7 (Payara 4.x), 8 (Payara 5.x), 11 (Payara 6.x onwards) or 21 (Payara 7.x onwards) or newer</em><br><em>Payara 4.x <a href="https://github.com/eclipse-ee4j/glassfish/issues/22130">doesn't run on Java 9 and above</a></em></p></td>
+               <p><em>JAVA_HOME version</em></p>
+               <ul>
+                <li><em>7 (Payara 4.x)</em></li>
+                <li><em>8 (Payara 5.x)</em></li>
+                <li><em>11 (Payara 6.x onwards)</em></li>
+                <li><em>21 (Payara 7.x onwards)</em><br><em>or newer</em><br>
+                  &nbsp;<br><em>Payara 4.x <a href="https://github.com/eclipse-ee4j/glassfish/issues/22130">doesn't run on Java 9 and above</a></em></li>
+               </ul></td>
               <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>
diff --git a/cargo/Resin+3.x.html b/cargo/Resin+3.x.html
index 225932f9f..c11f79571 100644
--- a/cargo/Resin+3.x.html
+++ b/cargo/Resin+3.x.html
@@ -754,7 +754,8 @@ <h5 id="Resin3.x-Forinstalledcontainero.c.c.c.resin.Resin3xInstalledLocalContain
               <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><em>JAVA_HOME version 6, as the Codehaus Cargo</em> <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/resin/internal/ResinRun.html">ResinRun</a></code> <em>class requires Java 6 or newer</em><br><em>Due to incompatibilities between</em> <code>com.<wbr>caucho.<wbr>log.<wbr>EnvironmentLogger</code> <em>and the behaviour described in <a href="https://bugs.openjdk.java.net/browse/JDK-8015098">JDK-8015098</a>, Resin 3.x doesn't run on Java 7 and above</em></p></td>
+               <p><em>JAVA_HOME version 6, as the Codehaus Cargo</em> <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/resin/internal/ResinRun.html">ResinRun</a></code> <em>class requires Java 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities between</em> <code>com.<wbr>caucho.<wbr>log.<wbr>EnvironmentLogger</code> <em>and the behaviour described in <a href="https://bugs.openjdk.java.net/browse/JDK-8015098">JDK-8015098</a>, Resin 3.x doesn't run on Java 7 and above</em></p></td>
               <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>
@@ -937,7 +938,8 @@ <h5 id="Resin3.x-Forinstalledcontainero.c.c.c.resin.Resin3xInstalledLocalContain
               <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><em>JAVA_HOME version 6, as the Codehaus Cargo</em> <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/resin/internal/ResinRun.html">ResinRun</a></code> <em>class requires Java 6 or newer</em><br><em>Due to incompatibilities between</em> <code>com.<wbr>caucho.<wbr>log.<wbr>EnvironmentLogger</code> <em>and the behaviour described in <a href="https://bugs.openjdk.java.net/browse/JDK-8015098">JDK-8015098</a>, Resin 3.x doesn't run on Java 7 and above</em></p></td>
+               <p><em>JAVA_HOME version 6, as the Codehaus Cargo</em> <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/resin/internal/ResinRun.html">ResinRun</a></code> <em>class requires Java 6 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities between</em> <code>com.<wbr>caucho.<wbr>log.<wbr>EnvironmentLogger</code> <em>and the behaviour described in <a href="https://bugs.openjdk.java.net/browse/JDK-8015098">JDK-8015098</a>, Resin 3.x doesn't run on Java 7 and above</em></p></td>
               <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>
diff --git a/cargo/Resin+4.x.html b/cargo/Resin+4.x.html
index 381a3aa9b..c2b4036c3 100644
--- a/cargo/Resin+4.x.html
+++ b/cargo/Resin+4.x.html
@@ -754,7 +754,8 @@ <h5 id="Resin4.x-Forinstalledcontainero.c.c.c.resin.Resin4xInstalledLocalContain
               <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><em>JAVA_HOME version 8 or newer</em><br><em>As opposed to what the Resin documentation indicates, all Resin 4.x versions require Java 8 or above</em></p></td>
+               <p><em>JAVA_HOME version 8 or newer</em><br>
+                 &nbsp;<br><em>As opposed to what the Resin documentation indicates, all Resin 4.x versions require Java 8 or above</em></p></td>
               <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>
@@ -937,7 +938,8 @@ <h5 id="Resin4.x-Forinstalledcontainero.c.c.c.resin.Resin4xInstalledLocalContain
               <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><em>JAVA_HOME version 8 or newer</em><br><em>As opposed to what the Resin documentation indicates, all Resin 4.x versions require Java 8 or above</em></p></td>
+               <p><em>JAVA_HOME version 8 or newer</em><br>
+                 &nbsp;<br><em>As opposed to what the Resin documentation indicates, all Resin 4.x versions require Java 8 or above</em></p></td>
               <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>
diff --git a/cargo/Tomcat+5.x.html b/cargo/Tomcat+5.x.html
index 2ea8592c3..317d1ec7a 100644
--- a/cargo/Tomcat+5.x.html
+++ b/cargo/Tomcat+5.x.html
@@ -754,7 +754,8 @@ <h5 id="Tomcat5.x-Forinstalledcontainero.c.c.c.tomcat.Tomcat5xInstalledLocalCont
               <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><em>JAVA_HOME version 4 or newer</em><br><em>Due to incompatibilities with its JSP environment, Tomcat 5.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 4 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, Tomcat 5.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1152,7 +1153,8 @@ <h5 id="Tomcat5.x-Forembeddedcontainero.c.c.c.tomcat.Tomcat5xEmbeddedLocalContai
               <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><em>JAVA_HOME version 4 or newer</em><br><em>Due to incompatibilities with its JSP environment, Tomcat 5.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 4 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, Tomcat 5.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1551,7 +1553,8 @@ <h5 id="Tomcat5.x-Forinstalledcontainero.c.c.c.tomcat.Tomcat5xInstalledLocalCont
               <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><em>JAVA_HOME version 4 or newer</em><br><em>Due to incompatibilities with its JSP environment, Tomcat 5.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 4 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, Tomcat 5.x doesn't run on Java 8 and above</em></p></td>
               <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>
@@ -1678,7 +1681,8 @@ <h5 id="Tomcat5.x-Forembeddedcontainero.c.c.c.tomcat.Tomcat5xEmbeddedLocalContai
               <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><em>JAVA_HOME version 4 or newer</em><br><em>Due to incompatibilities with its JSP environment, Tomcat 5.x doesn't run on Java 8 and above</em></p></td>
+               <p><em>JAVA_HOME version 4 or newer</em><br>
+                 &nbsp;<br><em>Due to incompatibilities with its JSP environment, Tomcat 5.x doesn't run on Java 8 and above</em></p></td>
               <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>
diff --git a/cargo/WebSphere+8.5.x.html b/cargo/WebSphere+8.5.x.html
index 6882b10d9..d247363a8 100644
--- a/cargo/WebSphere+8.5.x.html
+++ b/cargo/WebSphere+8.5.x.html
@@ -766,7 +766,8 @@ <h5 id="WebSphere8.5.x-Forinstalledcontainero.c.c.c.websphere.WebSphere85xInstal
               <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><em>JAVA_HOME version 6 or newer</em><br><em>By default, Codehaus Cargo will use the JVM from the WebSphere installation directory</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>By default, Codehaus Cargo will use the JVM from the WebSphere installation directory</em></p></td>
               <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>
@@ -1177,7 +1178,8 @@ <h5 id="WebSphere8.5.x-Forinstalledcontainero.c.c.c.websphere.WebSphere85xInstal
               <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><em>JAVA_HOME version 6 or newer</em><br><em>By default, Codehaus Cargo will use the JVM from the WebSphere installation directory</em></p></td>
+               <p><em>JAVA_HOME version 6 or newer</em><br>
+                 &nbsp;<br><em>By default, Codehaus Cargo will use the JVM from the WebSphere installation directory</em></p></td>
               <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>
diff --git a/cargo/WebSphere+9.x.html b/cargo/WebSphere+9.x.html
index ada95be36..b9cafb627 100644
--- a/cargo/WebSphere+9.x.html
+++ b/cargo/WebSphere+9.x.html
@@ -766,7 +766,8 @@ <h5 id="WebSphere9.x-Forinstalledcontainero.c.c.c.websphere.WebSphere9xInstalled
               <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><em>JAVA_HOME version 8 or newer</em><br><em>By default, Codehaus Cargo will use the JVM from the WebSphere installation directory</em></p></td>
+               <p><em>JAVA_HOME version 8 or newer</em><br>
+                 &nbsp;<br><em>By default, Codehaus Cargo will use the JVM from the WebSphere installation directory</em></p></td>
               <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>
@@ -1177,7 +1178,8 @@ <h5 id="WebSphere9.x-Forinstalledcontainero.c.c.c.websphere.WebSphere9xInstalled
               <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><em>JAVA_HOME version 8 or newer</em><br><em>By default, Codehaus Cargo will use the JVM from the WebSphere installation directory</em></p></td>
+               <p><em>JAVA_HOME version 8 or newer</em><br>
+                 &nbsp;<br><em>By default, Codehaus Cargo will use the JVM from the WebSphere installation directory</em></p></td>
               <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>
diff --git a/cargo/WebSphere+Liberty.html b/cargo/WebSphere+Liberty.html
index a3edade21..8fa16fc46 100644
--- a/cargo/WebSphere+Liberty.html
+++ b/cargo/WebSphere+Liberty.html
@@ -902,7 +902,7 @@ <h5 id="WebSphereLiberty-Forinstalledcontainero.c.c.c.liberty.LibertyInstalledLo
           </div>
           <h3 id="WebSphereLiberty-TestedOn">Tested On</h3>
           <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.<br>
-            The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/24.0.0.3/wlp-javaee8-24.0.0.3.zip">https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/24.0.0.3/wlp-javaee8-24.0.0.3.zip</a></p></td>
+            The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/24.0.0.4/wlp-javaee8-24.0.0.4.zip">https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/24.0.0.4/wlp-javaee8-24.0.0.4.zip</a></p></td>
         </tr>
        </tbody>
       </table></td>
diff --git a/cargo/attachments/module-descriptors.jpg b/cargo/attachments/module-descriptors.jpg
index c9b27b64a..cb4baef94 100644
Binary files a/cargo/attachments/module-descriptors.jpg and b/cargo/attachments/module-descriptors.jpg differ