From 0e6ad8c34e40008272027099a9b85f9899e0ce53 Mon Sep 17 00:00:00 2001
From: ghuber <ghuber@host81-133-165-145.in-addr.btopenworld.com>
Date: Wed, 22 Mar 2023 14:44:52 +0000
Subject: [PATCH] Upgrade to struts 6.1.2

---
 app/pom.xml                              | 4 ++--
 app/src/main/resources/struts.properties | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/pom.xml b/app/pom.xml
index 4431c026fe..4a6ace56c9 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -57,7 +57,7 @@ limitations under the License.
         <slf4j.version>1.7.36</slf4j.version>
         <spring.version>5.3.20</spring.version>
         <spring.security.version>5.7.1</spring.security.version>
-        <struts.version>2.5.29</struts.version>
+        <struts.version>6.1.2</struts.version>
         <velocity.version>2.3</velocity.version>
         <webjars.version>1.6</webjars.version>
         <ws-commons-util.version>1.0.2</ws-commons-util.version>
@@ -499,7 +499,7 @@ limitations under the License.
         <dependency>
             <groupId>com.jgeppert.struts2.bootstrap</groupId>
             <artifactId>struts2-bootstrap-plugin</artifactId>
-            <version>4.0.1</version>
+            <version>5.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/app/src/main/resources/struts.properties b/app/src/main/resources/struts.properties
index fd2435c322..33e57b332c 100644
--- a/app/src/main/resources/struts.properties
+++ b/app/src/main/resources/struts.properties
@@ -13,6 +13,9 @@ struts.devMode=false
 struts.configuration.xml.reload=false
 struts.i18n.reload=false
 
+# search ApplicationResourses.prperties first then follow class hierarchy 
+# struts.i18n.search.defaultbundles.first=true
+
 # this enables the translation of action="foo!method" to work nicely
 struts.enable.DynamicMethodInvocation=true
 struts.mapper.action.prefix.enabled=true