From 9e93bb51db6697aae9cbe43d2f4244cae30e55b0 Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage <git@kusal.io>
Date: Mon, 6 Jan 2025 13:46:21 +1100
Subject: [PATCH] Add jakarta package to exclusion list

---
 .../resources/struts-excluded-classes.xml     | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/core/src/main/resources/struts-excluded-classes.xml b/core/src/main/resources/struts-excluded-classes.xml
index 16fa3f4a6..fbc3ee740 100644
--- a/core/src/main/resources/struts-excluded-classes.xml
+++ b/core/src/main/resources/struts-excluded-classes.xml
@@ -28,7 +28,6 @@
 
     <constant name="struts.excludedClasses"
               value="
-                org.apache.struts2.ActionContext,
                 java.lang.Class,
                 java.lang.ClassLoader,
                 java.lang.InheritableThreadLocal,
@@ -43,7 +42,8 @@
                 java.lang.System,
                 java.lang.Thread,
                 java.lang.ThreadGroup,
-                java.lang.ThreadLocal
+                java.lang.ThreadLocal,
+                org.apache.struts2.ActionContext
     "/>
 
     <constant name="struts.devMode.excludedClasses"
@@ -74,15 +74,11 @@
     <constant name="struts.excludedPackageNames"
               value="
                 antlr.build,
-                org.apache.struts2.config,
-                org.apache.struts2.inject,
-                org.apache.struts2.ognl,
-                org.apache.struts2.security,
-                org.apache.struts2.util,
                 freemarker.core,
                 freemarker.ext.jsp,
                 freemarker.ext.rhino,
                 freemarker.template,
+                jakarta,
                 java.io,
                 java.net,
                 java.nio,
@@ -93,6 +89,11 @@
                 org.apache.commons.beanutils,
                 org.apache.commons.collections,
                 org.apache.jasper,
+                org.apache.struts2.config,
+                org.apache.struts2.inject,
+                org.apache.struts2.ognl,
+                org.apache.struts2.security,
+                org.apache.struts2.util,
                 org.apache.tomcat,
                 org.apache.velocity,
                 org.objectweb.asm,
@@ -106,15 +107,11 @@
     <constant name="struts.devMode.excludedPackageNames"
               value="
                 antlr.build,
-                org.apache.struts2.config,
-                org.apache.struts2.inject,
-                org.apache.struts2.ognl,
-                org.apache.struts2.security,
-                org.apache.struts2.util,
                 freemarker.core,
                 freemarker.ext.jsp,
                 freemarker.ext.rhino,
                 freemarker.template,
+                jakarta,
                 java.io,
                 java.net,
                 java.nio,
@@ -125,7 +122,11 @@
                 org.apache.commons.beanutils,
                 org.apache.commons.collections,
                 org.apache.jasper,
+                org.apache.struts2.config,
+                org.apache.struts2.inject,
                 org.apache.struts2.ognl,
+                org.apache.struts2.security,
+                org.apache.struts2.util,
                 org.apache.tomcat,
                 org.apache.velocity,
                 org.objectweb.asm,