Refactor StartupAbortException out of the validator package

Author: dsoumis

java/org/apache/catalina/startup/Bootstrap.java

@@ -540,7 +540,7 @@ public static void main(String[] args) {
 
     public static boolean isStartupAbort(Throwable t) {
         while (t != null) {
-            if ("org.apache.catalina.startup.validator.StartupAbortException".equals(t.getClass().getName())) {
+            if ("org.apache.catalina.startup.StartupAbortException".equals(t.getClass().getName())) {
                 return true;
             }
             t = t.getCause();

java/org/apache/catalina/startup/Catalina.java

@@ -38,7 +38,6 @@
 import org.apache.catalina.Server;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.startup.validator.StartupAbortException;
 import org.apache.juli.ClassLoaderLogManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;

…tup/validator/StartupAbortException.java …alina/startup/StartupAbortException.javajava/org/apache/catalina/startup/validator/StartupAbortException.java renamed to java/org/apache/catalina/startup/StartupAbortException.java java/org/apache/catalina/startup/validator/StartupAbortException.java renamed to java/org/apache/catalina/startup/StartupAbortException.java

@@ -15,12 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.startup.validator;
+package org.apache.catalina.startup;
+
+import java.io.Serial;
 
 /**
  * Exception used to abort startup due to validation failures without producing a noisy stack trace.
  */
 public class StartupAbortException extends RuntimeException {
+    @Serial
     private static final long serialVersionUID = 1L;
 
     public StartupAbortException(String message) {

java/org/apache/catalina/startup/validator/StartupValidationListener.java

@@ -20,6 +20,7 @@
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Server;
+import org.apache.catalina.startup.StartupAbortException;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.res.StringManager;