Merge pull request #323 from apache/fix/cleanup

Small cleanup
diff --git a/action-chaining/src/main/resources/struts.xml b/action-chaining/src/main/resources/struts.xml
index 7e425ec..4767688 100644
--- a/action-chaining/src/main/resources/struts.xml
+++ b/action-chaining/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
     <constant name="struts.devMode" value="true"/>
diff --git a/basic-struts/src/main/resources/struts.xml b/basic-struts/src/main/resources/struts.xml
index 27ef795..d52a3ef 100644
--- a/basic-struts/src/main/resources/struts.xml
+++ b/basic-struts/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
diff --git a/bean-validation/src/main/resources/struts.xml b/bean-validation/src/main/resources/struts.xml
index 9982368..a952f1c 100755
--- a/bean-validation/src/main/resources/struts.xml
+++ b/bean-validation/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -9,7 +9,7 @@
 
 	<package name="default" extends="struts-bean-validation">
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
@@ -19,7 +19,7 @@
 	    <action name="edit" class="org.apache.struts.edit.action.EditAction" method="input">
 	    	<result name="input">/edit.jsp</result>
 	    </action>
-	    
+
 	    <action name="save" class="org.apache.struts.edit.action.EditAction" method="execute">
 	        <result name="input">/edit.jsp</result>
 	    	<result name="success">/thankyou.jsp</result>
diff --git a/blank/src/main/resources/struts.xml b/blank/src/main/resources/struts.xml
index 132e3f4..c3e7a91 100644
--- a/blank/src/main/resources/struts.xml
+++ b/blank/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false" />
diff --git a/coding-actions/src/main/resources/struts.xml b/coding-actions/src/main/resources/struts.xml
index 62c0e14..c68e2af 100644
--- a/coding-actions/src/main/resources/struts.xml
+++ b/coding-actions/src/main/resources/struts.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-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.devMode" value="true" />
 
     <package name="basicstruts2" extends="struts-default">
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
         <action name="index">
             <result>/index.jsp</result>
         </action>
-        
+
         <!-- If the URL is hello.action then call the execute method of class HelloWorldAction.
         If the result returned by the execute method is success render the HelloWorld.jsp -->
         <action name="hello" class="org.apache.struts.helloworld.action.HelloWorldAction" method="execute">
diff --git a/control-tags/src/main/resources/struts.xml b/control-tags/src/main/resources/struts.xml
index 9bf7dc1..750b70f 100755
--- a/control-tags/src/main/resources/struts.xml
+++ b/control-tags/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.devMode" value="true"/>
diff --git a/crud/src/main/resources/struts.xml b/crud/src/main/resources/struts.xml
index fbae8b0..e9231bb 100755
--- a/crud/src/main/resources/struts.xml
+++ b/crud/src/main/resources/struts.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-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.devMode" value="true" />
     <constant name="struts.mapper.action.prefix.enabled" value="true" />
 
     <package name="default" namespace="/" extends="struts-default" >
-	
+
         <interceptors>
             <interceptor-stack name="appDefault">
                 <interceptor-ref name="paramsPrepareParamsStack">
diff --git a/debugging-struts/src/main/resources/struts.xml b/debugging-struts/src/main/resources/struts.xml
index 1acf362..435ad95 100644
--- a/debugging-struts/src/main/resources/struts.xml
+++ b/debugging-struts/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -59,7 +59,7 @@
             <result name="login">/login.jsp</result>
         </action>
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
         <action name="index">
diff --git a/dynamic-href/src/main/resources/struts.xml b/dynamic-href/src/main/resources/struts.xml
index 4ff989c..ba51c8b 100644
--- a/dynamic-href/src/main/resources/struts.xml
+++ b/dynamic-href/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
     <constant name="struts.devMode" value="true"/>
diff --git a/exception-handling/src/main/resources/struts.xml b/exception-handling/src/main/resources/struts.xml
index 994b651..fceebbd 100644
--- a/exception-handling/src/main/resources/struts.xml
+++ b/exception-handling/src/main/resources/struts.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-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.devMode" value="true" />
 
 	<package name="basicstruts2" extends="struts-default">
-	
-	<!-- setup the default-stack exception mapping interceptor 
- 		so that any exceptions not caught by this application 
- 		will be logged and then handled by the global exception 
+
+	<!-- setup the default-stack exception mapping interceptor
+ 		so that any exceptions not caught by this application
+ 		will be logged and then handled by the global exception
  		mapping -->
  		<interceptors>
  		<interceptor-stack name="appDefault">
@@ -21,54 +21,54 @@
    			</interceptor-ref>
  	    </interceptor-stack>
 		</interceptors>
-		
+
 		<default-interceptor-ref name="appDefault" />
-		
+
         <global-results>
   		  <result name="error">/error.jsp</result>
   		  <result name="securityerror">/securityerror.jsp</result>
   	    </global-results>
-  		
+
 
 	    <global-exception-mappings>
 	        <exception-mapping exception="org.apache.struts.register.exceptions.SecurityBreachException" result="securityerror" />
 	        <exception-mapping exception="java.lang.Exception" result="error" />
 	   	</global-exception-mappings>
-	  
-	    
-         
+
+
+
         <action name="causesecurityexception" class="org.apache.struts.register.action.Register" method="throwSecurityException">
         	<result>/register.jsp</result>
         </action>
-        
+
         <action name="causeexception" class="org.apache.struts.register.action.Register" method="throwException">
         	<result>/register.jsp</result>
         </action>
-        
+
         <action name="causenullpointerexception" class="org.apache.struts.register.action.Register" method="throwNullPointerException">
         	<result>/register.jsp</result>
         </action>
-        
+
         <action name="actionspecificexception" class="org.apache.struts.register.action.Register" method="throwSecurityException">
-        	<exception-mapping exception="org.apache.struts.register.exceptions.SecurityBreachException" 
+        	<exception-mapping exception="org.apache.struts.register.exceptions.SecurityBreachException"
         	   result="login" />
         	<result>/register.jsp</result>
         	<result name="login">/login.jsp</result>
         </action>
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
 			<result>/index.jsp</result>
 		</action>
-		
+
 		<!-- If the URL is hello.action then call the execute method of class HelloWorldAction.
 		If the result returned by the execute method is success render the HelloWorld.jsp -->
 		<action name="hello" class="org.apache.struts.helloworld.action.HelloWorldAction" method="execute">
 			<result name="success">/HelloWorld.jsp</result>
 		</action>
-		
+
   <action name="register" class="org.apache.struts.register.action.Register" method="execute">
 	<result name="success">/thankyou.jsp</result>
   </action>
diff --git a/exclude-parameters/src/main/resources/struts.xml b/exclude-parameters/src/main/resources/struts.xml
index af51170..d6b699f 100644
--- a/exclude-parameters/src/main/resources/struts.xml
+++ b/exclude-parameters/src/main/resources/struts.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-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.devMode" value="true" />
 
 	<package name="basicstruts2" extends="struts-default" >
-	
+
 	    <interceptors>
 	 		<interceptor-stack name="appDefault">
 	        	 <interceptor-ref name="defaultStack">
@@ -18,10 +18,10 @@
 	   			</interceptor-ref>
 	 	    </interceptor-stack>
 		</interceptors>
-		
+
 		<default-interceptor-ref name="appDefault" />
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
@@ -31,7 +31,7 @@
 	    <action name="edit" class="org.apache.struts.edit.action.EditAction" method="input">
 	    	<result name="input">/edit.jsp</result>
 	    </action>
-	    
+
 	    <action name="save" class="org.apache.struts.edit.action.EditAction" method="execute">
 	        <result name="input">/edit.jsp</result>
 	    	<result name="success">/thankyou.jsp</result>
diff --git a/file-upload/src/main/resources/struts.xml b/file-upload/src/main/resources/struts.xml
index 2e012c6..1008ab6 100644
--- a/file-upload/src/main/resources/struts.xml
+++ b/file-upload/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
     <constant name="struts.devMode" value="true"/>
diff --git a/form-validation/src/main/resources/struts.xml b/form-validation/src/main/resources/struts.xml
index 92a2380..8afdb32 100644
--- a/form-validation/src/main/resources/struts.xml
+++ b/form-validation/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -9,19 +9,19 @@
 
 	<package name="basicstruts2" extends="struts-default">
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
 			<result>/index.jsp</result>
 		</action>
-		
+
 		<!-- If the URL is hello.action then call the execute method of class HelloWorldAction.
 		If the result returned by the execute method is success render the HelloWorld.jsp -->
 		<action name="hello" class="org.apache.struts.helloworld.action.HelloWorldAction" method="execute">
 			<result name="success">/HelloWorld.jsp</result>
 		</action>
-		
+
 	  <action name="register" class="org.apache.struts.register.action.Register" method="execute">
 		<result name="success">/thankyou.jsp</result>
 		<result name="input">/register.jsp</result>
diff --git a/form-xml-validation/src/main/resources/struts.xml b/form-xml-validation/src/main/resources/struts.xml
index 23cd6e9..a5d88bd 100644
--- a/form-xml-validation/src/main/resources/struts.xml
+++ b/form-xml-validation/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
diff --git a/helloworld/src/main/resources/struts.xml b/helloworld/src/main/resources/struts.xml
index 8adf5e8..2e555a6 100755
--- a/helloworld/src/main/resources/struts.xml
+++ b/helloworld/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
diff --git a/http-session/src/main/resources/struts.xml b/http-session/src/main/resources/struts.xml
index dae5f96..75cbb95 100644
--- a/http-session/src/main/resources/struts.xml
+++ b/http-session/src/main/resources/struts.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-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.devMode" value="true" />
 
 	<package name="basicstruts2" extends="struts-default">
-	
-		<!-- setup the default-stack exception mapping interceptor 
- 		so that any exceptions not caught by this application 
- 		will be logged and then handled by the global exception 
- 		mapping 
- 		also modify the params interceptor so it excludes 
+
+		<!-- setup the default-stack exception mapping interceptor
+ 		so that any exceptions not caught by this application
+ 		will be logged and then handled by the global exception
+ 		mapping
+ 		also modify the params interceptor so it excludes
  		request attributes that start with session or request-->
  		<interceptors>
 	 		<interceptor-stack name="appDefault">
@@ -24,16 +24,16 @@
 	   			</interceptor-ref>
 	 	    </interceptor-stack>
 		</interceptors>
-		
+
 		<default-interceptor-ref name="appDefault" />
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
 			<result>/index.jsp</result>
 		</action>
-		
+
 		<!-- If the URL is hello.action then call the execute method of class HelloWorldAction.
 		If the result returned by the execute method is success render the HelloWorld.jsp -->
 		<action name="hello" class="org.apache.struts.helloworld.action.HelloWorldAction" method="execute">
diff --git a/interceptors/src/main/resources/struts.xml b/interceptors/src/main/resources/struts.xml
index 3d8050d..ff56b2e 100644
--- a/interceptors/src/main/resources/struts.xml
+++ b/interceptors/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -9,18 +9,18 @@
 
 	<package name="basicstruts2" extends="struts-default" >
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
 			<result>/index.jsp</result>
 		</action>
-		
+
 	<action name="register_input" 	class="org.apache.struts.register.action.Register" method="input">
 		<result name="input">register.jsp</result>
 	  </action>
 
-      <!-- for timer interceptor see https://struts.apache.org/core-developers/timer-interceptor.html -->		
+      <!-- for timer interceptor see https://struts.apache.org/core-developers/timer-interceptor.html -->
 	  <action name="register" class="org.apache.struts.register.action.Register" method="execute">
 			<interceptor-ref name="logger" />
 			<interceptor-ref name="defaultStack">
diff --git a/jasperreports/src/main/resources/struts.xml b/jasperreports/src/main/resources/struts.xml
index a6e6170..2b4f92e 100644
--- a/jasperreports/src/main/resources/struts.xml
+++ b/jasperreports/src/main/resources/struts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" "http://struts.apache.org/dtds/struts-2.5.dtd">
+<!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
   <constant name="struts.devMode" value="true" />
diff --git a/json-customize/src/main/resources/struts.xml b/json-customize/src/main/resources/struts.xml
index 3fd22e1..ea30cb4 100644
--- a/json-customize/src/main/resources/struts.xml
+++ b/json-customize/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
   <constant name="struts.devMode" value="true"/>
diff --git a/json/src/main/resources/struts.xml b/json/src/main/resources/struts.xml
index 75b1d92..5542eba 100644
--- a/json/src/main/resources/struts.xml
+++ b/json/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
   <constant name="struts.devMode" value="true"/>
diff --git a/mailreader2/src/main/resources/mailreader-default.xml b/mailreader2/src/main/resources/mailreader-default.xml
index 3bfee57..25d177d 100644
--- a/mailreader2/src/main/resources/mailreader-default.xml
+++ b/mailreader2/src/main/resources/mailreader-default.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
diff --git a/mailreader2/src/main/resources/mailreader-support.xml b/mailreader2/src/main/resources/mailreader-support.xml
index 284f85f..676eac2 100644
--- a/mailreader2/src/main/resources/mailreader-support.xml
+++ b/mailreader2/src/main/resources/mailreader-support.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
     <package name="mailreader-support" namespace="/" extends="mailreader-default">
@@ -58,6 +58,6 @@
         <action name="*" class="org.apache.struts.examples.mailreader2.MailreaderSupport">
             <result>/WEB-INF/jsp/{1}.jsp</result>
         </action>
-        
+
     </package>
 </struts>
diff --git a/mailreader2/src/main/resources/struts.xml b/mailreader2/src/main/resources/struts.xml
index 2347c66..a527e50 100644
--- a/mailreader2/src/main/resources/struts.xml
+++ b/mailreader2/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
diff --git a/message-resource/src/main/resources/struts.xml b/message-resource/src/main/resources/struts.xml
index c882fef..ae1161a 100644
--- a/message-resource/src/main/resources/struts.xml
+++ b/message-resource/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -10,23 +10,23 @@
 
 	<package name="basicstruts2" extends="struts-default">
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
 			<result>/index.jsp</result>
 		</action>
-		
+
 		<!-- If the URL is hello.action then call the execute method of class HelloWorldAction.
 		If the result returned by the execute method is success render the HelloWorld.jsp -->
 		<action name="hello" class="org.apache.struts.helloworld.action.HelloWorldAction" method="execute">
 			<result name="success">/HelloWorld.jsp</result>
 		</action>
-		
+
 	<action name="registerInput" class="org.apache.struts.register.action.Register" method="input" >
 		<result name="input">/register.jsp</result>
 	</action>
-		
+
 	  <action name="register" class="org.apache.struts.register.action.Register" method="execute">
 		<result name="success">/thankyou.jsp</result>
 		<result name="input">/register.jsp</result>
diff --git a/message-store/src/main/resources/struts.xml b/message-store/src/main/resources/struts.xml
index 8954d0d..c04d536 100644
--- a/message-store/src/main/resources/struts.xml
+++ b/message-store/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
     <constant name="struts.devMode" value="true"/>
diff --git a/portlet/src/main/resources/struts-edit.xml b/portlet/src/main/resources/struts-edit.xml
index a31691c..a30c72e 100644
--- a/portlet/src/main/resources/struts-edit.xml
+++ b/portlet/src/main/resources/struts-edit.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-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>	
+<struts>
 	<package name="edit" extends="struts-portlet-default"
 		namespace="/edit">
 		<action name="index"
diff --git a/portlet/src/main/resources/struts-eventing.xml b/portlet/src/main/resources/struts-eventing.xml
index c571cb9..e1325ff 100644
--- a/portlet/src/main/resources/struts-eventing.xml
+++ b/portlet/src/main/resources/struts-eventing.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
     <package name="eventing" extends="struts-portlet-default" namespace="/eventing">
diff --git a/portlet/src/main/resources/struts-help.xml b/portlet/src/main/resources/struts-help.xml
index 451aa7d..cf04992 100644
--- a/portlet/src/main/resources/struts-help.xml
+++ b/portlet/src/main/resources/struts-help.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 	<package name="help" extends="struts-portlet-default"
diff --git a/portlet/src/main/resources/struts-tiles.xml b/portlet/src/main/resources/struts-tiles.xml
index 042f0c6..0c9f53b 100644
--- a/portlet/src/main/resources/struts-tiles.xml
+++ b/portlet/src/main/resources/struts-tiles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
     <package name="tiles" extends="struts-portlet-tiles-default" namespace="/tiles">
@@ -15,12 +15,12 @@
         <action name="processTilesFreemarkerExample" class="org.apache.struts2.portlet.example.FormExample" method="input">
             <result name="success" type="tiles">formExampleTiles.freemarker</result>
         </action>
-        
+
         <action name="processTilesFreemarkerExample" class="org.apache.struts2.portlet.example.FormExample" method="execute">
             <result name="input" type="tiles">formExampleTiles.freemarker</result>
             <result name="success" type="tiles">formExampleTiles.freemarkerResult</result>
         </action>
-        
+
     </package>
 </struts>
 
diff --git a/portlet/src/main/resources/struts-view.xml b/portlet/src/main/resources/struts-view.xml
index e492af1..0423f91 100644
--- a/portlet/src/main/resources/struts-view.xml
+++ b/portlet/src/main/resources/struts-view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 	<package name="view" extends="struts-portlet-default"
@@ -27,7 +27,7 @@
 				/WEB-INF/view/formExample.jsp
 			</result>
 		</action>
-		
+
 		<action name="formExamplePrg" class="org.apache.struts2.portlet.example.FormExample">
 			<result name="input">
 				/WEB-INF/view/formExampleInputPrg.jsp
@@ -42,7 +42,7 @@
 				/WEB-INF/view/formExample.jsp
 			</result>
 		</action>
-		
+
 		<action name="formExampleModelDriven"
 			class="org.apache.struts2.portlet.example.FormExampleModelDriven">
 			<result name="input">
@@ -69,7 +69,7 @@
 				/WEB-INF/view/formExampleInputValidation.jsp
 			</result>
 		</action>
-		
+
 		<action name="fileUpload" class="org.apache.struts2.portlet.example.fileupload.FileUploadAction">
 			<result name="input">
 				/WEB-INF/view/fileUpload.jsp
@@ -117,11 +117,11 @@
 			class="org.apache.struts2.portlet.example.FormExample">
 			<result name="success">/view/processFreeMarkerView.action?firstName=${firstName}&amp;lastName=${lastName}</result>
 		</action>
-		
+
 		<action name="processFreeMarkerView" class="org.apache.struts2.portlet.example.FormExample">
 			<result type="freemarker" name="success">/WEB-INF/view/freeMarkerExample.ftl</result>
 		</action>
-		
+
 		<action name="velocityHelloWorld" class="com.opensymphony.xwork2.ActionSupport">
 			<result type="velocity" name="success">/WEB-INF/view/helloWorld.vm</result>
 		</action>
diff --git a/portlet/src/main/resources/struts.xml b/portlet/src/main/resources/struts.xml
index b493a34..d3fa290 100644
--- a/portlet/src/main/resources/struts.xml
+++ b/portlet/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
     <include file="struts-view.xml"/>
diff --git a/preparable-interface/src/main/resources/struts.xml b/preparable-interface/src/main/resources/struts.xml
index 5e6f2bd..5d9d810 100644
--- a/preparable-interface/src/main/resources/struts.xml
+++ b/preparable-interface/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -9,7 +9,7 @@
 
 	<package name="basicstruts2" extends="struts-default">
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
@@ -19,7 +19,7 @@
 	    <action name="edit" class="org.apache.struts.edit.action.EditAction" method="input">
 	    	<result name="input">/edit.jsp</result>
 	    </action>
-	    
+
 	    <action name="save" class="org.apache.struts.edit.action.EditAction" method="execute">
 	        <result name="input">/edit.jsp</result>
 	    	<result name="success">/thankyou.jsp</result>
diff --git a/quarkus/src/main/resources/struts.xml b/quarkus/src/main/resources/struts.xml
index 2054240..753abd6 100644
--- a/quarkus/src/main/resources/struts.xml
+++ b/quarkus/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
diff --git a/rest-angular/pom.xml b/rest-angular/pom.xml
index 4e38188..3809d58 100644
--- a/rest-angular/pom.xml
+++ b/rest-angular/pom.xml
@@ -146,54 +146,6 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>com.samaxes.maven</groupId>
-                <artifactId>minify-maven-plugin</artifactId>
-                <version>1.7.6</version>
-                <executions>
-                    <execution>
-                        <id>external-minify</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <jsEngine>CLOSURE</jsEngine>
-                            <closureLanguage>ECMASCRIPT5_STRICT</closureLanguage>
-                            <skipMinify>true</skipMinify>
-                            <jsFinalFile>external.js</jsFinalFile>
-                            <jsSourceFiles>
-                                <jsSourceFile>lib/angular/angular.min.js</jsSourceFile>
-                                <jsSourceFile>lib/angular/angular-route.min.js</jsSourceFile>
-                                <jsSourceFile>lib/ui-bootstrap-tpls-1.3.2.min.js</jsSourceFile>
-                                <jsSourceFile>lib/angular-translate.min.js</jsSourceFile>
-                                <jsSourceFile>lib/angular-translate-loader-url.min.js</jsSourceFile>
-                            </jsSourceFiles>
-                        </configuration>
-                        <goals>
-                            <goal>minify</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>application-minify</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <jsEngine>CLOSURE</jsEngine>
-                            <closureLanguage>ECMASCRIPT5_STRICT</closureLanguage>
-                            <jsFinalFile>application.js</jsFinalFile>
-                            <jsSourceFiles>
-                                <jsSourceFile>app.js</jsSourceFile>
-                                <jsSourceFile>config.js</jsSourceFile>
-                            </jsSourceFiles>
-                            <jsSourceIncludes>
-                                <jsSourceInclude>services/*.js</jsSourceInclude>
-                                <jsSourceInclude>controllers/*.js</jsSourceInclude>
-                            </jsSourceIncludes>
-
-                        </configuration>
-                        <goals>
-                            <goal>minify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <version>${jetty-plugin.version}</version>
diff --git a/rest-angular/src/main/resources/struts.xml b/rest-angular/src/main/resources/struts.xml
index 36d8e2c..f4d5bc8 100644
--- a/rest-angular/src/main/resources/struts.xml
+++ b/rest-angular/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
diff --git a/restful2actionmapper/src/main/resources/struts.xml b/restful2actionmapper/src/main/resources/struts.xml
index d4c7f1c..c6c8471 100755
--- a/restful2actionmapper/src/main/resources/struts.xml
+++ b/restful2actionmapper/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -11,14 +11,14 @@
 		value="org.apache.struts2.dispatcher.mapper.Restful2ActionMapper" />
 
 	<constant name="struts.enable.SlashesInActionNames" value="true" />
-	
+
 	<constant name="struts.mapper.alwaysSelectFullNamespace"
 		value="false" />
-		
+
 	<package name="basicstruts2" extends="struts-default">
 		<global-allowed-methods>index,show,create,update,destroy</global-allowed-methods>
       <!-- the param name="id" with a value of {1} below tells Struts that the
-      second string (delimited by the /) is the value Struts should pass to the setId method 
+      second string (delimited by the /) is the value Struts should pass to the setId method
       of the MovieAction class - so for example a url of movie/1 will cause
       1 to be passed to setId method of class MovieAction
       if no method is specified in the URL then the view method will be called
diff --git a/shiro-basic/src/main/resources/struts.xml b/shiro-basic/src/main/resources/struts.xml
index d217974..21a26f8 100644
--- a/shiro-basic/src/main/resources/struts.xml
+++ b/shiro-basic/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
     <package name="default" namespace="/" extends="struts-default">
         <interceptors>
diff --git a/spring-struts/src/main/resources/struts.xml b/spring-struts/src/main/resources/struts.xml
index 618b29e..84e2c27 100644
--- a/spring-struts/src/main/resources/struts.xml
+++ b/spring-struts/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -9,7 +9,7 @@
 
 	<package name="basicstruts2" extends="struts-default">
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
@@ -19,7 +19,7 @@
 	    <action name="edit" class="org.apache.struts.edit.action.EditAction" method="input">
 	    	<result name="input">/edit.jsp</result>
 	    </action>
-	    
+
 	    <action name="save" class="org.apache.struts.edit.action.EditAction" method="execute">
 	    	<result name="success">/thankyou.jsp</result>
 	    </action>
diff --git a/text-provider/src/main/resources/struts.xml b/text-provider/src/main/resources/struts.xml
index c625353..35d19a4 100644
--- a/text-provider/src/main/resources/struts.xml
+++ b/text-provider/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.devMode" value="true"/>
   <constant name="struts.convention.action.packages" value="org.apache.struts_example"/>
@@ -15,16 +15,16 @@
   <bean type="com.opensymphony.xwork2.TextProviderFactory"
         class="org.apache.struts_example.MyTextProviderFactory"
         name="myTextProviderFactory"
-        scope="singleton"/>  
-  
+        scope="singleton"/>
+
   <constant name="struts.textProviderFactory" value="myTextProviderFactory"/>
-    
-  <!-- 
-  Alternatively, if you prefer to extend only TextProviderSupport, 
+
+  <!--
+  Alternatively, if you prefer to extend only TextProviderSupport,
   you can define the custrom TextProvider like this (see Struts v2.5.10 TextProvider Javadocs):
   -->
-  <!--  
-  <bean class="com.company.MyTextProviderSupport" name="MyTextProviderSupport" 
+  <!--
+  <bean class="com.company.MyTextProviderSupport" name="MyTextProviderSupport"
     type="com.opensymphony.xwork2.TextProvider" />
   <constant name="struts.xworkTextProvider" value="MyTextProviderSupport" />
   -->
@@ -32,7 +32,7 @@
   <bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="myProvider" class="org.apache.struts_example.MyLocalizedTextProvider" scope="singleton" />
 
   <constant name="struts.localizedTextProvider" value="myProvider" />
-  
+
   <package name="default" extends="struts-default">
 
     <default-action-ref name="index"/>
diff --git a/themes-override/src/main/resources/struts.xml b/themes-override/src/main/resources/struts.xml
index 68d982b..6011639 100644
--- a/themes-override/src/main/resources/struts.xml
+++ b/themes-override/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -10,7 +10,7 @@
 
 	<package name="basicstruts2" extends="struts-default">
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
@@ -20,7 +20,7 @@
 	    <action name="edit" class="org.apache.struts.edit.action.EditAction" method="input">
 	    	<result name="input">/edit.jsp</result>
 	    </action>
-	    
+
 	    <action name="save" class="org.apache.struts.edit.action.EditAction" method="execute">
 	    	<result name="success">/thankyou.jsp</result>
 	    </action>
diff --git a/themes/src/main/resources/struts.xml b/themes/src/main/resources/struts.xml
index fcef7c9..3596bc4 100644
--- a/themes/src/main/resources/struts.xml
+++ b/themes/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -10,7 +10,7 @@
 
 	<package name="basicstruts2" extends="struts-default">
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
@@ -20,7 +20,7 @@
 	    <action name="edit" class="org.apache.struts.edit.action.EditAction" method="input">
 	    	<result name="input">/edit.jsp</result>
 	    </action>
-	    
+
 	    <action name="save" class="org.apache.struts.edit.action.EditAction" method="execute">
 	    	<result name="success">/thankyou.jsp</result>
 	    </action>
diff --git a/tiles/src/main/resources/example.xml b/tiles/src/main/resources/example.xml
index 33f2a5b..a358ab5 100644
--- a/tiles/src/main/resources/example.xml
+++ b/tiles/src/main/resources/example.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-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">
+<!--
   - This file is included by the struts.xml file as an example
   - of how to break up the configuration file into multiple files.
 -->
diff --git a/tiles/src/main/resources/struts.xml b/tiles/src/main/resources/struts.xml
index c0c0b52..b3ea3a7 100644
--- a/tiles/src/main/resources/struts.xml
+++ b/tiles/src/main/resources/struts.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
   <constant name="struts.devMode" value="false"/>
-  
+
   <include file="example.xml"/>
-  
+
   <!-- Add addition packages and configuration here. -->
 
   <package name="default" extends="struts-default">
diff --git a/type-conversion/src/main/resources/example.xml b/type-conversion/src/main/resources/example.xml
index ab9c453..5535fe6 100644
--- a/type-conversion/src/main/resources/example.xml
+++ b/type-conversion/src/main/resources/example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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">
 <!--
   - This file is included by the struts.xml file as an example
   - of how to break up the configuration file into multiple files.
diff --git a/type-conversion/src/main/resources/struts.xml b/type-conversion/src/main/resources/struts.xml
index 2cbb2e0..e1351b4 100644
--- a/type-conversion/src/main/resources/struts.xml
+++ b/type-conversion/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
     <constant name="struts.devMode" value="true"/>
diff --git a/unit-testing/src/main/resources/struts.xml b/unit-testing/src/main/resources/struts.xml
index 9411c84..f67410c 100644
--- a/unit-testing/src/main/resources/struts.xml
+++ b/unit-testing/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -9,14 +9,14 @@
 
 	<package name="basicstruts2" extends="struts-default">
 
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
 		<action name="index">
 			<result>/index.jsp</result>
 		</action>
 
-		
+
 	  <action name="register" class="org.apache.struts.register.action.Register" method="execute">
 		<result name="success">/thankyou.jsp</result>
 		<result name="input">/register.jsp</result>
diff --git a/unknown-handler/src/main/resources/struts.xml b/unknown-handler/src/main/resources/struts.xml
index 81460e5..1dabe25 100644
--- a/unknown-handler/src/main/resources/struts.xml
+++ b/unknown-handler/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
   <constant name="struts.devMode" value="true"/>
diff --git a/using-tags/src/main/resources/struts.xml b/using-tags/src/main/resources/struts.xml
index 4415cc9..06f715e 100644
--- a/using-tags/src/main/resources/struts.xml
+++ b/using-tags/src/main/resources/struts.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-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.devMode" value="true" />
 
     <package name="basicstruts2" extends="struts-default">
-        <!-- If no class attribute is specified the framework will assume success and 
+        <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
         <action name="index">
diff --git a/validation-messages/src/main/resources/struts.xml b/validation-messages/src/main/resources/struts.xml
index 866fe83..c3d31e4 100644
--- a/validation-messages/src/main/resources/struts.xml
+++ b/validation-messages/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
     <constant name="struts.devMode" value="true"/>
diff --git a/wildcard-method-selection/src/main/resources/struts.xml b/wildcard-method-selection/src/main/resources/struts.xml
index ede0585..2579f2e 100644
--- a/wildcard-method-selection/src/main/resources/struts.xml
+++ b/wildcard-method-selection/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>
 
@@ -11,16 +11,16 @@
    <package name="wildcardmethodexample" extends="struts-default">
 
         <!-- Whatever value is before Person for the name of
-        the action will be the name of the method to call in 
-        class PersonAction.  For example action createPerson 
+        the action will be the name of the method to call in
+        class PersonAction.  For example action createPerson
         will call a method named create in class PersonAction -->
-        
+
 		<action name="*Person" class="org.apache.struts.tutorials.wildcardmethod.action.PersonAction" method="{1}">
 			<result name="success">view.jsp</result>
 			<result name="input">input.jsp</result>
 			<allowed-methods>create,edit,saveOrUpdate,delete</allowed-methods>
 		</action>
-		
+
 		<action name="person!*" class="org.apache.struts.tutorials.wildcardmethod.action.PersonAction" method="run{1}This">
 			<result name="success">view.jsp</result>
 			<result name="input">input.jsp</result>
diff --git a/wildcard-regex/src/main/resources/struts.xml b/wildcard-regex/src/main/resources/struts.xml
index 0e1a08f..2cbe4ae 100644
--- a/wildcard-regex/src/main/resources/struts.xml
+++ b/wildcard-regex/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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.enable.DynamicMethodInvocation" value="false"/>
     <constant name="struts.devMode" value="true"/>