Updated to apache-tomcat-9.0.82

ao-apps · Oct 16, 2023 · f57dd2a · f57dd2a
1 parent 4bc45ce
commit f57dd2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/book/src/main/resources-filtered/META-INF/resources/aoserv/daemon/changelog.jspx b/book/src/main/resources-filtered/META-INF/resources/aoserv/daemon/changelog.jspx
@@ -37,7 +37,7 @@ along with aoserv-daemon.  If not, see <https://www.gnu.org/licenses/>.
     shortTitle="Changelog"
     tocLevels="1"
     datePublished="2020-04-16T21:06:03-05:00"
-    dateModified="2023-10-11T01:00:29Z"
+    dateModified="2023-10-16T19:52:35Z"
   >
     <c:set var="latestRelease" value="1.91.10" />
     <c:if test="${
@@ -62,7 +62,7 @@ along with aoserv-daemon.  If not, see <https://www.gnu.org/licenses/>.
             setting in support of parallel deployments.
           </li>
           <li>Added support for Apache Tomcat 8.5.94 with MySQL JDBC 8.1.0 and PostgreSQL JDBC 42.6.0.</li>
-          <li>Added support for Apache Tomcat 9.0.81 with MySQL JDBC 8.1.0 and PostgreSQL JDBC 42.6.0.</li>
+          <li>Added support for Apache Tomcat 9.0.82 with MySQL JDBC 8.1.0 and PostgreSQL JDBC 42.6.0.</li>
           <li>Added support for Apache Tomcat 10.1.14 with MySQL JDBC 8.1.0 and PostgreSQL JDBC 42.6.0.</li>
         </ul>
       </changelog:release>

diff --git a/src/main/java/com/aoindustries/aoserv/daemon/httpd/tomcat/TomcatCommon_9_0_X.java b/src/main/java/com/aoindustries/aoserv/daemon/httpd/tomcat/TomcatCommon_9_0_X.java
@@ -181,6 +181,9 @@ protected boolean upgradeTomcatDirectory(String optSlash, PosixFile tomcatDirect
       final Version version = new Version(rpm.getVersion(), rpm.getRelease());
       final String suffix = osConfig.getPackageReleaseSuffix();
       // Downgrade support
+      if (version.compareTo("9.0.82-1" + suffix) < 0) {
+        // 9.0.82-1 has same files as 9.0.81-1
+      }
       if (version.compareTo("9.0.81-1" + suffix) < 0) {
         // 9.0.81-1 has same files as 9.0.80-1
       }
@@ -1322,7 +1325,10 @@ protected boolean upgradeTomcatDirectory(String optSlash, PosixFile tomcatDirect
       if (version.compareTo("9.0.81-1" + suffix) >= 0) {
         // 9.0.81-1 has same files as 9.0.80-1
       }
-      if (version.compareTo("9.0.81-1" + suffix) > 0) {
+      if (version.compareTo("9.0.82-1" + suffix) >= 0) {
+        // 9.0.82-1 has same files as 9.0.81-1
+      }
+      if (version.compareTo("9.0.82-1" + suffix) > 0) {
         throw new IllegalStateException("Version of Tomcat newer than expected: " + version);
       }
     }