From 59d09f0463ad3c2799d6091df5bba86b07d47432 Mon Sep 17 00:00:00 2001
From: alitokmen <nospam@alishomepage.com>
Date: Fri, 13 Oct 2023 21:56:16 +0200
Subject: [PATCH] Upgrade to Tomcat 9.0.82

---
 cargo/Installation.html        |  4 ++--
 cargo/Maven+3+Plugin+Tips.html | 19 +++++++++++++++----
 cargo/Release+procedure.html   |  4 ++--
 cargo/Tomcat+9.x.html          |  2 +-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/cargo/Installation.html b/cargo/Installation.html
index 84e3916586..392ba72e5b 100644
--- a/cargo/Installation.html
+++ b/cargo/Installation.html
@@ -350,8 +350,8 @@ <h3 id="Installation-JavaAPI">Java API</h3>
               <td colspan="1" class="confluenceTd">WildFly Swarm</td>
               <td colspan="1" class="confluenceTd">
                <ul>
-                <li><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.15.2/jackson-core-2.15.2.jar">Jackson core 2.15.2</a> or greater</li>
-                <li><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.15.2/jackson-dataformat-yaml-2.15.2.jar">Jackson YAML dataformat 2.15.2</a> or greater</li>
+                <li><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.15.3/jackson-core-2.15.3.jar">Jackson core 2.15.3</a> or greater</li>
+                <li><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.15.3/jackson-dataformat-yaml-2.15.3.jar">Jackson YAML dataformat 2.15.3</a> or greater</li>
                 <li><a href="https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.33/snakeyaml-1.33.jar">SnakeYAML 1.33</a> or greater</li>
                </ul></td>
              </tr>
diff --git a/cargo/Maven+3+Plugin+Tips.html b/cargo/Maven+3+Plugin+Tips.html
index c304130f41..846c770a43 100644
--- a/cargo/Maven+3+Plugin+Tips.html
+++ b/cargo/Maven+3+Plugin+Tips.html
@@ -288,7 +288,7 @@ <h3 class="heading3">RSS Feeds</h3>
          <td class="rightColumn">
           <h1 id="Maven3PluginTips-Tips">Tips</h1>
           <ul>
-           <li><a href="#Maven3PluginTips-tip1">Starting mutiple containers conditionally</a></li>
+           <li><a href="#Maven3PluginTips-tip1">Starting multiple containers conditionally</a></li>
            <li><a href="#Maven3PluginTips-tip2">Starting Tomcat in security mode</a></li>
            <li><a href="#Maven3PluginTips-tip3">How to get Tomcat 5 working with the Java 5 XML Parsers</a></li>
            <li><a href="Installer.html#Installer-installer_with_maven2_dependencies">How to use the ZIP or TAR.GZ distributions provided by servers on a Maven repository</a></li>
@@ -414,8 +414,13 @@ <h2 id="Maven3PluginTips-Startingmultiplecontainersconditionally">Starting multi
   </script>
           </center>
           <h2 id="Maven3PluginTips-StartingTomcatinsecuritymode">Starting Tomcat in security mode</h2>
-          <p><span class="legacy-color-text-red2">Warning: the proposed solution only works on Linux, see</span>&nbsp;<a href="https://issues.apache.org/jira/browse/MNG-6437">MNG-6437</a></p>
-          <p>Cargo supports passing system properties <a href="Passing+system+properties.html">Passing system properties</a>. So, to start Tomcat in security mode, you need to specify two system properties:</p>
+          <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>Warning: the proposed solution only works on Linux, see <a href="https://issues.apache.org/jira/browse/MNG-6437">MNG-6437</a>.</p>
+           </div>
+          </div>
+          <p>Cargo supports <a href="Passing+system+properties.html">passing system properties</a>. So, to start Tomcat in security mode, you need to specify two system properties:</p>
           <ul>
            <li><code>java.security.manager</code></li>
            <li><code>java.security.policy</code></li>
@@ -490,7 +495,13 @@ <h2 id="Maven3PluginTips-HowtogetTomcat5workingwiththeJava5XMLParsers">How to ge
           <p><span class="confluence-anchor-link conf-macro output-inline" id="Maven3PluginTips-tip4"><span class="confluence-anchor-link" id="tip4"> </span></span></p>
           <h2 id="Maven3PluginTips-HowtorunaJettywebappunderaJavaSecurityManager">How to run a Jetty webapp under a Java Security Manager</h2>
           <p><strong>Tip submitted by Claude Brisson</strong></p>
-          <p><span class="legacy-color-text-red2"><strong>UPDATE: This solution doesn't work on Windows for now: <code>@cargo.repository@</code>, <code>@cargo.container@</code> and <code><span class="legacy-color-text-red2"><strong>@cargo.webapp@</strong></span></code>&nbsp;should be URIs and not paths</strong></span></p>
+          <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>This solution doesn't work on Windows for now: <code>@cargo.repository@</code>, <code>@cargo.container@</code> and <code>@cargo.webapp@</code> should be URIs and not paths.</p>
+           </div>
+          </div>
+          <p><br></p>
           <p><a href="Jetty+8.x.html">Jetty 8.x</a> has its own security manager, which can be enabled by enabling the <code>jetty-policy.xml</code>&nbsp;module, but it will search for its policies files under a <code>lib/policy</code>&nbsp;directory located in the same location as <code>start.jar</code>, inaccessible to Cargo's custom configuration folders.</p>
           <p>So we'll stick to the&nbsp;<a href="Jetty+9.x.html">Jetty 9.x</a> container. In&nbsp;<a href="Jetty+9.x.html">Jetty 9.x</a> there is no internal security manager, so we'll directly run&nbsp;<a href="Jetty+9.x.html">Jetty 9.x</a> under the standard <code>java.lang.SecurityManager</code>.</p>
           <p>We'll first need a <code>mywebapp.policy</code>&nbsp;policy file. It gives rights to Jetty itself:</p>
diff --git a/cargo/Release+procedure.html b/cargo/Release+procedure.html
index 1116ee0e4f..c711679471 100644
--- a/cargo/Release+procedure.html
+++ b/cargo/Release+procedure.html
@@ -292,7 +292,7 @@ <h3 id="Releaseprocedure-Prerequisites">Prerequisites</h3>
           <ul>
            <li>JDK 11. Please note that older or newer versions of the JDK cannot build all of Codehaus Cargo, and hence should not be used to release new versions.</li>
            <li>Maven 3.2.5 or newer, though it is for sure a good idea to use the latest Maven version available.<br>
-            With Maven 3.8.1 onwards, you might have some <code>ArtifactTransferException</code>s with the OW2 snapshot repository (which was defined as HTTP over a decade back). You can work around these using the instructions in the chapter <a href="#Releaseprocedure-ow2override"><code>ArtifactTransferException</code> with Maven 3.8.1 onwards</a>.</li>
+            With Maven 3.8.1 onwards, you might have some <code>ArtifactTransferException</code>s with the OW2 snapshot repository (which was defined as HTTP over a decade back). You can work around these using the instructions in the chapter <a href="Building.html#Building-ow2override"><code>ArtifactTransferException</code> with Maven 3.8.1 onwards</a>.</li>
            <li>An access to the Sonatype Nexus instance as a manager for the Codehaus Cargo project. Read more about it on the&nbsp;<strong>Initial Setup</strong> section of the <a href="http://central.sonatype.org/pages/ossrh-guide.html">OSSRH guide</a>.</li>
            <li><a href="http://www.gnupg.org/">The GNU privacy guard (GPG)</a> installed on your machine and at least one secret key.
             <ul>
@@ -323,7 +323,7 @@ <h3 id="Releaseprocedure-Beforeyoustart">Before you start</h3>
            <li>All containers with a public download link are automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change:
             <ol>
              <li>Open the CI page and click on the latest build</li>
-             <li>First, check if the overall status is <strong><span class="legacy-color-text-green4">PASSED</span></strong></li>
+             <li>First, check if the overall status is <span class="legacy-color-text-default legacy-color-text-green4"><strong>PASSED</strong></span></li>
              <li>Then, click on the build and check for the command with <code>cat core/samples/java/containers.log</code> in it (on all CI jobs for the last build, as we split the container tests into multiple parallel jobs to reduce the total time required for integration testing). It should indicate status <code>0</code> for all containers:<br><br><span class="confluence-embedded-file-wrapper confluence-embedded-manual-size"><img class="confluence-embedded-image" height="250" loading="lazy" src="attachments/Semaphore%20container%20log.png" srcset="https://codehaus-cargo.atlassian.net/wiki/download/thumbnails/491632/Semaphore%20container%20log.png?version=2&amp;modificationDate=1691490611846&amp;cacheVersion=1&amp;api=v2&amp;width=486&amp;height=500 2x, https://codehaus-cargo.atlassian.net/wiki/download/thumbnails/491632/Semaphore%20container%20log.png?version=2&amp;modificationDate=1691490611846&amp;cacheVersion=1&amp;api=v2&amp;width=243&amp;height=250 1x"></span><br><br></li>
             </ol></li>
            <li>For non-publicly-downloadable containers,&nbsp;tests need to be done on your computer. These include:
diff --git a/cargo/Tomcat+9.x.html b/cargo/Tomcat+9.x.html
index a2e4051c07..fb0e4efcf4 100644
--- a/cargo/Tomcat+9.x.html
+++ b/cargo/Tomcat+9.x.html
@@ -2033,7 +2033,7 @@ <h5 id="Tomcat9.x-Forremotecontainero.c.c.c.tomcat.Tomcat9xRemoteContainer">For
           </div>
           <h3 id="Tomcat9.x-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/org/apache/tomcat/tomcat/9.0.81/tomcat-9.0.81.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.81/tomcat-9.0.81.zip</a></p></td>
+           The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.82/tomcat-9.0.82.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.82/tomcat-9.0.82.zip</a></p></td>
         </tr>
        </tbody>
       </table></td>