diff --git a/apps/rest-showcase/src/main/resources/struts.xml b/apps/rest-showcase/src/main/resources/struts.xml
index a8991da66..b4515186f 100644
--- a/apps/rest-showcase/src/main/resources/struts.xml
+++ b/apps/rest-showcase/src/main/resources/struts.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 
 <struts>
@@ -41,4 +41,4 @@
     <package name="rest-showcase" extends="rest-default">
         <global-allowed-methods>index,show,create,update,destroy,deleteConfirm,edit,editNew</global-allowed-methods>
     </package>
-</struts>
\ No newline at end of file
+</struts>
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml
index 07a7e5d7b..1c63b912f 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml
@@ -21,31 +21,31 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0.2//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
 <validators>
 	<field name="description1">
 		<field-validator type="requiredstring">
 			<message>Description1 Is Required !!!</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="description2">
 		<field-validator type="requiredstring">
 			<message>Description2 Is Required !!!</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="description3">
 		<field-validator type="requiredstring">
 			<message>Description3 Is Required !!!</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="description4">
 		<field-validator type="requiredstring">
 			<message>Description4 Is Required !!!</message>
 		</field-validator>
 	</field>
-</validators>  		
- 
+</validators>
+
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-validation.xml
index 2fb09bc77..a19d0449d 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <!-- Field-Validator Syntax -->
     <field name="currentEmployee.empId">
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction-validation.xml
index 0c0929ff2..5c2574a4d 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <!-- Field-Validator Syntax -->
     <field name="currentSkill.name">
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml
index cfd41786e..e15b2506f 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0.2//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
 	<field name="upload">
@@ -35,5 +35,4 @@
 			<message>Caption cannot be empty</message>
 		</field-validator>
 	</field>
-</validators>  		
-  		
\ No newline at end of file
+</validators>
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml
index a3f63fc5d..0bd8abe33 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="person">
         <field-validator type="visitor">
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml
index 8cdef7094..425d4154f 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="name">
         <field-validator type="requiredstring">
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml
index 44eb0032f..07f1ea9ad 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml
@@ -21,8 +21,8 @@
 -->
 <!DOCTYPE validators PUBLIC
 	"-//Apache Struts//XWork Validator 1.0.2//EN"
-	"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-	
+	"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
 <validators>
 	<field name="value">
 		<field-validator type="requiredstring">
@@ -30,13 +30,13 @@
 			<message>Value must not be empty</message>
 		</field-validator>
 	</field>
-	
-	
+
+
 	<field name="count">
 		<field-validator type="int">
 			<message>Count must be an integer</message>
-		</field-validator>	
+		</field-validator>
 	</field>
-</validators>	
+</validators>
 
 
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml
index 0beb7e3a9..2d732c0ab 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml
@@ -21,10 +21,10 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
-<!-- START SNIPPET: fieldValidatorsExample -->  		
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
+<!-- START SNIPPET: fieldValidatorsExample -->
+
 <validators>
 	<field name="requiredValidatorField">
 		<field-validator type="required">
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml
index 5d23023bb..4def409bb 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml
@@ -19,12 +19,12 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC 
+<!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
-<!-- START SNIPPET: fieldValidatorsExample -->  		
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
+<!-- START SNIPPET: fieldValidatorsExample -->
+
 <validators>
 	<field name="requiredValidatorField">
 		<field-validator type="required">
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml
index 92fb2313e..a94a9e2ff 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml
@@ -19,13 +19,13 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC 
+<!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
-  		
-<!-- START SNIPPET: nonFieldValidatorsExample -->  		
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
+
+<!-- START SNIPPET: nonFieldValidatorsExample -->
+
 <validators>
 	<validator type="expression">
 		<param name="expression"><![CDATA[ ( (someText == someTextRetype) && (someTextRetype == someTextRetypeAgain) ) ]]></param>
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml
index 411612fd1..8f7a48604 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml
@@ -19,11 +19,11 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 <!--  START SNIPPET: quizValidators -->
 <!--
     Add the following DOCTYPE declaration as first line of your XXX-validation.xml file:
-    <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+    <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 -->
 <validators>
     <field name="name">
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/SubmitApplication-submitApplication-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/SubmitApplication-submitApplication-validation.xml
index d6ef55067..492475df6 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/SubmitApplication-submitApplication-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/SubmitApplication-submitApplication-validation.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
 	<field name="name">
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml
index 1020aa60a..1e3dd4c6c 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml
@@ -19,17 +19,17 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC 
+<!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
 <validators>
 	<field name="name">
 		<field-validator type="requiredstring">
 			<message>Name Required</message>
 		</field-validator>
 	</field>
-	<field name="age">	
+	<field name="age">
 		<field-validator type="int">
 			<param name="min">1</param>
 			<param name="max">100</param>
@@ -41,6 +41,6 @@
 			<message>Birthday Required</message>
 		</field-validator>
 	</field>
-</validators>  		
+</validators>
 
 
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml
index 7e24f4bb2..cb4a8138f 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml
@@ -19,10 +19,10 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC 
+<!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
 <!-- START SNIPPET: visitorValidatorsExample -->
 
 <validators>
diff --git a/apps/showcase/src/main/resources/struts-actionchaining.xml b/apps/showcase/src/main/resources/struts-actionchaining.xml
index f140f9e96..2b187dd72 100644
--- a/apps/showcase/src/main/resources/struts-actionchaining.xml
+++ b/apps/showcase/src/main/resources/struts-actionchaining.xml
@@ -21,12 +21,12 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-	
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
 	<package name="actionchaining" extends="struts-default" namespace="/actionchaining">
 		<action name="actionChain1" class="org.apache.struts2.showcase.actionchaining.ActionChain1">
-			<result type="chain">actionChain2</result>		
+			<result type="chain">actionChain2</result>
 		</action>
 		<action name="actionChain2" class="org.apache.struts2.showcase.actionchaining.ActionChain2">
 			<result type="chain">actionChain3</result>
diff --git a/apps/showcase/src/main/resources/struts-async.xml b/apps/showcase/src/main/resources/struts-async.xml
index faa38656c..0921e6832 100644
--- a/apps/showcase/src/main/resources/struts-async.xml
+++ b/apps/showcase/src/main/resources/struts-async.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="async" extends="json-default" namespace="/async">
diff --git a/apps/showcase/src/main/resources/struts-conversion.xml b/apps/showcase/src/main/resources/struts-conversion.xml
index a3c147bd6..4c4c1658a 100644
--- a/apps/showcase/src/main/resources/struts-conversion.xml
+++ b/apps/showcase/src/main/resources/struts-conversion.xml
@@ -21,15 +21,15 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-	
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
 	<package name="conversion" namespace="/conversion" extends="struts-default">
-	
+
         <action name="index">
             <result>/WEB-INF/conversion/index.jsp</result>
         </action>
-        
+
 		<!-- Example populating a List inside an Action -->
 		<action name="enterPersonsInfo" method="input"
 				class="org.apache.struts2.showcase.conversion.PersonAction">
@@ -49,8 +49,8 @@
 		<action name="showPersonJavaCode">
 			<result type="plainText">/WEB-INF/conversion/Person.java.txt</result>
 		</action>
-		
-		
+
+
 		<!-- Example populating a Set inside an Action -->
 		<action name="enterAddressesInfo" class="org.apache.struts2.showcase.conversion.AddressAction" method="input">
 			<result>/WEB-INF/conversion/enterAddressInfo.jsp</result>
@@ -68,9 +68,9 @@
 		<action name="showAddressJavaCode">
 			<result type="plainText">/WEB-INF/conversion/Address.java.txt</result>
 		</action>
-		
-		
-		<!-- Example populating a List with Tiger 5 Enum  -->		
+
+
+		<!-- Example populating a List with Tiger 5 Enum  -->
 		<action name="enterOperationEnumInfo" class="org.apache.struts2.showcase.conversion.OperationsEnumAction" method="input">
 			<result>/WEB-INF/conversion/enterOperations.jsp</result>
 		</action>
@@ -93,6 +93,6 @@
 		<action name="showOperationsEnumActionConversionProperties">
 			<result type="plainText">/WEB-INF/conversion/OperationsEnumActionConversion.txt</result>
 		</action>
-		
+
 	</package>
-</struts>	
+</struts>
diff --git a/apps/showcase/src/main/resources/struts-dispatcher.xml b/apps/showcase/src/main/resources/struts-dispatcher.xml
index 0a89502fe..7051b1f3c 100644
--- a/apps/showcase/src/main/resources/struts-dispatcher.xml
+++ b/apps/showcase/src/main/resources/struts-dispatcher.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="dispatcher" extends="struts-default" namespace="/dispatcher">
diff --git a/apps/showcase/src/main/resources/struts-filedownload.xml b/apps/showcase/src/main/resources/struts-filedownload.xml
index 56d083f0a..335777bd4 100644
--- a/apps/showcase/src/main/resources/struts-filedownload.xml
+++ b/apps/showcase/src/main/resources/struts-filedownload.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 	<package name="filedownload" extends="struts-default" namespace="/filedownload">
diff --git a/apps/showcase/src/main/resources/struts-fileupload.xml b/apps/showcase/src/main/resources/struts-fileupload.xml
index 33be370ba..4efcad89f 100644
--- a/apps/showcase/src/main/resources/struts-fileupload.xml
+++ b/apps/showcase/src/main/resources/struts-fileupload.xml
@@ -21,11 +21,11 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 	<package name="fileupload" extends="struts-default" namespace="/fileupload">
-        
+
         <action name="upload" class="org.apache.struts2.showcase.fileupload.FileUploadAction" method="input">
 			<result>/WEB-INF/fileupload/upload.jsp</result>
 		</action>
@@ -34,11 +34,11 @@
         	<result name="input">/WEB-INF/fileupload/upload.jsp</result>
 			<result>/WEB-INF/fileupload/upload-success.jsp</result>
 		</action>
-		
+
 		<action name="multipleUploadUsingList">
 			<result>/WEB-INF/fileupload/multipleUploadUsingList.jsp</result>
 		</action>
-		
+
 		<action name="doMultipleUploadUsingList" class="org.apache.struts2.showcase.fileupload.MultipleFileUploadUsingListAction" method="upload">
                         <result name="input">/WEB-INF/fileupload/multipleUploadUsingList.jsp</result>
 			<result>/WEB-INF/fileupload/multiple-success.jsp</result>
diff --git a/apps/showcase/src/main/resources/struts-freemarker.xml b/apps/showcase/src/main/resources/struts-freemarker.xml
index 26ee8aedc..c0de0a92a 100644
--- a/apps/showcase/src/main/resources/struts-freemarker.xml
+++ b/apps/showcase/src/main/resources/struts-freemarker.xml
@@ -21,16 +21,16 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="freemarker" namespace="/freemarker" extends="struts-default">
         <action name="customFreemarkerManagerDemo">
             <result type="freemarker">/WEB-INF/freemarker/customFreemarkerManagerUsage.ftl</result>
         </action>
-        
+
         <action name="standardTags" class="org.apache.struts2.showcase.freemarker.StandardTagsAction">
             <result type="freemarker">/WEB-INF/freemarker/standardTags.ftl</result>
         </action>
     </package>
-</struts>	
+</struts>
diff --git a/apps/showcase/src/main/resources/struts-hangman.xml b/apps/showcase/src/main/resources/struts-hangman.xml
index ee1f4f6a1..d81f4b368 100644
--- a/apps/showcase/src/main/resources/struts-hangman.xml
+++ b/apps/showcase/src/main/resources/struts-hangman.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 	<package name="hangman" extends="struts-default" namespace="/hangman">
@@ -41,9 +41,9 @@
 			<result type="freemarker">/WEB-INF/hangman/hangmanNonAjax.ftl</result>
 		</action>
 	</package>
-	
-	
-	
+
+
+
 	<package name="hangman-ajax" extends="struts-default" namespace="/hangman/ajax">
 		<action name="blank">
 			<result type="freemarker">/WEB-INF/hangman/blank.ftl</result>
@@ -61,4 +61,4 @@
 			<result type="freemarker">/WEB-INF/hangman/updateGuessLeft.ftl</result>
 		</action>
 	</package>
-</struts>	
+</struts>
diff --git a/apps/showcase/src/main/resources/struts-interactive.xml b/apps/showcase/src/main/resources/struts-interactive.xml
index ad584a17a..cda563df5 100644
--- a/apps/showcase/src/main/resources/struts-interactive.xml
+++ b/apps/showcase/src/main/resources/struts-interactive.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="interactive" namespace="/interactive" extends="struts-default">
@@ -38,4 +38,4 @@
         </action>
         <action name="example" class="org.apache.struts2.showcase.action.ExampleAction" />
     </package>
-</struts>    
\ No newline at end of file
+</struts>
diff --git a/apps/showcase/src/main/resources/struts-model-driven.xml b/apps/showcase/src/main/resources/struts-model-driven.xml
index c8731e980..da01d922e 100644
--- a/apps/showcase/src/main/resources/struts-model-driven.xml
+++ b/apps/showcase/src/main/resources/struts-model-driven.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 	<package name="modelDriven" extends="struts-default" namespace="/modelDriven">
@@ -29,11 +29,10 @@
 		<action name="modelDriven" class="org.apache.struts2.showcase.modelDriven.ModelDrivenAction" method="input">
 			<result>/WEB-INF/modelDriven/modelDriven.jsp</result>
 		</action>
-		
+
 		<!-- Display the result page whose content is populated using the Model-Driven technique -->
 		<action name="modelDrivenResult" class="org.apache.struts2.showcase.modelDriven.ModelDrivenAction">
 			<result>/WEB-INF/modelDriven/modelDrivenResult.jsp</result>
 		</action>
 	</package>
-</struts>	
-	
\ No newline at end of file
+</struts>
diff --git a/apps/showcase/src/main/resources/struts-person.xml b/apps/showcase/src/main/resources/struts-person.xml
index 946c4c104..a1500888d 100644
--- a/apps/showcase/src/main/resources/struts-person.xml
+++ b/apps/showcase/src/main/resources/struts-person.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <!-- START SNIPPET: xworkSample -->
 
diff --git a/apps/showcase/src/main/resources/struts-tags-non-ui.xml b/apps/showcase/src/main/resources/struts-tags-non-ui.xml
index 42d0506ae..f445da037 100644
--- a/apps/showcase/src/main/resources/struts-tags-non-ui.xml
+++ b/apps/showcase/src/main/resources/struts-tags-non-ui.xml
@@ -21,14 +21,14 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-	
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
-	
+
 	<!-- ================================== -->
 	<!-- === Package for ActionTag Demo === -->
 	<!-- ================================== -->
-	
+
 	<package name="actionTag" extends="struts-default" namespace="/tags/non-ui/actionTag">
 		<action name="showActionTagDemo" class="org.apache.struts2.showcase.tag.nonui.actiontag.ActionTagDemo" method="show">
 			<result>/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
@@ -46,11 +46,11 @@
 			<result type="plainText">/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
 		</action>
 	</package>
-	
+
 	<!-- ==================================== -->
 	<!-- === Package for IteratorGeneratorTag Demo === -->
 	<!-- ==================================== -->
-	
+
 	<package name="iteratorGeneratorTag" extends="struts-default" namespace="/tags/non-ui/iteratorGeneratorTag">
 		<action name="showGeneratorTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="input">
 			<result>/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
@@ -60,8 +60,8 @@
 			<result>/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp</result>
 		</action>
 	</package>
-	
-	
+
+
 	<!-- ===================================== -->
 	<!-- === Package for AppendIteratorTag Demo ===  -->
 	<!-- ========================================== -->
@@ -74,8 +74,8 @@
 			<result>/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp</result>
 		</action>
 	</package>
-	
-	
+
+
 	<!-- ====================================== -->
 	<!-- === Package for MergeIteratorTag Demo === -->
 	<!-- ========================================= -->
@@ -88,7 +88,7 @@
 			<result>/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp</result>
 		</action>
 	</package>
-	
+
 	<!-- ============================================= -->
 	<!-- === Package for SubsetIteratorTag Demo === -->
 	<!-- =========================================== -->
@@ -101,14 +101,14 @@
 			<result>/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp</result>
 		</action>
 	</package>
-	
+
 	<!-- ========================================= -->
 	<!-- === Package for Action Prefix Example === -->
 	<!-- ========================================= -->
 	<package name="actionPrefix" extends="struts-default" namespace="/tags/non-ui/actionPrefix">
 		<action name="actionPrefixExampleUsingFreemarker">
 			<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
-		</action>	
+		</action>
 		<action name="submit" class="org.apache.struts2.showcase.tag.nonui.actionPrefix.SubmitAction">
 			<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl</result>
 		</action>
@@ -131,7 +131,7 @@
 			<result type="plainText">/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
 		</action>
 	</package>
-	
+
 	<!--  ========================================== -->
 	<!--  === Package for If Tag Test / Examples === -->
 	<!--  ========================================== -->
diff --git a/apps/showcase/src/main/resources/struts-tags-ui.xml b/apps/showcase/src/main/resources/struts-tags-ui.xml
index 13e33d65b..1055678ad 100644
--- a/apps/showcase/src/main/resources/struts-tags-ui.xml
+++ b/apps/showcase/src/main/resources/struts-tags-ui.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="ui-tags" extends="velocity-default" namespace="/tags/ui">
diff --git a/apps/showcase/src/main/resources/struts-tags.xml b/apps/showcase/src/main/resources/struts-tags.xml
index b2896dace..c9482f10f 100644
--- a/apps/showcase/src/main/resources/struts-tags.xml
+++ b/apps/showcase/src/main/resources/struts-tags.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <include file="struts-tags-ui.xml"/>
diff --git a/apps/showcase/src/main/resources/struts-tiles.xml b/apps/showcase/src/main/resources/struts-tiles.xml
index 6845710dc..5fa2f8071 100644
--- a/apps/showcase/src/main/resources/struts-tiles.xml
+++ b/apps/showcase/src/main/resources/struts-tiles.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="tiles" extends="tiles-default" namespace="/tiles">
diff --git a/apps/showcase/src/main/resources/struts-token.xml b/apps/showcase/src/main/resources/struts-token.xml
index 5f41d1a31..db6704168 100644
--- a/apps/showcase/src/main/resources/struts-token.xml
+++ b/apps/showcase/src/main/resources/struts-token.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="token" extends="struts-default" namespace="/token">
 
diff --git a/apps/showcase/src/main/resources/struts-validation.xml b/apps/showcase/src/main/resources/struts-validation.xml
index 23d662f55..31bcab48f 100755
--- a/apps/showcase/src/main/resources/struts-validation.xml
+++ b/apps/showcase/src/main/resources/struts-validation.xml
@@ -21,8 +21,8 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-	
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
 
     <constant name="struts.beanValidation.providerClass" value="org.hibernate.validator.HibernateValidator"/>
@@ -74,7 +74,7 @@
 		<action name="ajaxFormSubmitSuccess" class="org.apache.struts2.showcase.validation.AjaxFormSubmitSuccessAction">
 			<result>/WEB-INF/validation/ajaxFormSubmitSuccess.jsp</result>
 		</action>
-		
+
 	</package>
 
 
@@ -83,46 +83,46 @@
 		<action name="list">
 			<result>index.jsp</result>
 		</action>
-		
-		
+
+
 		<!-- ======================== -->
 		<!-- === Field Validators === -->
 		<!-- ======================== -->
-		
+
 		<action name="showFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="input">
 			<result name="input" type="dispatcher">/WEB-INF/validation/fieldValidatorsExample.jsp</result>
 		</action>
-		
+
 		<action name="submitFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="submit">
 			<result name="input" type="dispatcher">/WEB-INF/validation/fieldValidatorsExample.jsp</result>
 			<result type="dispatcher">/WEB-INF/validation/successFieldValidatorsExample.jsp</result>
 		</action>
-		
-		
-		
+
+
+
 		<!-- ============================ -->
 		<!-- === Non Field Validators === -->
 		<!-- ============================ -->
-		
+
 		<action name="showNonFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.NonFieldValidatorsExampleAction" method="input">
 			<result name="input">/WEB-INF/validation/nonFieldValidatorsExample.jsp</result>
 		</action>
-		
+
 		<action name="submitNonFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.NonFieldValidatorsExampleAction" method="submit">
 			<result name="input">/WEB-INF/validation/nonFieldValidatorsExample.jsp</result>
 			<result>/WEB-INF/validation/successNonFieldValidatorsExample.jsp</result>
 		</action>
-		
-		
-		
+
+
+
 		<!-- ========================== -->
 		<!-- === Visitor Validators === -->
 		<!-- ========================== -->
-		
+
 		<action name="showVisitorValidatorsExamples" class="org.apache.struts2.showcase.validation.VisitorValidatorsExampleAction" method="input">
 			<result name="input">/WEB-INF/validation/visitorValidatorsExample.jsp</result>
 		</action>
-		
+
 		<action name="submitVisitorValidatorsExamples" class="org.apache.struts2.showcase.validation.VisitorValidatorsExampleAction" method="submit">
 			<result name="input">/WEB-INF/validation/visitorValidatorsExample.jsp</result>
 			<result>/WEB-INF/validation/successVisitorValidatorsExample.jsp</result>
@@ -146,7 +146,7 @@
 		<!-- =========================================== -->
 		<!-- === Store Error Messages Across Request === -->
 		<!-- =========================================== -->
-		
+
 		<action name="submitApplication" class="org.apache.struts2.showcase.validation.SubmitApplication" method="submitApplication">
 			<interceptor-ref name="store">
 				<param name="operationMode">STORE</param>
@@ -173,7 +173,7 @@
 		<action name="cancelApplication" class="org.apache.struts2.showcase.validation.SubmitApplication" method="cancelApplication">
 			<result>/WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp</result>
 		</action>
-		
+
     </package>
 </struts>
-	
+
diff --git a/apps/showcase/src/main/resources/struts-wait.xml b/apps/showcase/src/main/resources/struts-wait.xml
index 273e8e550..8ede40d74 100644
--- a/apps/showcase/src/main/resources/struts-wait.xml
+++ b/apps/showcase/src/main/resources/struts-wait.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="wait" extends="struts-default" namespace="/wait">
diff --git a/apps/showcase/src/main/resources/struts-xslt.xml b/apps/showcase/src/main/resources/struts-xslt.xml
index 5bbdc55b5..261b367e4 100644
--- a/apps/showcase/src/main/resources/struts-xslt.xml
+++ b/apps/showcase/src/main/resources/struts-xslt.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="xslt" extends="struts-default" namespace="/xslt">
@@ -36,7 +36,7 @@
                 <param name="exposedValue">info.classpath</param>
             </result>
         </action>
-        
+
         <action name="jvmInfoRaw" class="org.apache.struts2.showcase.xslt.JVMAction">
             <result type="xslt">
                 <param name="exposedValue">info</param>
diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml
index cfdac4b39..cb47af8bf 100644
--- a/apps/showcase/src/main/resources/struts.xml
+++ b/apps/showcase/src/main/resources/struts.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <!-- START SNIPPET: xworkSample -->
 <struts>
diff --git a/bundles/admin/src/main/resources/struts.xml b/bundles/admin/src/main/resources/struts.xml
index e106e8bdf..2bb1bf134 100644
--- a/bundles/admin/src/main/resources/struts.xml
+++ b/bundles/admin/src/main/resources/struts.xml
@@ -22,13 +22,13 @@
 
 <!DOCTYPE struts PUBLIC
     "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-    "http://struts.apache.org/dtds/struts-2.5.dtd">
+    "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <constant name="struts.enable.DynamicMethodInvocation" value="false" />
     <package name="bundle-admin" namespace="/osgi/admin" extends="osgi-default" strict-method-invocation="true">
         <default-action-ref name="bundles" />
-        
+
         <action name="bundle_*!*" class="org.apache.struts2.osgi.admin.actions.BundlesAction" method="{2}">
             <param name="id">{1}</param>
             <result type="freemarker">viewBundle.ftl</result>
diff --git a/bundles/demo/src/main/resources/struts.xml b/bundles/demo/src/main/resources/struts.xml
index 0e4d78967..003635f16 100644
--- a/bundles/demo/src/main/resources/struts.xml
+++ b/bundles/demo/src/main/resources/struts.xml
@@ -21,11 +21,11 @@
 -->
 <!DOCTYPE struts PUBLIC
     "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-    "http://struts.apache.org/dtds/struts-2.5.dtd">
+    "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
-    <!-- Set some Struts 2 constants relevant to the OSGi Plugin. 
-           Note:  The constant definitions specified here (within the demo bundle) may also need to be 
+    <!-- Set some Struts 2 constants relevant to the OSGi Plugin.
+           Note:  The constant definitions specified here (within the demo bundle) may also need to be
                   duplicated in the struts.xml configuration of the outer project that packages the demo
                   bundle JAR file within it.
     -->
@@ -52,4 +52,4 @@
         </action>
 
     </package>
-</struts>
\ No newline at end of file
+</struts>
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/Validator.java b/core/src/main/java/com/opensymphony/xwork2/validator/Validator.java
index 4a8c87333..6550e513a 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/Validator.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/Validator.java
@@ -222,7 +222,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * &lt;!-- START SNIPPET: exShortCircuitingValidators --&gt;
  * &lt;!DOCTYPE validators PUBLIC
  *         &quot;-//Apache Struts//XWork Validator 1.0.3//EN&quot;
- *  	   &quot;http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd&quot;&gt;
+ *  	   &quot;https://struts.apache.org/dtds/xwork-validator-1.0.3.dtd&quot;&gt;
  * &lt;validators&gt;
  *   &lt;!-- Field Validators for email field --&gt;
  *   &lt;field name=&quot;email&quot;&gt;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java b/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java
index 8510fe6bb..f085d1b12 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java
@@ -115,7 +115,7 @@ package com.opensymphony.xwork2.validator;
  * <pre>
  * <!-- START SNIPPET: exValidationRules1 -->
  * &lt;!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN"
-   		"http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"&gt;
+   		"https://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"&gt;
  * &lt;validators&gt;
  *   &lt;field name="bar"&gt;
  *       &lt;field-validator type="required"&gt;
diff --git a/core/src/main/resources/com/opensymphony/xwork2/validator/validators/default.xml b/core/src/main/resources/com/opensymphony/xwork2/validator/validators/default.xml
index f3972e4e6..b0e6ed4f8 100644
--- a/core/src/main/resources/com/opensymphony/xwork2/validator/validators/default.xml
+++ b/core/src/main/resources/com/opensymphony/xwork2/validator/validators/default.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE validators PUBLIC
         "-//Apache Struts//XWork Validator Definition 1.0//EN"
-        "http://struts.apache.org/dtds/xwork-validator-definition-1.0.dtd">
+        "https://struts.apache.org/dtds/xwork-validator-definition-1.0.dtd">
 
 <!-- START SNIPPET: validators-default -->
 <validators>
diff --git a/core/src/main/resources/struts-2.0.dtd b/core/src/main/resources/struts-2.0.dtd
index b71a8539a..0f4ffa9cb 100644
--- a/core/src/main/resources/struts-2.0.dtd
+++ b/core/src/main/resources/struts-2.0.dtd
@@ -24,10 +24,10 @@
 <!--
    Struts configuration DTD.
    Use the following DOCTYPE
-   
-   <!DOCTYPE struts PUBLIC 
+
+   <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-	"http://struts.apache.org/dtds/struts-2.0.dtd">
+	"https://struts.apache.org/dtds/struts-2.0.dtd">
 -->
 
 <!ELEMENT struts (package|include|bean|constant)*>
@@ -131,7 +131,7 @@
 <!ELEMENT constant (#PCDATA)>
 <!ATTLIST constant
     name CDATA #REQUIRED
-    value CDATA #REQUIRED    
+    value CDATA #REQUIRED
 >
 
 <!-- END SNIPPET: strutsDtd -->
diff --git a/core/src/main/resources/struts-2.1.7.dtd b/core/src/main/resources/struts-2.1.7.dtd
index 790202cf6..6af002e93 100644
--- a/core/src/main/resources/struts-2.1.7.dtd
+++ b/core/src/main/resources/struts-2.1.7.dtd
@@ -27,7 +27,7 @@
 
    <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
-	"http://struts.apache.org/dtds/struts-2.1.7.dtd">
+	"https://struts.apache.org/dtds/struts-2.1.7.dtd">
 -->
 
 <!ELEMENT struts ((package|include|bean|constant)*, unknown-handler-stack?)>
diff --git a/core/src/main/resources/struts-2.1.dtd b/core/src/main/resources/struts-2.1.dtd
index e6ad908c7..760ab3143 100644
--- a/core/src/main/resources/struts-2.1.dtd
+++ b/core/src/main/resources/struts-2.1.dtd
@@ -27,7 +27,7 @@
 
    <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.1//EN"
-	"http://struts.apache.org/dtds/struts-2.1.dtd">
+	"https://struts.apache.org/dtds/struts-2.1.dtd">
 -->
 
 <!ELEMENT struts ((package|include|bean|constant)*, unknown-handler-stack?)>
diff --git a/core/src/main/resources/struts-2.3.dtd b/core/src/main/resources/struts-2.3.dtd
index 4a1eeb9cb..67ab3c65a 100644
--- a/core/src/main/resources/struts-2.3.dtd
+++ b/core/src/main/resources/struts-2.3.dtd
@@ -27,7 +27,7 @@
 
    <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
+	"https://struts.apache.org/dtds/struts-2.3.dtd">
 -->
 
 <!ELEMENT struts ((package|include|bean|constant)*, unknown-handler-stack?)>
diff --git a/core/src/main/resources/struts-2.5.dtd b/core/src/main/resources/struts-2.5.dtd
index d0ee064d9..5bdf627a2 100644
--- a/core/src/main/resources/struts-2.5.dtd
+++ b/core/src/main/resources/struts-2.5.dtd
@@ -27,7 +27,7 @@
 
    <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 -->
 
 <!ELEMENT struts ((package|include|bean|constant)*, unknown-handler-stack?)>
diff --git a/core/src/main/resources/struts-6.0.dtd b/core/src/main/resources/struts-6.0.dtd
index 3df027de9..3741c445d 100644
--- a/core/src/main/resources/struts-6.0.dtd
+++ b/core/src/main/resources/struts-6.0.dtd
@@ -27,7 +27,7 @@
 
    <!DOCTYPE struts PUBLIC
     "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-    "http://struts.apache.org/dtds/struts-6.0.dtd">
+    "https://struts.apache.org/dtds/struts-6.0.dtd">
 -->
 
 <!ELEMENT struts ((package|include|bean|constant)*,bean-selection?, unknown-handler-stack?)>
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index a75c14ec0..467b9007c 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -31,8 +31,8 @@
     and {@link com.opensymphony.xwork2.inject.Inject}
 -->
 <!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-        "struts-6.0.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
+        "https://struts.apache.org/dtds/struts-6.0.dtd">
 
 <struts>
 
@@ -47,7 +47,7 @@
                 java.lang.ProcessBuilder,
                 java.lang.Thread,
                 sun.misc.Unsafe,
-                com.opensymphony.xwork2.ActionContext" />
+                com.opensymphony.xwork2.ActionContext"/>
 
     <constant name="struts.devMode.excludedClasses"
               value="
@@ -58,7 +58,7 @@
                 java.lang.ClassLoader,
                 java.lang.Shutdown,
                 java.lang.ProcessBuilder,
-                sun.misc.Unsafe" />
+                sun.misc.Unsafe"/>
 
     <!-- this must be valid regex, each '.' in package name must be escaped! -->
     <!-- it's more flexible but slower than simple string comparison -->
@@ -89,7 +89,7 @@
                 com.opensymphony.xwork2.util.,
                 org.apache.tomcat.,
                 org.apache.catalina.core.,
-                org.wildfly.extension.undertow.deployment." />
+                org.wildfly.extension.undertow.deployment."/>
 
     <constant name="struts.devMode.excludedPackageNames"
               value="
@@ -111,128 +111,207 @@
                 com.opensymphony.xwork2.inject.,
                 com.opensymphony.xwork2.ognl.,
                 com.opensymphony.xwork2.security.,
-                com.opensymphony.xwork2.util." />
+                com.opensymphony.xwork2.util."/>
 
     <bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/>
-    <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts" class="org.apache.struts2.factory.StrutsResultFactory" />
-    <bean type="com.opensymphony.xwork2.factory.ActionFactory" name="struts" class="com.opensymphony.xwork2.factory.DefaultActionFactory" />
-    <bean type="com.opensymphony.xwork2.factory.ConverterFactory" name="struts" class="com.opensymphony.xwork2.factory.StrutsConverterFactory" />
-    <bean type="com.opensymphony.xwork2.factory.InterceptorFactory" name="struts" class="com.opensymphony.xwork2.factory.DefaultInterceptorFactory" />
-    <bean type="com.opensymphony.xwork2.factory.ValidatorFactory" name="struts" class="com.opensymphony.xwork2.factory.DefaultValidatorFactory" />
-    <bean type="com.opensymphony.xwork2.factory.UnknownHandlerFactory" name="struts" class="com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory" />
+    <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts"
+          class="org.apache.struts2.factory.StrutsResultFactory"/>
+    <bean type="com.opensymphony.xwork2.factory.ActionFactory" name="struts"
+          class="com.opensymphony.xwork2.factory.DefaultActionFactory"/>
+    <bean type="com.opensymphony.xwork2.factory.ConverterFactory" name="struts"
+          class="com.opensymphony.xwork2.factory.StrutsConverterFactory"/>
+    <bean type="com.opensymphony.xwork2.factory.InterceptorFactory" name="struts"
+          class="com.opensymphony.xwork2.factory.DefaultInterceptorFactory"/>
+    <bean type="com.opensymphony.xwork2.factory.ValidatorFactory" name="struts"
+          class="com.opensymphony.xwork2.factory.DefaultValidatorFactory"/>
+    <bean type="com.opensymphony.xwork2.factory.UnknownHandlerFactory" name="struts"
+          class="com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory"/>
 
-    <bean type="com.opensymphony.xwork2.FileManager" class="com.opensymphony.xwork2.util.fs.DefaultFileManager" name="system" scope="singleton"/>
-    <bean type="com.opensymphony.xwork2.FileManagerFactory" class="com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory" name="struts" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.FileManager" class="com.opensymphony.xwork2.util.fs.DefaultFileManager"
+          name="system" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.FileManagerFactory"
+          class="com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory" name="struts" scope="singleton"/>
 
-    <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="struts" class="org.apache.struts2.factory.StrutsActionProxyFactory"/>
-    <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="prefix" class="org.apache.struts2.factory.PrefixBasedActionProxyFactory"/>
+    <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="struts"
+          class="org.apache.struts2.factory.StrutsActionProxyFactory"/>
+    <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="prefix"
+          class="org.apache.struts2.factory.PrefixBasedActionProxyFactory"/>
 
-    <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer" name="struts" class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
+    <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer" name="struts"
+          class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
 
-    <bean type="com.opensymphony.xwork2.util.PatternMatcher" name="struts" class="com.opensymphony.xwork2.util.WildcardHelper" />
-    <bean type="com.opensymphony.xwork2.util.PatternMatcher" name="namedVariable" class="com.opensymphony.xwork2.util.NamedVariablePatternMatcher"/>
-    <bean type="com.opensymphony.xwork2.util.PatternMatcher" name="regex" class="org.apache.struts2.util.RegexPatternMatcher"/>
+    <bean type="com.opensymphony.xwork2.util.PatternMatcher" name="struts"
+          class="com.opensymphony.xwork2.util.WildcardHelper"/>
+    <bean type="com.opensymphony.xwork2.util.PatternMatcher" name="namedVariable"
+          class="com.opensymphony.xwork2.util.NamedVariablePatternMatcher"/>
+    <bean type="com.opensymphony.xwork2.util.PatternMatcher" name="regex"
+          class="org.apache.struts2.util.RegexPatternMatcher"/>
 
-    <bean type="org.apache.struts2.util.ContentTypeMatcher" name="struts" class="org.apache.struts2.util.DefaultContentTypeMatcher"/>
+    <bean type="org.apache.struts2.util.ContentTypeMatcher" name="struts"
+          class="org.apache.struts2.util.DefaultContentTypeMatcher"/>
 
-    <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="struts" class="org.apache.struts2.dispatcher.mapper.DefaultActionMapper" />
-    <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="composite" class="org.apache.struts2.dispatcher.mapper.CompositeActionMapper" />
-    <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="prefix" class="org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper" />
-    <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="restful" class="org.apache.struts2.dispatcher.mapper.RestfulActionMapper" />
-    <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="restful2" class="org.apache.struts2.dispatcher.mapper.Restful2ActionMapper" />
+    <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="struts"
+          class="org.apache.struts2.dispatcher.mapper.DefaultActionMapper"/>
+    <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="composite"
+          class="org.apache.struts2.dispatcher.mapper.CompositeActionMapper"/>
+    <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="prefix"
+          class="org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper"/>
+    <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="restful"
+          class="org.apache.struts2.dispatcher.mapper.RestfulActionMapper"/>
+    <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="restful2"
+          class="org.apache.struts2.dispatcher.mapper.Restful2ActionMapper"/>
 
-    <bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest" name="jakarta" class="org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest" scope="prototype"/>
-    <bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest" name="jakarta-stream" class="org.apache.struts2.dispatcher.multipart.JakartaStreamMultiPartRequest" scope="prototype"/>
+    <bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest" name="jakarta"
+          class="org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest" scope="prototype"/>
+    <bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest" name="jakarta-stream"
+          class="org.apache.struts2.dispatcher.multipart.JakartaStreamMultiPartRequest" scope="prototype"/>
 
-    <bean type="org.apache.struts2.views.TagLibraryModelProvider" name="s" class="org.apache.struts2.views.DefaultTagLibrary" />
+    <bean type="org.apache.struts2.views.TagLibraryModelProvider" name="s"
+          class="org.apache.struts2.views.DefaultTagLibrary"/>
 
-    <bean class="org.apache.struts2.views.freemarker.FreemarkerThemeTemplateLoader" />
-    <bean class="org.apache.struts2.views.freemarker.FreemarkerManager" name="struts" />
+    <bean class="org.apache.struts2.views.freemarker.FreemarkerThemeTemplateLoader"/>
+    <bean class="org.apache.struts2.views.freemarker.FreemarkerManager" name="struts"/>
 
-    <bean class="org.apache.struts2.components.template.TemplateEngineManager" />
-    <bean type="org.apache.struts2.components.template.TemplateEngine" name="ftl" class="org.apache.struts2.components.template.FreemarkerTemplateEngine" />
-    <bean type="org.apache.struts2.components.template.TemplateEngine" name="jsp" class="org.apache.struts2.components.template.JspTemplateEngine" />
+    <bean class="org.apache.struts2.components.template.TemplateEngineManager"/>
+    <bean type="org.apache.struts2.components.template.TemplateEngine" name="ftl"
+          class="org.apache.struts2.components.template.FreemarkerTemplateEngine"/>
+    <bean type="org.apache.struts2.components.template.TemplateEngine" name="jsp"
+          class="org.apache.struts2.components.template.JspTemplateEngine"/>
 
-    <bean type="com.opensymphony.xwork2.conversion.impl.XWorkConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
+    <bean type="com.opensymphony.xwork2.conversion.impl.XWorkConverter" name="struts"
+          class="com.opensymphony.xwork2.conversion.impl.XWorkConverter"/>
 
-    <bean type="com.opensymphony.xwork2.conversion.ConversionPropertiesProcessor" name="struts" class="org.apache.struts2.conversion.StrutsConversionPropertiesProcessor" />
-    <bean type="com.opensymphony.xwork2.conversion.ConversionFileProcessor" name="struts" class="com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor" />
-    <bean type="com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor" name="struts" class="com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProcessor" />
-    <bean type="com.opensymphony.xwork2.conversion.TypeConverterCreator" name="struts" class="org.apache.struts2.conversion.StrutsTypeConverterCreator" />
-    <bean type="com.opensymphony.xwork2.conversion.TypeConverterHolder" name="struts" class="org.apache.struts2.conversion.StrutsTypeConverterHolder" />
+    <bean type="com.opensymphony.xwork2.conversion.ConversionPropertiesProcessor" name="struts"
+          class="org.apache.struts2.conversion.StrutsConversionPropertiesProcessor"/>
+    <bean type="com.opensymphony.xwork2.conversion.ConversionFileProcessor" name="struts"
+          class="com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor"/>
+    <bean type="com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor" name="struts"
+          class="com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProcessor"/>
+    <bean type="com.opensymphony.xwork2.conversion.TypeConverterCreator" name="struts"
+          class="org.apache.struts2.conversion.StrutsTypeConverterCreator"/>
+    <bean type="com.opensymphony.xwork2.conversion.TypeConverterHolder" name="struts"
+          class="org.apache.struts2.conversion.StrutsTypeConverterHolder"/>
 
-    <bean class="com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter" />
+    <bean class="com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter"/>
 
-    <bean type="com.opensymphony.xwork2.conversion.impl.CollectionConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.CollectionConverter" scope="singleton"/>
-    <bean type="com.opensymphony.xwork2.conversion.impl.ArrayConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.ArrayConverter" scope="singleton"/>
-    <bean type="com.opensymphony.xwork2.conversion.impl.DateConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.DateConverter" scope="singleton"/>
-    <bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.NumberConverter" scope="singleton"/>
-    <bean type="com.opensymphony.xwork2.conversion.impl.StringConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.StringConverter" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.conversion.impl.CollectionConverter" name="struts"
+          class="com.opensymphony.xwork2.conversion.impl.CollectionConverter" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.conversion.impl.ArrayConverter" name="struts"
+          class="com.opensymphony.xwork2.conversion.impl.ArrayConverter" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.conversion.impl.DateConverter" name="struts"
+          class="com.opensymphony.xwork2.conversion.impl.DateConverter" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" name="struts"
+          class="com.opensymphony.xwork2.conversion.impl.NumberConverter" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.conversion.impl.StringConverter" name="struts"
+          class="com.opensymphony.xwork2.conversion.impl.StringConverter" scope="singleton"/>
 
-    <bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="global-only" class="com.opensymphony.xwork2.util.GlobalLocalizedTextProvider" scope="singleton" />
-    <bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="struts" class="com.opensymphony.xwork2.util.StrutsLocalizedTextProvider" scope="singleton" />
+    <bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="global-only"
+          class="com.opensymphony.xwork2.util.GlobalLocalizedTextProvider" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="struts"
+          class="com.opensymphony.xwork2.util.StrutsLocalizedTextProvider" scope="singleton"/>
 
-    <bean type="com.opensymphony.xwork2.TextProvider" name="system" class="com.opensymphony.xwork2.DefaultTextProvider" scope="singleton" />
-    <bean type="com.opensymphony.xwork2.TextProviderFactory" name="struts" class="com.opensymphony.xwork2.StrutsTextProviderFactory" scope="singleton" />
-    <bean type="com.opensymphony.xwork2.LocaleProviderFactory" name="struts" class="com.opensymphony.xwork2.DefaultLocaleProviderFactory" scope="singleton" />
+    <bean type="com.opensymphony.xwork2.TextProvider" name="system" class="com.opensymphony.xwork2.DefaultTextProvider"
+          scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.TextProviderFactory" name="struts"
+          class="com.opensymphony.xwork2.StrutsTextProviderFactory" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.LocaleProviderFactory" name="struts"
+          class="com.opensymphony.xwork2.DefaultLocaleProviderFactory" scope="singleton"/>
 
-    <bean type="org.apache.struts2.components.UrlRenderer" name="struts" class="org.apache.struts2.components.ServletUrlRenderer"/>
-    <bean type="org.apache.struts2.views.util.UrlHelper" name="struts" class="org.apache.struts2.views.util.DefaultUrlHelper"/>
+    <bean type="org.apache.struts2.components.UrlRenderer" name="struts"
+          class="org.apache.struts2.components.ServletUrlRenderer"/>
+    <bean type="org.apache.struts2.views.util.UrlHelper" name="struts"
+          class="org.apache.struts2.views.util.DefaultUrlHelper"/>
 
-    <bean type="com.opensymphony.xwork2.util.ValueStackFactory" name="struts" class="com.opensymphony.xwork2.ognl.OgnlValueStackFactory" />
-    <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider" name="struts" class="com.opensymphony.xwork2.ognl.OgnlReflectionProvider" />
-    <bean type="com.opensymphony.xwork2.util.reflection.ReflectionContextFactory" name="struts" class="com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory" />
+    <bean type="com.opensymphony.xwork2.util.ValueStackFactory" name="struts"
+          class="com.opensymphony.xwork2.ognl.OgnlValueStackFactory"/>
+    <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider" name="struts"
+          class="com.opensymphony.xwork2.ognl.OgnlReflectionProvider"/>
+    <bean type="com.opensymphony.xwork2.util.reflection.ReflectionContextFactory" name="struts"
+          class="com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory"/>
 
-    <bean type="com.opensymphony.xwork2.conversion.NullHandler" name="java.lang.Object" class="com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler" />
+    <bean type="com.opensymphony.xwork2.conversion.NullHandler" name="java.lang.Object"
+          class="com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler"/>
 
-    <bean type="com.opensymphony.xwork2.validator.ActionValidatorManager" name="struts" class="com.opensymphony.xwork2.validator.AnnotationActionValidatorManager" />
-    <bean type="com.opensymphony.xwork2.validator.ActionValidatorManager" name="no-annotations" class="com.opensymphony.xwork2.validator.DefaultActionValidatorManager" />
+    <bean type="com.opensymphony.xwork2.validator.ActionValidatorManager" name="struts"
+          class="com.opensymphony.xwork2.validator.AnnotationActionValidatorManager"/>
+    <bean type="com.opensymphony.xwork2.validator.ActionValidatorManager" name="no-annotations"
+          class="com.opensymphony.xwork2.validator.DefaultActionValidatorManager"/>
 
-    <bean type="com.opensymphony.xwork2.validator.ValidatorFactory" class="com.opensymphony.xwork2.validator.DefaultValidatorFactory"/>
-    <bean type="com.opensymphony.xwork2.validator.ValidatorFileParser" class="com.opensymphony.xwork2.validator.DefaultValidatorFileParser" />
+    <bean type="com.opensymphony.xwork2.validator.ValidatorFactory"
+          class="com.opensymphony.xwork2.validator.DefaultValidatorFactory"/>
+    <bean type="com.opensymphony.xwork2.validator.ValidatorFileParser"
+          class="com.opensymphony.xwork2.validator.DefaultValidatorFileParser"/>
 
-    <bean class="com.opensymphony.xwork2.ognl.OgnlUtil" />
+    <bean class="com.opensymphony.xwork2.ognl.OgnlUtil"/>
 
-    <bean type="com.opensymphony.xwork2.util.TextParser" name="struts" class="com.opensymphony.xwork2.util.OgnlTextParser" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.util.TextParser" name="struts"
+          class="com.opensymphony.xwork2.util.OgnlTextParser" scope="singleton"/>
 
-    <bean type="ognl.PropertyAccessor" name="com.opensymphony.xwork2.util.CompoundRoot" class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
-    <bean type="ognl.PropertyAccessor" name="java.lang.Object" class="com.opensymphony.xwork2.ognl.accessor.ObjectAccessor" />
-    <bean type="ognl.PropertyAccessor" name="java.util.Iterator" class="com.opensymphony.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor" />
-    <bean type="ognl.PropertyAccessor" name="java.util.Enumeration" class="com.opensymphony.xwork2.ognl.accessor.XWorkEnumerationAccessor" />
-    <bean type="ognl.PropertyAccessor" name="java.util.List" class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
-    <bean type="ognl.PropertyAccessor" name="java.util.Set" class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
-    <bean type="ognl.PropertyAccessor" name="java.util.Map" class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
-    <bean type="ognl.PropertyAccessor" name="java.util.Collection" class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
-    <bean type="ognl.PropertyAccessor" name="com.opensymphony.xwork2.ognl.ObjectProxy" class="com.opensymphony.xwork2.ognl.accessor.ObjectProxyPropertyAccessor" />
-    <bean type="ognl.PropertyAccessor" name="org.apache.struts2.dispatcher.HttpParameters" class="com.opensymphony.xwork2.ognl.accessor.HttpParametersPropertyAccessor" />
-    <bean type="ognl.PropertyAccessor" name="org.apache.struts2.dispatcher.Parameter" class="com.opensymphony.xwork2.ognl.accessor.ParameterPropertyAccessor" />
+    <bean type="ognl.PropertyAccessor" name="com.opensymphony.xwork2.util.CompoundRoot"
+          class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="java.lang.Object"
+          class="com.opensymphony.xwork2.ognl.accessor.ObjectAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="java.util.Iterator"
+          class="com.opensymphony.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="java.util.Enumeration"
+          class="com.opensymphony.xwork2.ognl.accessor.XWorkEnumerationAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="java.util.List"
+          class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="java.util.Set"
+          class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="java.util.Map"
+          class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="java.util.Collection"
+          class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="com.opensymphony.xwork2.ognl.ObjectProxy"
+          class="com.opensymphony.xwork2.ognl.accessor.ObjectProxyPropertyAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="org.apache.struts2.dispatcher.HttpParameters"
+          class="com.opensymphony.xwork2.ognl.accessor.HttpParametersPropertyAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="org.apache.struts2.dispatcher.Parameter"
+          class="com.opensymphony.xwork2.ognl.accessor.ParameterPropertyAccessor"/>
 
-    <bean type="ognl.MethodAccessor" name="java.lang.Object" class="com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor" />
-    <bean type="ognl.MethodAccessor" name="com.opensymphony.xwork2.util.CompoundRoot" class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
+    <bean type="ognl.MethodAccessor" name="java.lang.Object"
+          class="com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor"/>
+    <bean type="ognl.MethodAccessor" name="com.opensymphony.xwork2.util.CompoundRoot"
+          class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor"/>
 
-    <bean class="org.apache.struts2.views.jsp.ui.OgnlTool" />
+    <bean class="org.apache.struts2.views.jsp.ui.OgnlTool"/>
 
-    <bean type="org.apache.struts2.dispatcher.StaticContentLoader" class="org.apache.struts2.dispatcher.DefaultStaticContentLoader" name="struts" />
-    <bean type="com.opensymphony.xwork2.UnknownHandlerManager" class="com.opensymphony.xwork2.DefaultUnknownHandlerManager" name="struts" />
+    <bean type="org.apache.struts2.dispatcher.StaticContentLoader"
+          class="org.apache.struts2.dispatcher.DefaultStaticContentLoader" name="struts"/>
+    <bean type="com.opensymphony.xwork2.UnknownHandlerManager"
+          class="com.opensymphony.xwork2.DefaultUnknownHandlerManager" name="struts"/>
 
-    <bean type="org.apache.struts2.dispatcher.DispatcherErrorHandler" name="struts" class="org.apache.struts2.dispatcher.DefaultDispatcherErrorHandler" />
+    <bean type="org.apache.struts2.dispatcher.DispatcherErrorHandler" name="struts"
+          class="org.apache.struts2.dispatcher.DefaultDispatcherErrorHandler"/>
 
     <!--  Silly workarounds for OGNL since there is currently no way to flush its internal caches -->
-    <bean type="ognl.PropertyAccessor" name="java.util.ArrayList" class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
-    <bean type="ognl.PropertyAccessor" name="java.util.HashSet" class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
-    <bean type="ognl.PropertyAccessor" name="java.util.HashMap" class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
+    <bean type="ognl.PropertyAccessor" name="java.util.ArrayList"
+          class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="java.util.HashSet"
+          class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor"/>
+    <bean type="ognl.PropertyAccessor" name="java.util.HashMap"
+          class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor"/>
 
-    <bean type="com.opensymphony.xwork2.security.ExcludedPatternsChecker" name="struts" class="com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker" scope="prototype" />
-    <bean type="com.opensymphony.xwork2.security.AcceptedPatternsChecker" name="struts" class="com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker" scope="prototype" />
-    <bean type="com.opensymphony.xwork2.security.NotExcludedAcceptedPatternsChecker" name="struts" class="com.opensymphony.xwork2.security.DefaultNotExcludedAcceptedPatternsChecker" scope="singleton" />
+    <bean type="com.opensymphony.xwork2.security.ExcludedPatternsChecker" name="struts"
+          class="com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker" scope="prototype"/>
+    <bean type="com.opensymphony.xwork2.security.AcceptedPatternsChecker" name="struts"
+          class="com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker" scope="prototype"/>
+    <bean type="com.opensymphony.xwork2.security.NotExcludedAcceptedPatternsChecker" name="struts"
+          class="com.opensymphony.xwork2.security.DefaultNotExcludedAcceptedPatternsChecker" scope="singleton"/>
 
-    <bean type="com.opensymphony.xwork2.config.providers.ValueSubstitutor" class="com.opensymphony.xwork2.config.providers.EnvsValueSubstitutor" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.config.providers.ValueSubstitutor"
+          class="com.opensymphony.xwork2.config.providers.EnvsValueSubstitutor" scope="singleton"/>
 
-    <bean type="org.apache.struts2.components.date.DateFormatter" name="simpleDateFormatter" class="org.apache.struts2.components.date.SimpleDateFormatAdapter" scope="singleton"/>
-    <bean type="org.apache.struts2.components.date.DateFormatter" name="dateTimeFormatter" class="org.apache.struts2.components.date.DateTimeFormatterAdapter" scope="singleton"/>
+    <bean type="org.apache.struts2.components.date.DateFormatter" name="simpleDateFormatter"
+          class="org.apache.struts2.components.date.SimpleDateFormatAdapter" scope="singleton"/>
+    <bean type="org.apache.struts2.components.date.DateFormatter" name="dateTimeFormatter"
+          class="org.apache.struts2.components.date.DateTimeFormatterAdapter" scope="singleton"/>
 
-    <bean type="com.opensymphony.xwork2.ognl.ExpressionCacheFactory" name="struts" class="com.opensymphony.xwork2.ognl.DefaultOgnlExpressionCacheFactory" scope="singleton" />
-    <bean type="com.opensymphony.xwork2.ognl.BeanInfoCacheFactory" name="struts" class="com.opensymphony.xwork2.ognl.DefaultOgnlBeanInfoCacheFactory" scope="singleton" />
+    <bean type="com.opensymphony.xwork2.ognl.ExpressionCacheFactory" name="struts"
+          class="com.opensymphony.xwork2.ognl.DefaultOgnlExpressionCacheFactory" scope="singleton"/>
+    <bean type="com.opensymphony.xwork2.ognl.BeanInfoCacheFactory" name="struts"
+          class="com.opensymphony.xwork2.ognl.DefaultOgnlBeanInfoCacheFactory" scope="singleton"/>
 
     <package name="struts-default" abstract="true">
         <result-types>
@@ -244,50 +323,57 @@
             <result-type name="redirectAction" class="org.apache.struts2.result.ServletActionRedirectResult"/>
             <result-type name="stream" class="org.apache.struts2.result.StreamResult"/>
             <result-type name="xslt" class="org.apache.struts2.views.xslt.XSLTResult"/>
-            <result-type name="plainText" class="org.apache.struts2.result.PlainTextResult" />
-            <result-type name="postback" class="org.apache.struts2.result.PostbackResult" />
+            <result-type name="plainText" class="org.apache.struts2.result.PlainTextResult"/>
+            <result-type name="postback" class="org.apache.struts2.result.PostbackResult"/>
         </result-types>
 
         <interceptors>
             <interceptor name="alias" class="com.opensymphony.xwork2.interceptor.AliasInterceptor"/>
-            <interceptor name="autowiring" class="com.opensymphony.xwork2.spring.interceptor.ActionAutowiringInterceptor"/>
+            <interceptor name="autowiring"
+                         class="com.opensymphony.xwork2.spring.interceptor.ActionAutowiringInterceptor"/>
             <interceptor name="chain" class="com.opensymphony.xwork2.interceptor.ChainingInterceptor"/>
             <interceptor name="coepInterceptor" class="org.apache.struts2.interceptor.CoepInterceptor"/>
-            <interceptor name="conversionError" class="org.apache.struts2.interceptor.StrutsConversionErrorInterceptor"/>
+            <interceptor name="conversionError"
+                         class="org.apache.struts2.interceptor.StrutsConversionErrorInterceptor"/>
             <interceptor name="cookie" class="org.apache.struts2.interceptor.CookieInterceptor"/>
             <interceptor name="cookieProvider" class="org.apache.struts2.interceptor.CookieProviderInterceptor"/>
-            <interceptor name="clearSession" class="org.apache.struts2.interceptor.ClearSessionInterceptor" />
+            <interceptor name="clearSession" class="org.apache.struts2.interceptor.ClearSessionInterceptor"/>
             <interceptor name="coopInterceptor" class="org.apache.struts2.interceptor.CoopInterceptor"/>
-            <interceptor name="createSession" class="org.apache.struts2.interceptor.CreateSessionInterceptor" />
+            <interceptor name="createSession" class="org.apache.struts2.interceptor.CreateSessionInterceptor"/>
             <interceptor name="cspInterceptor" class="org.apache.struts2.interceptor.csp.CspInterceptor"/>
-            <interceptor name="debugging" class="org.apache.struts2.interceptor.debugging.DebuggingInterceptor" />
+            <interceptor name="debugging" class="org.apache.struts2.interceptor.debugging.DebuggingInterceptor"/>
             <interceptor name="execAndWait" class="org.apache.struts2.interceptor.ExecuteAndWaitInterceptor"/>
             <interceptor name="exception" class="com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor"/>
             <interceptor name="fileUpload" class="org.apache.struts2.interceptor.FileUploadInterceptor"/>
             <interceptor name="i18n" class="org.apache.struts2.interceptor.I18nInterceptor"/>
             <interceptor name="logger" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
             <interceptor name="modelDriven" class="com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor"/>
-            <interceptor name="scopedModelDriven" class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor"/>
+            <interceptor name="scopedModelDriven"
+                         class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor"/>
             <interceptor name="params" class="com.opensymphony.xwork2.interceptor.ParametersInterceptor"/>
             <interceptor name="paramRemover" class="com.opensymphony.xwork2.interceptor.ParameterRemoverInterceptor"/>
-            <interceptor name="actionMappingParams" class="org.apache.struts2.interceptor.ActionMappingParametersInterceptor"/>
+            <interceptor name="actionMappingParams"
+                         class="org.apache.struts2.interceptor.ActionMappingParametersInterceptor"/>
             <interceptor name="prepare" class="com.opensymphony.xwork2.interceptor.PrepareInterceptor"/>
             <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
             <interceptor name="scope" class="org.apache.struts2.interceptor.ScopeInterceptor"/>
             <interceptor name="servletConfig" class="org.apache.struts2.interceptor.ServletConfigInterceptor"/>
             <interceptor name="token" class="org.apache.struts2.interceptor.TokenInterceptor"/>
             <interceptor name="tokenSession" class="org.apache.struts2.interceptor.TokenSessionStoreInterceptor"/>
-            <interceptor name="validation" class="org.apache.struts2.interceptor.validation.AnnotationValidationInterceptor"/>
+            <interceptor name="validation"
+                         class="org.apache.struts2.interceptor.validation.AnnotationValidationInterceptor"/>
             <interceptor name="workflow" class="com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor"/>
-            <interceptor name="store" class="org.apache.struts2.interceptor.MessageStoreInterceptor" />
-            <interceptor name="checkbox" class="org.apache.struts2.interceptor.CheckboxInterceptor" />
-            <interceptor name="datetime" class="org.apache.struts2.interceptor.DateTextFieldInterceptor" />
-            <interceptor name="roles" class="org.apache.struts2.interceptor.RolesInterceptor" />
-            <interceptor name="annotationWorkflow" class="com.opensymphony.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor" />
-            <interceptor name="annotationParameterFilter" class="com.opensymphony.xwork2.interceptor.annotations.AnnotationParameterFilterInterceptor" />
-            <interceptor name="multiselect" class="org.apache.struts2.interceptor.MultiselectInterceptor" />
-            <interceptor name="noop" class="org.apache.struts2.interceptor.NoOpInterceptor" />
-            <interceptor name="fetchMetadata" class="org.apache.struts2.interceptor.FetchMetadataInterceptor" />
+            <interceptor name="store" class="org.apache.struts2.interceptor.MessageStoreInterceptor"/>
+            <interceptor name="checkbox" class="org.apache.struts2.interceptor.CheckboxInterceptor"/>
+            <interceptor name="datetime" class="org.apache.struts2.interceptor.DateTextFieldInterceptor"/>
+            <interceptor name="roles" class="org.apache.struts2.interceptor.RolesInterceptor"/>
+            <interceptor name="annotationWorkflow"
+                         class="com.opensymphony.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor"/>
+            <interceptor name="annotationParameterFilter"
+                         class="com.opensymphony.xwork2.interceptor.annotations.AnnotationParameterFilterInterceptor"/>
+            <interceptor name="multiselect" class="org.apache.struts2.interceptor.MultiselectInterceptor"/>
+            <interceptor name="noop" class="org.apache.struts2.interceptor.NoOpInterceptor"/>
+            <interceptor name="fetchMetadata" class="org.apache.struts2.interceptor.FetchMetadataInterceptor"/>
 
             <!-- Empty stack - performs no operations -->
             <interceptor-stack name="emptyStack">
@@ -448,11 +534,11 @@
                 </interceptor-ref>
             </interceptor-stack>
 
-       </interceptors>
+        </interceptors>
 
         <default-interceptor-ref name="defaultStack"/>
 
-        <default-class-ref class="com.opensymphony.xwork2.ActionSupport" />
+        <default-class-ref class="com.opensymphony.xwork2.ActionSupport"/>
 
         <global-allowed-methods>execute,input,back,cancel,browse,save,delete,list,index</global-allowed-methods>
 
diff --git a/core/src/main/resources/xwork-default.xml b/core/src/main/resources/xwork-default.xml
index fcdcb5f43..b4dce657b 100644
--- a/core/src/main/resources/xwork-default.xml
+++ b/core/src/main/resources/xwork-default.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="xwork-default" abstract="true">
 
diff --git a/core/src/main/resources/xwork-validator-1.0.2.dtd b/core/src/main/resources/xwork-validator-1.0.2.dtd
index a54734033..aa7713800 100644
--- a/core/src/main/resources/xwork-validator-1.0.2.dtd
+++ b/core/src/main/resources/xwork-validator-1.0.2.dtd
@@ -22,10 +22,10 @@
 <!--
   XWork Validators DTD.
   Used the following DOCTYPE.
-  
-  <!DOCTYPE validators PUBLIC 
+
+  <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0.2//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 -->
 
 
diff --git a/core/src/main/resources/xwork-validator-1.0.3.dtd b/core/src/main/resources/xwork-validator-1.0.3.dtd
index 5a056887e..7ebc36285 100644
--- a/core/src/main/resources/xwork-validator-1.0.3.dtd
+++ b/core/src/main/resources/xwork-validator-1.0.3.dtd
@@ -25,7 +25,7 @@
 
   <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0.3//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
 -->
 
 
diff --git a/core/src/main/resources/xwork-validator-1.0.dtd b/core/src/main/resources/xwork-validator-1.0.dtd
index 7be377f14..278770612 100644
--- a/core/src/main/resources/xwork-validator-1.0.dtd
+++ b/core/src/main/resources/xwork-validator-1.0.dtd
@@ -22,10 +22,10 @@
 <!--
   XWork Validators DTD.
   Used the following DOCTYPE.
-  
-  <!DOCTYPE validators PUBLIC 
+
+  <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 -->
 
 
diff --git a/core/src/main/resources/xwork-validator-config-1.0.dtd b/core/src/main/resources/xwork-validator-config-1.0.dtd
index 8714b75ae..e98dcf966 100644
--- a/core/src/main/resources/xwork-validator-config-1.0.dtd
+++ b/core/src/main/resources/xwork-validator-config-1.0.dtd
@@ -25,7 +25,7 @@
 
   <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator Config 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
+  		"https://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
 -->
 <!ELEMENT validators (validator)+>
 
diff --git a/core/src/main/resources/xwork-validator-definition-1.0.dtd b/core/src/main/resources/xwork-validator-definition-1.0.dtd
index 801f7594e..e93bd7887 100644
--- a/core/src/main/resources/xwork-validator-definition-1.0.dtd
+++ b/core/src/main/resources/xwork-validator-definition-1.0.dtd
@@ -25,7 +25,7 @@
 
   <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator Definition 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-definition-1.0.dtd">
+  		"https://struts.apache.org/dtds/xwork-validator-definition-1.0.dtd">
 -->
 
 <!ELEMENT validators (validator*)>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAction-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAction-validation.xml
index 1a777b9c1..6ef6dc27a 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAction-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="count">
         <field-validator type="required">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml
index 9bc2cf0b8..5aa306686 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="baz">
         <field-validator type="required">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml
index 8682377a9..8304c0b0c 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="bean.name">
         <field-validator type="required">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml
index 9d5f9f5a1..229c25789 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="bar">
         <field-validator type="required">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml
index 9bc2cf0b8..5aa306686 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="baz">
         <field-validator type="required">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml
index f6af52390..4a9187f99 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="count">
         <field-validator type="int">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml
index 0c5f26fa1..c51dd3f77 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="name">
         <field-validator type="requiredstring" foo="bar">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml
index ca388b594..74921d6fd 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 <validators>
     <field name="count">
         <field-validator type="int" short-circuit="true">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml
index 39894eac1..8fd7044f6 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="name">
         <field-validator type="fieldexpression">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml
index 0437eb27b..4e620947f 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="name">
         <field-validator type="requiredstring">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml
index 11655bb1f..b7a554612 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="birth">
         <field-validator type="date">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml
index 05adfb1a3..de417db12 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="birth">
         <field-validator type="date">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml
index ec7fc715b..0cb7401f0 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 <validators>
     <field name="name">
         <field-validator type="requiredstring" short-circuit="true">
@@ -28,7 +28,7 @@
     <field-validator type="fieldexpression">
         <param name="expression">name == 'test'</param>
         <message>Name is invalid</message>
-    </field-validator> 
+    </field-validator>
     </field>
     <field name="birth">
         <field-validator type="date">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/ValidationOrderAction-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/ValidationOrderAction-validation.xml
index ddb2ce12c..a16765297 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/ValidationOrderAction-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/ValidationOrderAction-validation.xml
@@ -19,9 +19,9 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC 
+<!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0.2//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
 	<field name="username">
@@ -47,13 +47,13 @@
 			<message>confirmed password must match password</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="firstName">
 		<field-validator type="requiredstring">
 			<message>first name required</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="lastName">
 		<field-validator type="requiredstring">
 			<message>last name required</message>
@@ -65,25 +65,25 @@
 			<message>city is required</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="province">
 		<field-validator type="requiredstring">
 			<message>province is required</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="country">
 		<field-validator type="requiredstring">
 			<message>country is required</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="postalCode">
 		<field-validator type="requiredstring">
 			<message>postal code is required</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="email">
 		<field-validator type="requiredstring">
 			<message>email is required</message>
@@ -98,7 +98,7 @@
 			<message>website is required</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="passwordHint">
 		<field-validator type="requiredstring">
 			<message>password hint is required</message>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml
index e66737355..805c5b60b 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts order="2">
 </struts>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml
index 8cbf2d7ae..602d778ef 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts order="3">
 </struts>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml
index 03d16f94b..c54e17fb3 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts order="1">
 </struts>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml
index 456a725fb..e832300df 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml	
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml	
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <include file="xwork-test-beans.xml"/>
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml
index bf6df3e2e..f29ce17b6 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="namespace5" extends="namespace4" namespace="/namespace5">
         <action name="action5" class="com.opensymphony.xwork2.SimpleAction">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml
index 06d213d82..d9f87ec67 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="namespace4" extends="namespace1" namespace="/namespace4">
         <interceptors>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml
index aeae5a6da..59ef1e9cb 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="namespace2" extends="namespace1" namespace="/namespace2">
         <action name="action2" class="com.opensymphony.xwork2.SimpleAction">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml
index c68115b83..2ccff3a8f 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
 
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml
index dbd77959d..758b55f0e 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-default.xml" />
 
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml
index 53b9a2fcf..8fa336915 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml
index c2717befc..42d2d5b64 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="default">
 
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml
index 456a725fb..e832300df 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <include file="xwork-test-beans.xml"/>
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
index 17b33ab38..85ada7e4e 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="default" strict-method-invocation="false">
         <global-allowed-methods>input,cancel</global-allowed-methods>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml
index d271a1c42..5f6b1f070 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
     <package name="default" />
@@ -31,6 +31,6 @@
     <package name="circularPackage" extends="circularPackage"/>
 
     <package name="anotherCircularPackage" extends="anotherCircularPackage2"/>
-    
+
     <package name="anotherCircularPackage2" extends="anotherCircularPackage"/>
 </struts>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml
index ccd8aed7a..e6b3a7fbd 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <include file="xwork-test-beans.xml"/>
     <package name="default"/>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml
index 2c566d20b..d5869ca23 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
     <package name="default" />
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml
index adc41eb11..ae9c254c3 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml
@@ -21,10 +21,10 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="hasDefaultClassRef">
         <default-class-ref class="com.opensymphony.xwork2.ActionSupport"/>
     </package>
     <package name="noDefaultClassRef"/>
-</struts>
\ No newline at end of file
+</struts>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-envs-substitution.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-envs-substitution.xml
index 03fe2b715..a328c721e 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-envs-substitution.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-envs-substitution.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 
     <constant name="foo" value="bar"/>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml
index 71f607012..bb7a3454b 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml
index 461c2e17a..4852fae82 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <include file="xwork-test-beans.xml"/>
     <package name="parent" namespace="/base">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml
index a9ef73178..afc333416 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
   <include file="com/opensymphony/xwork2/config/providers/xwork-include-*.xml"/>
 </struts>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml
index 7cde9bcd1..955c12348 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <!-- this package has a default interceptor ref - so actions with no refs should have the default ref -->
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml
index 929a0181f..5226d0a6c 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <include file="xwork-test-beans.xml"/>
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml
index 660f6dcdd..af8c52d82 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml
@@ -21,26 +21,26 @@
 -->
 <!DOCTYPE struts PUBLIC
 		"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-		"http://struts.apache.org/dtds/struts-2.5.dtd">
+		"https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
 	<package name="packageOne">
 		<result-types>
 			<result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult" />
 		</result-types>
-	
+
 		<interceptors>
 			<interceptor name="interceptorOne" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
 			<interceptor name="interceptorTwo" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
 			<interceptor name="interceptorThree" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
-			
+
 			<interceptor-stack name="stackOne">
 				<interceptor-ref name="interceptorOne" />
 				<interceptor-ref name="interceptorTwo" />
 				<interceptor-ref name="interceptorThree" />
 			</interceptor-stack>
 		</interceptors>
-		
+
 		<action name="actionOne">
 			<interceptor-ref name="stackOne">
 				<param name="interceptorOne.paramOne">i1p1</param>
@@ -49,7 +49,7 @@
 			</interceptor-ref>
 			<result name="success" type="mock">test1</result>
 		</action>
-		
+
 		<action name="actionTwo">
 			<interceptor-ref name="stackOne">
 				<param name="interceptorThree.paramOne">i3p1</param>
@@ -60,4 +60,3 @@
 		</action>
 	</package>
 </struts>
-    
\ No newline at end of file
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml
index 32c4099a6..e74d5320c 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml
index d94e4f263..7a54fcd83 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="packageOne">
         <result-types>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml
index 6ed804d26..dec118da5 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml
index 431926d9f..1adf5edf8 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <include file="xwork-test-beans.xml"/>
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml
index 7e3f99baf..2852fb656 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml
index b57b54624..c728ac8fb 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
     <package name="default" namespace="/default">
@@ -35,7 +35,7 @@
     <package name="singleInheritance" namespace="/single" extends="default">
         <action name="single" class="com.opensymphony.xwork2.ActionSupport"/>
     </package>
-    
+
     <package name="testParentBelow" namespace="/parentBelow" extends="multipleInheritance">
     	<action name="testParentBelowAction" class="com.opensymphony.xwork2.ActionSupport"/>
     </package>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-reload.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-reload.xml
index 142b8eb38..c71e8b5de 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-reload.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-reload.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 
     <constant name="struts.configuration.xml.reload" value="true" />
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml
index b526aabc4..5e0f97cfc 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-names.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-names.xml
index e239161ba..e00fd3cbc 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-names.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-names.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <include file="xwork-test-beans.xml" />
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml
index 6763ea62e..569488e3a 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <include file="xwork-test-beans.xml"/>
     <package name="xworkResultTypesTestPackage1">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml
index 91ab55548..76363a7ba 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
     <package name="default">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml
index a889f0ff7..b447dd65c 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="default-1" />
 </struts>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml
index c84108d90..3ffb56b57 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="default-2" />
 </struts>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml
index d3525473c..60a69c277 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml
@@ -21,11 +21,11 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <include file="xwork-test-beans.xml" />
     <include file="com/opensymphony/xwork2/config/providers/xwork-test-wildcard-*.xml" />
     <!-- config file defined inside xwork-jar.jar -->
     <include file="xwork-jar.xml" />
     <package name="default-wildcard" />
-</struts>
\ No newline at end of file
+</struts>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml
index 313507cf3..4ec37d69b 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh1" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
     <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh2" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml
index 886ae18c6..6cf80101c 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh1" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
     <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh2" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml
index 822366f14..9d02543c7 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="data">
         <field-validator type="required">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml
index 72d598fef..faad9758e 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="data">
         <field-validator type="requiredstring">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml
index 92183e658..3fd057047 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="bling">
         <field-validator type="requiredstring">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml
index 7a5f47a70..e65c5a377 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="horse">
         <field-validator type="requiredstring">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml
index 2ff8331f4..ca7887caa 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="count">
         <field-validator type="required">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml
index 9bc2cf0b8..5aa306686 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="baz">
         <field-validator type="required">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml
index c29c8c900..267de6424 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 <validators>
     <field name="name">
         <field-validator type="required">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml
index 953376c2b..e94c26323 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 <validators>
     <field name="email">
         <field-validator type="required" short-circuit="true">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml
index 3579cb961..203b92062 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="model">
         <field-validator type="visitor">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml
index d2a9ba14c..501ada4f6 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="bean">
         <field-validator type="visitor">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml
index c77736822..77bfabbd9 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="testBeanArray">
         <field-validator type="visitor">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml
index 7e350152b..f928368be 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="testBeanList">
         <field-validator type="visitor">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
index 38728076b..a8de9f705 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="context">
         <field-validator type="requiredstring">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml
index d2a9ba14c..501ada4f6 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="bean">
         <field-validator type="visitor">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml
index d2a9ba14c..501ada4f6 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="bean">
         <field-validator type="visitor">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml
index d7112c567..37ae57de0 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="bean">
         <field-validator type="visitor">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml
index ebc161aee..14b2bf376 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 <validators>
     <field name="foo">
         <field-validator type="required">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml
index 0e43abf20..17a7759d7 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml
@@ -21,18 +21,18 @@
 -->
 <!DOCTYPE validators PUBLIC
        "-//Apache Struts//XWork Validator 1.0.2//EN"
-       "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-       
+       "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
 <validators>
    <field name="myField">
       <field-validator type="required">
          <message>a field error message</message>
-      </field-validator>   
+      </field-validator>
    </field>
    <validator type="expression">
       <param name="expression"><![CDATA[false]]></param>
       <message>an expression error message</message>
    </validator>
 </validators>
-              
-       
+
+
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml
index f6825fbd6..93851e6bd 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 <validators>
     <validator type="expression" bar="die">
         <param name="expression">email.equals(email2)</param>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml
index 642c3b74f..effa71fb0 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
     <validator type="expression">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml
index ea9bc7805..88b3514c2 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 <validators>
     <validator name="foo" class="bar" />
 </validators>
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml
index 3e8d84a08..68a9dfa75 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE validators PUBLIC
         "-//Apache Struts//XWork Validator 1.0.3//EN"
-        "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
+        "https://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
 
 <validators>
     <field name="name">
diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml
index eaf9f381d..03c5dd072 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE validators PUBLIC
         "-//Apache Struts//XWork Validator Config 1.0//EN"
-        "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
+        "https://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
 <!-- START SNIPPET: validators-default -->
 <validators>
     <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
diff --git a/core/src/test/resources/includeTest.xml b/core/src/test/resources/includeTest.xml
index 018c3ba30..16ff28092 100644
--- a/core/src/test/resources/includeTest.xml
+++ b/core/src/test/resources/includeTest.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="includeTest" extends="default" namespace="includeTest">
         <action name="includeTest" class="com.opensymphony.xwork2.SimpleAction"></action>
diff --git a/core/src/test/resources/my-validators.xml b/core/src/test/resources/my-validators.xml
index bc4543e40..431fac151 100644
--- a/core/src/test/resources/my-validators.xml
+++ b/core/src/test/resources/my-validators.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE validators PUBLIC
         "-//Apache Struts//XWork Validator Config 1.0//EN"
-        "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
+        "https://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
 <validators>
     <validator name="requiredAdditional" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
 </validators>
diff --git a/core/src/test/resources/myOther-validators.xml b/core/src/test/resources/myOther-validators.xml
index 128c186de..198cc6822 100644
--- a/core/src/test/resources/myOther-validators.xml
+++ b/core/src/test/resources/myOther-validators.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE validators PUBLIC
         "-//Apache Struts//XWork Validator Config 1.0//EN"
-        "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
+        "https://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
 <validators>
     <validator name="requiredAnother" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
 </validators>
diff --git a/core/src/test/resources/org/apache/struts2/TestAction-validation.xml b/core/src/test/resources/org/apache/struts2/TestAction-validation.xml
index cfcdf4367..e40b22826 100644
--- a/core/src/test/resources/org/apache/struts2/TestAction-validation.xml
+++ b/core/src/test/resources/org/apache/struts2/TestAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="foo">
         <field-validator type="required">
diff --git a/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml b/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml
index e9cf3be11..00393612f 100644
--- a/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml
+++ b/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml
@@ -21,5 +21,5 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-        "struts-6.0.dtd">
+        "https://struts.apache.org/dtds/struts-6.0.dtd">
 <struts/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml b/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml
index 974d4bfab..1542a41c2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml
@@ -22,7 +22,7 @@
 
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-        "struts-6.0.dtd">
+        "https://struts.apache.org/dtds/struts-6.0.dtd">
 
 <struts>
 
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleValidationAction-validation.xml b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleValidationAction-validation.xml
index f1ab64e6b..3c2a0c941 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleValidationAction-validation.xml
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleValidationAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="myUpDownSelectTag">
         <field-validator type="double">
@@ -28,4 +28,4 @@
             <message>bar must be between ${minInclusive} and ${maxInclusive}.</message>
         </field-validator>
     </field>
-</validators>
\ No newline at end of file
+</validators>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/IntValidationAction-validation.xml b/core/src/test/resources/org/apache/struts2/views/jsp/ui/IntValidationAction-validation.xml
index 8ab34b89d..f200cb396 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/IntValidationAction-validation.xml
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/IntValidationAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="myUpDownSelectTag">
         <field-validator type="int">
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/User-validation.xml b/core/src/test/resources/org/apache/struts2/views/jsp/ui/User-validation.xml
index 5bf827fe0..7ca3158bb 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/User-validation.xml
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/User-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="name">
         <field-validator type="required">
diff --git a/core/src/test/resources/struts-escape-body.xml b/core/src/test/resources/struts-escape-body.xml
index 186ba9760..fda3f1010 100644
--- a/core/src/test/resources/struts-escape-body.xml
+++ b/core/src/test/resources/struts-escape-body.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-        "struts-6.0.dtd">
+        "https://struts.apache.org/dtds/struts-6.0.dtd">
 <struts>
     <constant name="struts.ui.escapeHtmlBody" value="true"/>
 
diff --git a/core/src/test/resources/struts-object-factory-result-builder.xml b/core/src/test/resources/struts-object-factory-result-builder.xml
index f5988785d..a76b6f703 100644
--- a/core/src/test/resources/struts-object-factory-result-builder.xml
+++ b/core/src/test/resources/struts-object-factory-result-builder.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 
diff --git a/core/src/test/resources/struts-testing.xml b/core/src/test/resources/struts-testing.xml
index 5d9c5b21f..62023b2e6 100644
--- a/core/src/test/resources/struts-testing.xml
+++ b/core/src/test/resources/struts-testing.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
           "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-          "http://struts.apache.org/dtds/struts-2.5.dtd">
+          "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <include file="struts-default.xml"/>
     <package name="default" extends="struts-default" namespace="/">
diff --git a/core/src/test/resources/struts.xml b/core/src/test/resources/struts.xml
index 59197aab3..55b6805e4 100644
--- a/core/src/test/resources/struts.xml
+++ b/core/src/test/resources/struts.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-        "struts-6.0.dtd">
+        "https://struts.apache.org/dtds/struts-6.0.dtd">
 <struts>
     <package name="default" extends="struts-default">
         <action name="hello" class="com.opensymphony.xwork2.ActionSupport">
diff --git a/core/src/test/resources/validators.xml b/core/src/test/resources/validators.xml
index 883bd433d..dc99a4e8c 100644
--- a/core/src/test/resources/validators.xml
+++ b/core/src/test/resources/validators.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE validators PUBLIC
         "-//Apache Struts//XWork Validator Config 1.0//EN"
-        "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
+        "https://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
 <validators>
     <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
     <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
diff --git a/core/src/test/resources/xwork-class-param-test.xml b/core/src/test/resources/xwork-class-param-test.xml
index 451b9f7bc..74161eadf 100644
--- a/core/src/test/resources/xwork-class-param-test.xml
+++ b/core/src/test/resources/xwork-class-param-test.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 
     <constant name="struts.devMode" value="true" />
diff --git a/core/src/test/resources/xwork-param-test.xml b/core/src/test/resources/xwork-param-test.xml
index ba6386dbe..8eed0b55d 100644
--- a/core/src/test/resources/xwork-param-test.xml
+++ b/core/src/test/resources/xwork-param-test.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <constant name="struts.devMode" value="true" />
     <constant name="struts.excludedClasses" value="java.lang.Object,java.lang.Runtime" />
diff --git a/core/src/test/resources/xwork-proxyinvoke.xml b/core/src/test/resources/xwork-proxyinvoke.xml
index 109907cee..3e95e62cf 100644
--- a/core/src/test/resources/xwork-proxyinvoke.xml
+++ b/core/src/test/resources/xwork-proxyinvoke.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <bean type="com.opensymphony.xwork2.ObjectFactory" name="default" class="com.opensymphony.xwork2.ProxyObjectFactory" />
 
diff --git a/core/src/test/resources/xwork-sample.xml b/core/src/test/resources/xwork-sample.xml
index 0a4c0aacd..c31023456 100644
--- a/core/src/test/resources/xwork-sample.xml
+++ b/core/src/test/resources/xwork-sample.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <include file="xwork-test-default.xml"/>
     <package name="default" extends="xwork-test-default">
@@ -84,8 +84,8 @@
             <result name="*" type="mock" />
             <interceptor-ref name="defaultStack"/>
         </action>
-		
-		<action name="WildCard/*/*" class="com.opensymphony.xwork2.{1}Action" 
+
+		<action name="WildCard/*/*" class="com.opensymphony.xwork2.{1}Action"
 			method="{2}">
             <param name="foo">{1}</param>
             <param name="bar">{2}</param>
@@ -136,7 +136,7 @@
             </interceptor-ref>
             <result name="error" type="mock" />
         </action>
-	
+
         <action name="TestModelDrivenValidation" class="com.opensymphony.xwork2.ModelDrivenAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="validation"/>
@@ -275,7 +275,7 @@
                 </action>
 
         </package>
-       
+
         <package name="Example" extends="Abstract-crud" namespace="/example">
                  <default-class-ref class="com.opensymphony.xwork2.ModelDrivenAction" />
         </package>
@@ -289,8 +289,8 @@
 
         <package name="SubItem" extends="Abstract-crud" namespace="/example2/subItem">
                 <default-class-ref class="com.opensymphony.xwork2.ModelDrivenAction" />
-        </package> 
-        
+        </package>
+
         <package name="Example3" extends="Abstract-crud" namespace="/example3">
  			<!--  default-class-ref is expected to be inherited -->
         </package>
diff --git a/core/src/test/resources/xwork-test-beans.xml b/core/src/test/resources/xwork-test-beans.xml
index 92e673d6b..c88a34917 100644
--- a/core/src/test/resources/xwork-test-beans.xml
+++ b/core/src/test/resources/xwork-test-beans.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 
     <constant name="struts.excludedClasses" value="java.lang.Object,java.lang.Runtime,ognl.OgnlContext,ognl.MemberAccess,ognl.ClassResolver,ognl.TypeConverter,com.opensymphony.xwork2.ognl.SecurityMemberAccess" />
diff --git a/core/src/test/resources/xwork-test-default.xml b/core/src/test/resources/xwork-test-default.xml
index f805aa3cb..d9f6dddd4 100644
--- a/core/src/test/resources/xwork-test-default.xml
+++ b/core/src/test/resources/xwork-test-default.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <package name="xwork-test-default">
         <result-types>
diff --git a/core/src/test/resources/xwork-test-validation.xml b/core/src/test/resources/xwork-test-validation.xml
index fe71c26b8..b58c66193 100644
--- a/core/src/test/resources/xwork-test-validation.xml
+++ b/core/src/test/resources/xwork-test-validation.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<include file="xwork-test-beans.xml" />
     <package name="xwork-test-default">
@@ -70,7 +70,7 @@
             <interceptor-ref name="validationStack"/>
             <result name="success" type="mock"/>
         </action>
-        
+
         <action name="notAnnotatedMethod" class="com.opensymphony.xwork2.test.annotations.ValidateAnnotatedMethodOnlyAction" method="notAnnotatedMethod">
             <interceptor-ref name="validationStack"/>
             <result name="success" type="mock"/>
diff --git a/plugins/async/src/main/resources/struts-plugin.xml b/plugins/async/src/main/resources/struts-plugin.xml
index fb71372d9..da2aee816 100644
--- a/plugins/async/src/main/resources/struts-plugin.xml
+++ b/plugins/async/src/main/resources/struts-plugin.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <bean type="com.opensymphony.xwork2.AsyncManager" name="default"
diff --git a/plugins/bean-validation/src/main/resources/struts-plugin.xml b/plugins/bean-validation/src/main/resources/struts-plugin.xml
index 42d7517f7..69e4c51b9 100644
--- a/plugins/bean-validation/src/main/resources/struts-plugin.xml
+++ b/plugins/bean-validation/src/main/resources/struts-plugin.xml
@@ -22,7 +22,7 @@
 
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <constant name="struts.beanValidation.providerClass" value=""/>
diff --git a/plugins/bean-validation/src/test/resources/bean-validation-test.xml b/plugins/bean-validation/src/test/resources/bean-validation-test.xml
index 360e10eb6..bd5716cee 100644
--- a/plugins/bean-validation/src/test/resources/bean-validation-test.xml
+++ b/plugins/bean-validation/src/test/resources/bean-validation-test.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <constant name="struts.beanValidation.providerClass" value="org.hibernate.validator.HibernateValidator"/>
     <constant name="struts.beanValidation.ignoreXMLConfiguration" value="false"/>
diff --git a/plugins/cdi/src/main/resources/struts-plugin.xml b/plugins/cdi/src/main/resources/struts-plugin.xml
index 9c79a3326..b969296fa 100644
--- a/plugins/cdi/src/main/resources/struts-plugin.xml
+++ b/plugins/cdi/src/main/resources/struts-plugin.xml
@@ -21,10 +21,10 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
-    
+
     <bean type="com.opensymphony.xwork2.ObjectFactory" name="cdi" class="org.apache.struts2.cdi.CdiObjectFactory" />
 
     <!--  Make the CDI object factory the automatic default -->
diff --git a/plugins/config-browser/src/main/resources/struts-plugin.xml b/plugins/config-browser/src/main/resources/struts-plugin.xml
index 46c51e48d..b2187d4e2 100644
--- a/plugins/config-browser/src/main/resources/struts-plugin.xml
+++ b/plugins/config-browser/src/main/resources/struts-plugin.xml
@@ -21,12 +21,12 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-    
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
 
     <bean class="org.apache.struts2.config_browser.ConfigurationHelper" />
-    
+
     <package name="config-browser" extends="struts-default" namespace="/config-browser">
 
         <interceptors>
@@ -56,15 +56,15 @@
         <action name="showConfig" class="org.apache.struts2.config_browser.ShowConfigAction">
             <result type="freemarker" name="success">/config-browser/showConfig.ftl</result>
         </action>
-        
+
         <action name="showConstants" class="org.apache.struts2.config_browser.ShowConstantsAction">
             <result type="freemarker" name="success">/config-browser/showConstants.ftl</result>
         </action>
-        
+
         <action name="showBeans" class="org.apache.struts2.config_browser.ShowBeansAction">
             <result type="freemarker" name="success">/config-browser/showBeans.ftl</result>
         </action>
-        
+
         <action name="showJars" class="org.apache.struts2.config_browser.ShowJarsAction">
             <result type="freemarker" name="success">/config-browser/showJars.ftl</result>
         </action>
diff --git a/plugins/convention/src/main/resources/struts-plugin.xml b/plugins/convention/src/main/resources/struts-plugin.xml
index fed289a74..6cd8b04a8 100644
--- a/plugins/convention/src/main/resources/struts-plugin.xml
+++ b/plugins/convention/src/main/resources/struts-plugin.xml
@@ -22,7 +22,7 @@
 
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts order="20">
   <bean type="com.opensymphony.xwork2.UnknownHandler" name="convention" class="org.apache.struts2.convention.ConventionUnknownHandler"/>
diff --git a/plugins/embeddedjsp/src/main/resources/struts-plugin.xml b/plugins/embeddedjsp/src/main/resources/struts-plugin.xml
index 2f7b5565c..1651b3fa3 100644
--- a/plugins/embeddedjsp/src/main/resources/struts-plugin.xml
+++ b/plugins/embeddedjsp/src/main/resources/struts-plugin.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="embeddedjsp-default" extends="struts-default" abstract="true">
diff --git a/plugins/gxp/src/main/resources/struts-plugin.xml b/plugins/gxp/src/main/resources/struts-plugin.xml
index b6d9c8ffb..dd39530e5 100644
--- a/plugins/gxp/src/main/resources/struts-plugin.xml
+++ b/plugins/gxp/src/main/resources/struts-plugin.xml
@@ -21,10 +21,10 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
-    <bean type="org.apache.struts2.views.gxp.inject.InjectedObjectContainer" class="org.apache.struts2.views.gxp.inject.InjectedObjectContainer" static="true" /> 
+    <bean type="org.apache.struts2.views.gxp.inject.InjectedObjectContainer" class="org.apache.struts2.views.gxp.inject.InjectedObjectContainer" static="true" />
     <package name="gxp-default" extends="struts-default">
         <result-types>
             <result-type name="gxp" class="org.apache.struts2.views.gxp.GxpResult"/>
diff --git a/plugins/jasperreports/src/main/resources/struts-plugin.xml b/plugins/jasperreports/src/main/resources/struts-plugin.xml
index f9417990b..e99209135 100644
--- a/plugins/jasperreports/src/main/resources/struts-plugin.xml
+++ b/plugins/jasperreports/src/main/resources/struts-plugin.xml
@@ -21,11 +21,11 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-    
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
     <package name="jasperreports-default" extends="struts-default">
-    
+
     	<result-types>
     		<result-type name="jasper" class="org.apache.struts2.views.jasperreports.JasperReportsResult"/>
     	</result-types>
diff --git a/plugins/javatemplates/src/main/resources/struts-plugin.xml b/plugins/javatemplates/src/main/resources/struts-plugin.xml
index 537095792..5ca258c4f 100644
--- a/plugins/javatemplates/src/main/resources/struts-plugin.xml
+++ b/plugins/javatemplates/src/main/resources/struts-plugin.xml
@@ -21,8 +21,8 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-    
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
 
     <bean type="org.apache.struts2.components.template.TemplateEngine" name="java" class="org.apache.struts2.views.java.JavaTemplateEngine" />
diff --git a/plugins/jfreechart/src/main/resources/struts-plugin.xml b/plugins/jfreechart/src/main/resources/struts-plugin.xml
index dbb411465..68506aba4 100644
--- a/plugins/jfreechart/src/main/resources/struts-plugin.xml
+++ b/plugins/jfreechart/src/main/resources/struts-plugin.xml
@@ -21,11 +21,11 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-    
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
     <package name="jfreechart-default" extends="struts-default">
-    
+
     	<result-types>
     		<result-type name="chart" class="org.apache.struts2.dispatcher.ChartResult">
     			<param name="height">150</param>
diff --git a/plugins/json/src/main/resources/struts-plugin.xml b/plugins/json/src/main/resources/struts-plugin.xml
index 44b035a35..a20a5924a 100644
--- a/plugins/json/src/main/resources/struts-plugin.xml
+++ b/plugins/json/src/main/resources/struts-plugin.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <bean type="org.apache.struts2.json.JSONWriter" name="struts" class="org.apache.struts2.json.DefaultJSONWriter"
diff --git a/plugins/junit/src/test/resources/struts-convention-configuration.xml b/plugins/junit/src/test/resources/struts-convention-configuration.xml
index ff279f2cc..df7292797 100644
--- a/plugins/junit/src/test/resources/struts-convention-configuration.xml
+++ b/plugins/junit/src/test/resources/struts-convention-configuration.xml
@@ -22,7 +22,7 @@
 
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 
diff --git a/plugins/junit/src/test/resources/struts-session-values-test.xml b/plugins/junit/src/test/resources/struts-session-values-test.xml
index 8030f80b0..ea6e1f415 100644
--- a/plugins/junit/src/test/resources/struts-session-values-test.xml
+++ b/plugins/junit/src/test/resources/struts-session-values-test.xml
@@ -22,7 +22,7 @@
 
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
-        "http://struts.apache.org/dtds/struts-2.1.dtd">
+        "https://struts.apache.org/dtds/struts-2.1.dtd">
 
 <struts>
     <package name="test" namespace="/sessiontest" extends="struts-default">
diff --git a/plugins/junit/src/test/resources/struts-test.xml b/plugins/junit/src/test/resources/struts-test.xml
index 9eed684ea..c0943a71c 100644
--- a/plugins/junit/src/test/resources/struts-test.xml
+++ b/plugins/junit/src/test/resources/struts-test.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
-        "http://struts.apache.org/dtds/struts-2.1.dtd">
+        "https://struts.apache.org/dtds/struts-2.1.dtd">
 
 <struts>
     <package name="test" namespace="/test" extends="struts-default">
diff --git a/plugins/junit/src/test/resources/struts.xml b/plugins/junit/src/test/resources/struts.xml
index 04b00af94..6d2210687 100644
--- a/plugins/junit/src/test/resources/struts.xml
+++ b/plugins/junit/src/test/resources/struts.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
-        "http://struts.apache.org/dtds/struts-2.1.dtd">
+        "https://struts.apache.org/dtds/struts-2.1.dtd">
 
 <struts>
     <constant name="struts.objectFactory" value="spring"/>
diff --git a/plugins/osgi/src/main/resources/struts-plugin.xml b/plugins/osgi/src/main/resources/struts-plugin.xml
index 8e529244f..22c1cd4a8 100644
--- a/plugins/osgi/src/main/resources/struts-plugin.xml
+++ b/plugins/osgi/src/main/resources/struts-plugin.xml
@@ -21,8 +21,8 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-    
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts order="10">
     <constant name="struts.objectFactory" value="osgi" />
     <constant name="struts.objectFactory.delegate" value="struts" />
@@ -33,7 +33,7 @@
 
     <bean type="org.apache.struts2.osgi.BundleAccessor" class="org.apache.struts2.osgi.DefaultBundleAccessor" />
     <bean type="org.apache.struts2.osgi.PackageLoader" class="org.apache.struts2.osgi.BundlePackageLoader" />
-    
+
     <bean name="osgi" type="com.opensymphony.xwork2.ObjectFactory" class="org.apache.struts2.osgi.DelegatingObjectFactory" />
     <bean name="springOsgi" type="com.opensymphony.xwork2.ObjectFactory" class="org.apache.struts2.osgi.SpringOsgiObjectFactory" />
     <bean name="osgi" type="com.opensymphony.xwork2.config.PackageProvider" class="org.apache.struts2.osgi.OsgiConfigurationProvider" />
diff --git a/plugins/oval/src/main/resources/struts-plugin.xml b/plugins/oval/src/main/resources/struts-plugin.xml
index 8b205a75d..da2108820 100644
--- a/plugins/oval/src/main/resources/struts-plugin.xml
+++ b/plugins/oval/src/main/resources/struts-plugin.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 
diff --git a/plugins/oval/src/test/resources/oval-test.xml b/plugins/oval/src/test/resources/oval-test.xml
index 522e92fbe..e4a69b506 100644
--- a/plugins/oval/src/test/resources/oval-test.xml
+++ b/plugins/oval/src/test/resources/oval-test.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
     <bean type="org.apache.struts2.oval.interceptor.OValValidationManager"
           class="org.apache.struts2.oval.interceptor.DummyDefaultOValValidationManager"/>
diff --git a/plugins/pell-multipart/src/main/resources/struts-plugin.xml b/plugins/pell-multipart/src/main/resources/struts-plugin.xml
index 0569fa8ba..a9fc10b4e 100644
--- a/plugins/pell-multipart/src/main/resources/struts-plugin.xml
+++ b/plugins/pell-multipart/src/main/resources/struts-plugin.xml
@@ -21,8 +21,8 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-    
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
     <bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest" name="pell" class="org.apache.struts2.dispatcher.multipart.PellMultiPartRequest" />
 </struts>
diff --git a/plugins/plexus/src/main/resources/struts-plugin.xml b/plugins/plexus/src/main/resources/struts-plugin.xml
index 8d596b364..43e20350c 100644
--- a/plugins/plexus/src/main/resources/struts-plugin.xml
+++ b/plugins/plexus/src/main/resources/struts-plugin.xml
@@ -21,11 +21,11 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <bean type="com.opensymphony.xwork2.ObjectFactory" name="plexus" class="org.apache.struts2.plexus.PlexusObjectFactory" />
-    
+
     <!--  Make the Plexus object factory the automatic default -->
     <constant name="struts.objectFactory" value="plexus" />
 </struts>
diff --git a/plugins/portlet-tiles/src/main/resources/struts-plugin.xml b/plugins/portlet-tiles/src/main/resources/struts-plugin.xml
index dc9aa022e..b7ad6ce78 100644
--- a/plugins/portlet-tiles/src/main/resources/struts-plugin.xml
+++ b/plugins/portlet-tiles/src/main/resources/struts-plugin.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 
diff --git a/plugins/portlet/src/main/resources/struts-plugin.xml b/plugins/portlet/src/main/resources/struts-plugin.xml
index 7b9144767..a66479793 100644
--- a/plugins/portlet/src/main/resources/struts-plugin.xml
+++ b/plugins/portlet/src/main/resources/struts-plugin.xml
@@ -22,7 +22,7 @@
 
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 
diff --git a/plugins/portlet/src/test/resources/struts.xml b/plugins/portlet/src/test/resources/struts.xml
index d8c52875b..afd0d9a81 100644
--- a/plugins/portlet/src/test/resources/struts.xml
+++ b/plugins/portlet/src/test/resources/struts.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 
diff --git a/plugins/rest/src/main/resources/struts-plugin.xml b/plugins/rest/src/main/resources/struts-plugin.xml
index 1dd8d9dcb..589d12ca7 100644
--- a/plugins/rest/src/main/resources/struts-plugin.xml
+++ b/plugins/rest/src/main/resources/struts-plugin.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 
diff --git a/plugins/sitemesh/src/main/resources/struts-plugin.xml b/plugins/sitemesh/src/main/resources/struts-plugin.xml
index 406a73a0f..bad62b8e2 100644
--- a/plugins/sitemesh/src/main/resources/struts-plugin.xml
+++ b/plugins/sitemesh/src/main/resources/struts-plugin.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <bean class="org.apache.struts2.sitemesh.FreemarkerPageFilter" static="true" optional="true"/>
diff --git a/plugins/spring/src/main/resources/struts-plugin.xml b/plugins/spring/src/main/resources/struts-plugin.xml
index 51fb37c2e..7a5462037 100644
--- a/plugins/spring/src/main/resources/struts-plugin.xml
+++ b/plugins/spring/src/main/resources/struts-plugin.xml
@@ -21,11 +21,11 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-    
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
     <bean type="com.opensymphony.xwork2.ObjectFactory" name="spring" class="org.apache.struts2.spring.StrutsSpringObjectFactory" />
-    
+
     <!--  Make the Spring object factory the automatic default -->
     <constant name="struts.objectFactory" value="spring" />
 
@@ -40,5 +40,5 @@
         <interceptors>
             <interceptor name="autowiring" class="com.opensymphony.xwork2.spring.interceptor.ActionAutowiringInterceptor"/>
         </interceptors>
-    </package>    
+    </package>
 </struts>
diff --git a/plugins/spring/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml b/plugins/spring/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml
index d44f41d00..63647477b 100644
--- a/plugins/spring/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml
+++ b/plugins/spring/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 <struts>
 	<bean type="com.opensymphony.xwork2.ObjectFactory" class="com.opensymphony.xwork2.spring.SpringObjectFactory" />
 	<constant name="applicationContextPath" value="com/opensymphony/xwork2/spring/actionContext-spring.xml" />
@@ -48,7 +48,7 @@
         <action name="proxiedAction" class="proxied-action"/>
 
         <action name="autoProxiedAction" class="auto-proxied-action"/>
-        
+
         <action name="simpleActionSpringResult" class="simple-action">
 			<result name="error" type="springResult"/>
 		</action>
diff --git a/plugins/tiles/src/main/resources/struts-plugin.xml b/plugins/tiles/src/main/resources/struts-plugin.xml
index 7bd133d49..9ae060a3d 100644
--- a/plugins/tiles/src/main/resources/struts-plugin.xml
+++ b/plugins/tiles/src/main/resources/struts-plugin.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="tiles-default" extends="struts-default">
diff --git a/plugins/velocity/src/main/resources/struts-plugin.xml b/plugins/velocity/src/main/resources/struts-plugin.xml
index 30084ed3d..48ae45bdd 100644
--- a/plugins/velocity/src/main/resources/struts-plugin.xml
+++ b/plugins/velocity/src/main/resources/struts-plugin.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-        "struts-6.0.dtd">
+        "https://struts.apache.org/dtds/struts-6.0.dtd">
 
 <struts>