diff --git a/spring-faces/src/main/resources/META-INF/faces-config.xml b/spring-faces/src/main/resources/META-INF/faces-config.xml
index 5db86ebd..738cd3fe 100644
--- a/spring-faces/src/main/resources/META-INF/faces-config.xml
+++ b/spring-faces/src/main/resources/META-INF/faces-config.xml
@@ -2,7 +2,7 @@
 
 <faces-config xmlns="http://java.sun.com/xml/ns/javaee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
 	version="2.0">
 
 	<application>
diff --git a/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml b/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml
index 1f85ccf0..660e1713 100644
--- a/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml
+++ b/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml
@@ -4,9 +4,9 @@
        xmlns:faces="http://www.springframework.org/schema/faces"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans.xsd
+           https://www.springframework.org/schema/beans/spring-beans.xsd
            http://www.springframework.org/schema/faces
-           http://www.springframework.org/schema/faces/spring-faces-2.4.xsd">
+           https://www.springframework.org/schema/faces/spring-faces-2.4.xsd">
 	
 	<faces:flow-builder-services id="flowBuilderServicesDefault"/>
 	
diff --git a/spring-faces/src/test/java/org/springframework/faces/config/resources.xml b/spring-faces/src/test/java/org/springframework/faces/config/resources.xml
index f76088f9..b95db036 100644
--- a/spring-faces/src/test/java/org/springframework/faces/config/resources.xml
+++ b/spring-faces/src/test/java/org/springframework/faces/config/resources.xml
@@ -3,8 +3,8 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:faces="http://www.springframework.org/schema/faces"
        xsi:schemaLocation="
-           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-           http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces-2.2.xsd">
+           http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+           http://www.springframework.org/schema/faces https://www.springframework.org/schema/faces/spring-faces-2.2.xsd">
 	
 	<faces:resources />
 	
diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml b/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml
index ef9de169..27edcf8a 100644
--- a/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml
@@ -4,9 +4,9 @@
        xmlns:flow="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+           https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
            http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
+           https://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
 
 	<flow:enable-scopes/>
 	
diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow.xml b/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow.xml
index 8cf2899d..79621efa 100644
--- a/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow.xml
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow xmlns="http://www.springframework.org/schema/webflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
 
     <start-state idref="viewState1" />
    
diff --git a/spring-js-tiles3/src/test/java/org/springframework/js/ajax/tiles3/tiles-definitions.xml b/spring-js-tiles3/src/test/java/org/springframework/js/ajax/tiles3/tiles-definitions.xml
index 10c11de6..0cfee030 100644
--- a/spring-js-tiles3/src/test/java/org/springframework/js/ajax/tiles3/tiles-definitions.xml
+++ b/spring-js-tiles3/src/test/java/org/springframework/js/ajax/tiles3/tiles-definitions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE tiles-definitions PUBLIC
         "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
-        "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
+        "https://tiles.apache.org/dtds/tiles-config_3_0.dtd">
 
 <tiles-definitions>
 
diff --git a/spring-js/src/test/java/org/springframework/js/ajax/tiles2/tiles-definitions.xml b/spring-js/src/test/java/org/springframework/js/ajax/tiles2/tiles-definitions.xml
index f9207c5c..9a4fa737 100644
--- a/spring-js/src/test/java/org/springframework/js/ajax/tiles2/tiles-definitions.xml
+++ b/spring-js/src/test/java/org/springframework/js/ajax/tiles2/tiles-definitions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE tiles-definitions PUBLIC
         "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
-        "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
+        "https://tiles.apache.org/dtds/tiles-config_2_1.dtd">
 
 <tiles-definitions>
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml
index 8043f001..dff967ee 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml
@@ -4,9 +4,9 @@
        xmlns:webflow="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans.xsd
+           https://www.springframework.org/schema/beans/spring-beans.xsd
            http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd">
+           https://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd">
 	
 	<webflow:flow-builder-services id="flowBuilderServicesDefault"/>
 	
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml
index 643f5933..b2d07980 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml
@@ -4,9 +4,9 @@
        xmlns:webflow="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans.xsd
+           https://www.springframework.org/schema/beans/spring-beans.xsd
            http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd">
+           https://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd">
 
 	<webflow:flow-executor id="flowExecutor" flow-registry="flowRegistry">
 		<webflow:flow-execution-repository max-executions="1" max-execution-snapshots="2" conversation-manager="conversationManager" />
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml
index 15033590..a4da6860 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml
@@ -4,9 +4,9 @@
        xmlns:webflow="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans.xsd
+           https://www.springframework.org/schema/beans/spring-beans.xsd
            http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd">
+           https://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd">
 
 	<webflow:flow-registry id="flowRegistry" parent="parentRegistry">
 		<webflow:flow-location id="flow" path="org/springframework/webflow/config/flow.xml">
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow.xml
index 00011745..5e7efd10 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<end-state id="end"/>
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow1.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow1.xml
index 00011745..5e7efd10 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow1.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow1.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<end-state id="end"/>
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow2.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow2.xml
index 00011745..5e7efd10 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow2.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow2.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<end-state id="end"/>
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/resources/flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/resources/flow.xml
index 00011745..5e7efd10 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/resources/flow.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/resources/flow.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<end-state id="end"/>
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-action.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-action.xml
index 7c16d45c..b47e50db 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-action.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-action.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<on-start>
 		<evaluate expression="action"/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-bean.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-bean.xml
index c85d1dae..815a364d 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-bean.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-bean.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<start-actions>
 		<evaluate expression="testBean.foo"/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-custom-attribute.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-custom-attribute.xml
index 4ba5777f..4b085746 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-custom-attribute.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-custom-attribute.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<attribute name="foo" value="bar"/>
 	<attribute name="number" value="1" type="integer"/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-empty.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-empty.xml
index cb39f147..e5dd1def 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-empty.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-empty.xml
@@ -1,5 +1,5 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 </flow>
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-endstate.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-endstate.xml
index 00011745..5e7efd10 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-endstate.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-endstate.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<end-state id="end"/>
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-exception-handler.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-exception-handler.xml
index a94ff736..986b92af 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-exception-handler.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-exception-handler.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<view-state id="state1">
 		<exception-handler bean="foo2"/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod-beans.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod-beans.xml
index 916314c4..a05937fb 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod-beans.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod-beans.xml
@@ -3,7 +3,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+           https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 	<bean id="formAction" class="org.springframework.webflow.action.FormAction">
 		<property name="formObjectName" value="formBean"/>
 		<property name="validator">
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod.xml
index 2a306b26..5c10fa16 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<var name="formBean" class="org.springframework.webflow.action.FormActionTests$TestBean"/>
 	
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-child.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-child.xml
index d76941ab..abd523fe 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-child.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-child.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd"
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd"
       parent="parent">
 
 	<view-state id="view" view="myCustomView" />
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-parent.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-parent.xml
index d006bd3c..ce17759e 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-parent.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-parent.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 	
 	<end-state id="end"/>
 	
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child-alt.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child-alt.xml
index b9b10c0c..f6b2120d 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child-alt.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child-alt.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<action-state id="view" parent="parent" />
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child.xml
index fe147880..e5cdf7d9 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<view-state id="view" parent="parent#other" />
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-invalid-parent-syntax.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-invalid-parent-syntax.xml
index 3c407a37..e2ccd9af 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-invalid-parent-syntax.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-invalid-parent-syntax.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<view-state id="view" parent="parent" />
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-parent.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-parent.xml
index 6225c36a..89838d2b 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-parent.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-parent.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 	
 	<view-state id="view" view="mainview"/>
 	<view-state id="other" view="otherview"/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inputoutput.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inputoutput.xml
index 2a9cfd47..369255a0 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inputoutput.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inputoutput.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<input name="foo" value="flowScope.foo"/>
 	<input name="foo" value="flowScope.bar"/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-persistencecontext.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-persistencecontext.xml
index a0ec47dc..be441465 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-persistencecontext.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-persistencecontext.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<persistence-context/>
 	
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-state.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-state.xml
index e056e496..6f067929 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-state.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-state.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 	
 	<end-state id="end">
 		<secured attributes="ROLE_USER"/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-transition.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-transition.xml
index d006bd3c..ce17759e 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-transition.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-transition.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 	
 	<end-state id="end"/>
 	
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured.xml
index fdb2b369..bf4a794e 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<secured attributes="ROLE_USER"/>
 	
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-attribute.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-attribute.xml
index acbfa555..1371e126 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-attribute.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-attribute.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd" start-state="end">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd" start-state="end">
 
 	<end-state id="foo"/>
 	<end-state id="end"/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-default.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-default.xml
index 00011745..5e7efd10 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-default.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-default.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<end-state id="end"/>
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-validation-hints.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-validation-hints.xml
index 8fa112da..0ae11ad4 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-validation-hints.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-validation-hints.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.4.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.4.xsd">
 
 	<view-state id="state1" validation-hints="foo,bar">
 		<transition on="submit" to="state2" validation-hints="baz" />
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-var.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-var.xml
index ce830e1e..330591d6 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-var.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-var.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<var name="flow-foo" class="org.springframework.webflow.TestBean"/>
 	<var name="conversation-foo" class="org.springframework.webflow.TestBean"/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-externalredirect.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-externalredirect.xml
index 2f697ef1..a3ef1544 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-externalredirect.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-externalredirect.xml
@@ -1,7 +1,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
-	<view-state id="view" view="externalRedirect:http://www.paypal.com?_callbackUrl=#{flowExecutionUri}" />
+	<view-state id="view" view="externalRedirect:https://www.paypal.com?_callbackUrl=#{flowExecutionUri}" />
 
 </flow>
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-flowredirect.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-flowredirect.xml
index 0f310383..ad3a1bd2 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-flowredirect.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-flowredirect.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<view-state id="view" view="flowRedirect:myFlow?input=#{flowScope.foo}" />
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-model-binding.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-model-binding.xml
index d0ca9a5f..5b16d5ec 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-model-binding.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-model-binding.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.4.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.4.xsd">
 
 	<view-state id="form" model="formObject" validation-hints="foo,bar">
 		<binder>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-popup.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-popup.xml
index 20af01de..4162f467 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-popup.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-popup.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<view-state id="view" popup="true" />
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-redirect.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-redirect.xml
index fac265e1..fe743968 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-redirect.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-redirect.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<view-state id="view" redirect="true"/>
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-var.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-var.xml
index 5b86843f..e3adb3a0 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-var.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-var.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<view-state id="view">
 		<var name="foo" class="org.springframework.webflow.TestBean"/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-view.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-view.xml
index 352406a5..0689c7af 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-view.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-view.xml
@@ -1,6 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<view-state id="view" view="myCustomView" />
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestAddress.hbm.xml b/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestAddress.hbm.xml
index 6e62c495..2b8b9f1d 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestAddress.hbm.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestAddress.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
     "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+    "https://hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.springframework.webflow.persistence" default-lazy="false">
 	<class name="TestAddress" table="T_ADDRESS">
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestBean.hbm.xml b/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestBean.hbm.xml
index 2b5a50fb..e2214366 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestBean.hbm.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestBean.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
     "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+    "https://hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.springframework.webflow.persistence" default-lazy="false">
 	<class name="TestBean" table="T_BEAN">
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-child-flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-child-flow.xml
index 30e540db..c6045843 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-child-flow.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-child-flow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<persistence-context/>
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-root-flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-root-flow.xml
index 729052c2..e1780572 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-root-flow.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-root-flow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<persistence-context/>
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/orm.xml b/spring-webflow/src/test/java/org/springframework/webflow/persistence/orm.xml
index 342b800b..340e5023 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/orm.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/orm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd"
+		xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm https://www.oracle.com/webfolder/technetwork/jsc/xml/ns/persistence/orm_2_1.xsd"
 		version="2.1">
 
 	<package>org.springframework.webflow.persistence</package>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/persistence.xml b/spring-webflow/src/test/java/org/springframework/webflow/persistence/persistence.xml
index b3a5d2af..35f93de2 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/persistence.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/persistence.xml
@@ -1,6 +1,6 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
 		version="1.0">
 
 	<persistence-unit name="webflow" transaction-type="RESOURCE_LOCAL">
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow-beans.xml b/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow-beans.xml
index b0d8710f..821fd0ce 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow-beans.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow-beans.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                           http://www.springframework.org/schema/beans/spring-beans.xsd">
+                           https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<!-- Search form action that setups the form and processes form submissions -->
 	<bean id="formAction" class="org.springframework.webflow.action.FormAction">
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml
index 73060941..4e6925fa 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<view-state id="enterCriteria" view="searchCriteria">
 		<on-render>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/upgrade/flow1.xml b/spring-webflow/src/test/java/org/springframework/webflow/upgrade/flow1.xml
index b156b22f..aa43f3b3 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/upgrade/flow1.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/upgrade/flow1.xml
@@ -2,7 +2,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
 
 	<var name="list" class="java.util.ArrayList" />
 
diff --git a/src/reference/actions.xml b/src/reference/actions.xml
index e6bc3dde..9afab1a6 100644
--- a/src/reference/actions.xml
+++ b/src/reference/actions.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Executing actions</title>
 	<sect1 xml:id="actions-introduction">
 		<title>Introduction</title>
@@ -35,7 +35,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
 	  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	  xsi:schemaLocation="http://www.springframework.org/schema/webflow
-						  http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+						  https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<on-start>
 		<evaluate expression="interviewFactory.createInterview()" result="flowScope.interview" />
@@ -278,7 +278,7 @@ public Event makeBooking(RequestContext context) {
 <flow xmlns="http://www.springframework.org/schema/webflow"
 	  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	  xsi:schemaLocation="http://www.springframework.org/schema/webflow
-						  http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+						  https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<input name="hotelId" />
 
@@ -332,7 +332,7 @@ public Event makeBooking(RequestContext context) {
 <flow xmlns="http://www.springframework.org/schema/webflow"
 	  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	  xsi:schemaLocation="http://www.springframework.org/schema/webflow
-						  http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+						  https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<input name="orderId" />
 
@@ -440,7 +440,7 @@ public class PrintBoardingPassAction extends AbstractAction {
 			<title>Handling File Uploads</title>
 			<para>
 				Another common task is to use Web Flow to handle multipart file uploads in combination with Spring MVC's
-				<code>MultipartResolver</code>.  Once the resolver is set up correctly <link xl:href="http://static.springsource.org/spring/docs/2.5.x/reference/mvc.html#mvc-multipart">as described here</link> and the submitting
+				<code>MultipartResolver</code>.  Once the resolver is set up correctly <link xl:href="https://docs.spring.io/spring/docs/2.5.x/reference/mvc.html#mvc-multipart">as described here</link> and the submitting
 				HTML form is configured with <code>enctype="multipart/form-data"</code>, you can easily handle the file upload in a
 				transition action.
 			</para>
diff --git a/src/reference/defining-flows.xml b/src/reference/defining-flows.xml
index 4f24523e..4f94ef50 100644
--- a/src/reference/defining-flows.xml
+++ b/src/reference/defining-flows.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Defining Flows</title>
 	<sect1 xml:id="defining-flows-introduction">
 		<title>Introduction</title>
@@ -76,7 +76,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 </flow>]]>
 			</programlisting>
@@ -136,7 +136,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
     <view-state id="enterBookingDetails">
         <transition on="submit" to="reviewBooking" />
@@ -217,7 +217,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
     <input name="hotelId" />
 
@@ -347,7 +347,7 @@ public interface FlowOutcome {
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
     <input name="hotelId" />
 
@@ -513,7 +513,7 @@ public interface FlowOutcome {
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
     <input name="hotelId" />
 
diff --git a/src/reference/el.xml b/src/reference/el.xml
index 1ecd3ea5..7abcdc94 100644
--- a/src/reference/el.xml
+++ b/src/reference/el.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Expression Language (EL)</title>
 	<sect1 xml:id="el-introduction">
 		<title>Introduction</title>
@@ -79,7 +79,7 @@
 		<sect2 xml:id="el-spring-el">
 			<title>Spring EL</title>
 			<para>
-				Starting with version 2.1 Web Flow uses the <link xl:href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/expressions.html">Spring Expression Language</link> (Spring EL).
+				Starting with version 2.1 Web Flow uses the <link xl:href="https://docs.spring.io/spring/docs/3.0.x/spring-framework-reference/html/expressions.html">Spring Expression Language</link> (Spring EL).
 				Spring EL was created to provide a single, well-supported expression language for use across all the products in the Spring portfolio.
 				It is distributed as a separate jar <code>org.springframework.expression</code> in the Spring Framework.
 				Existing applications will need to remove dependencies on <code>org.jboss.el</code> or <code>org.ognl</code> and use <code>org.springframework.expression</code> instead.
@@ -89,7 +89,7 @@
 		<sect2 xml:id="el-unified-el">
 			<title>Unified EL</title>
 			<para>
-				In Web Flow 2.0 <link xl:href="http://en.wikipedia.org/wiki/Unified_Expression_Language">Unified EL</link> was the default expression language with <code>jboss-el</code> as the implementation.
+				In Web Flow 2.0 <link xl:href="https://en.wikipedia.org/wiki/Unified_Expression_Language">Unified EL</link> was the default expression language with <code>jboss-el</code> as the implementation.
 				Use of Unified EL also implies a dependency on <code>el-api</code> although that is typically <emphasis>provided</emphasis> by your web container.
 				Tomcat 6 includes it, for example.
 				Spring EL is the default and recommended expression language to use.
@@ -127,9 +127,9 @@
 				</para>
 			</note>
 			<para>
-				<link xl:href="http://www.ognl.org">OGNL</link> is the third supported expression language.
+				<link xl:href="https://www.ognl.org">OGNL</link> is the third supported expression language.
 				OGNL is the EL most familiar to Web Flow version 1.0 users.
-				Please refer to the <link xl:href="http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/index.html">OGNL language guide</link> for specifics on its EL syntax.
+				Please refer to the <link xl:href="https://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/index.html">OGNL language guide</link> for specifics on its EL syntax.
 				If you wish to use OGNL this is the Spring configuration necessary to plug it in:
 				<programlisting language="xml"><![CDATA[
 <webflow:flow-builder-services expression-parser="expressionParser"/>
@@ -171,7 +171,7 @@
 					</para>
 				</listitem>
 			</orderedlist>
-			For more information on Spring EL syntax please refer to the <link xl:href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/expressions.html#expressions-language-ref">Language Reference</link> section in the Spring Documentation.
+			For more information on Spring EL syntax please refer to the <link xl:href="https://docs.spring.io/spring/docs/3.0.x/spring-framework-reference/html/expressions.html#expressions-language-ref">Language Reference</link> section in the Spring Documentation.
 		</para>
 	</sect1>
 	<sect1 xml:id="el-variables">
diff --git a/src/reference/flow-definition-field-mappings.xml b/src/reference/flow-definition-field-mappings.xml
index 0915d81b..d5b5da3c 100644
--- a/src/reference/flow-definition-field-mappings.xml
+++ b/src/reference/flow-definition-field-mappings.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Flow Definition Language 1.0 to 2.0 Mappings</title>
 	<para>
 		The flow definition language has changed since the 1.0 release.
diff --git a/src/reference/flow-inheritance.xml b/src/reference/flow-inheritance.xml
index 30560134..a64c03dd 100644
--- a/src/reference/flow-inheritance.xml
+++ b/src/reference/flow-inheritance.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Flow Inheritance</title>
 	<sect1 xml:id="flow-inheritance-introduction">
 		<title>Introduction</title>
diff --git a/src/reference/flow-managed-persistence.xml b/src/reference/flow-managed-persistence.xml
index 04fb4046..4b7c3601 100644
--- a/src/reference/flow-managed-persistence.xml
+++ b/src/reference/flow-managed-persistence.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Flow Managed Persistence</title>
 	<sect1 xml:id="flow-managed-persistence-introduction">
 		<title>Introduction</title>
@@ -42,7 +42,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
     <persistence-context />
 
diff --git a/src/reference/flow-security.xml b/src/reference/flow-security.xml
index 21c5c2ee..a432b2a2 100644
--- a/src/reference/flow-security.xml
+++ b/src/reference/flow-security.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Securing Flows</title>
 	<sect1 xml:id="flow-security-introduction">
 		<title>Introduction</title>
@@ -110,7 +110,7 @@
 			<para>
 				If your application is using authorities that are not role based, you will need to configure a custom <code>AccessDecisionManager</code>.
 				You can override the default decision manager by setting the <code>accessDecisionManager</code> property on the security listener.
-				Please consult the <link xl:href="http://static.springframework.org/spring-security/site/reference.html">Spring Security reference documentation</link> to learn more about decision managers.
+				Please consult the <link xl:href="https://docs.spring.io/spring-security/site/reference.html">Spring Security reference documentation</link> to learn more about decision managers.
 			</para>
 			<programlisting language="xml"><![CDATA[
 <bean id="securityFlowExecutionListener"
@@ -124,7 +124,7 @@
 		<title>Configuring Spring Security</title>
 		<para>
 			Spring Security has robust configuration options available.
-			As every application and environment has its own security requirements, the <link xl:href="http://static.springframework.org/spring-security/site/reference.html">Spring Security reference documentation</link> is the best place to learn the available options.
+			As every application and environment has its own security requirements, the <link xl:href="https://docs.spring.io/spring-security/site/reference.html">Spring Security reference documentation</link> is the best place to learn the available options.
 		</para>
 		<para>
 			Both the <code>booking-faces</code> and <code>booking-mvc</code> sample applications are configured to use Spring Security.
diff --git a/src/reference/index.xml b/src/reference/index.xml
index f6bafab3..697fba4a 100644
--- a/src/reference/index.xml
+++ b/src/reference/index.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 
 	<info>
 		<title>Spring Web Flow Reference Guide</title>
diff --git a/src/reference/overview.xml b/src/reference/overview.xml
index fd083515..14cc50ef 100644
--- a/src/reference/overview.xml
+++ b/src/reference/overview.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Introduction</title>
 	<sect1 xml:id="manual-overview">
 		<title>What this guide covers</title>
@@ -33,7 +33,7 @@
 		</para>
 		<para>
 			Report bugs and make requests using the
-			<link xl:href="http://jira.spring.io">Spring Issue Tracker</link>.
+			<link xl:href="https://jira.spring.io">Spring Issue Tracker</link>.
 		</para>
 		<para>
 			Submit pull requests and work with the source code  ,
@@ -43,7 +43,7 @@
 	<sect1 xml:id="jars-mvn-central">
 		<title>How to access Web Flow artifacts from Maven Central</title>
 		<para>
-			Each jar in the Web Flow distribution is available in the <link xl:href="http://search.maven.org">Maven Central Repository</link>.
+			Each jar in the Web Flow distribution is available in the <link xl:href="https://search.maven.org">Maven Central Repository</link>.
 			This allows you to easily integrate Web Flow into your application if you are already using Maven as the
 			build system for your web development project.
 		</para>
@@ -78,16 +78,16 @@
 		</para>
 			<programlisting language="xml"><![CDATA[
 <url name="com.springsource.repository.bundles.release">
-    <ivy pattern="http://repository.springsource.com/ivy/bundles/release/
+    <ivy pattern="https://repository.springsource.com/ivy/bundles/release/
                   [organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
-    <artifact pattern="http://repository.springsource.com/ivy/bundles/release/
+    <artifact pattern="https://repository.springsource.com/ivy/bundles/release/
                   [organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
 </url>
 
 <url name="com.springsource.repository.bundles.external">
-    <ivy pattern="http://repository.springsource.com/ivy/bundles/external/
+    <ivy pattern="https://repository.springsource.com/ivy/bundles/external/
                   [organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
-    <artifact pattern="http://repository.springsource.com/ivy/bundles/external/
+    <artifact pattern="https://repository.springsource.com/ivy/bundles/external/
                   [organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
 </url>]]>
 			</programlisting>
@@ -96,8 +96,8 @@
 		</para>
 			<programlisting language="xml"><![CDATA[
 <url name="springsource-repository">
-    <ivy pattern="http://repo.spring.io/libs-release/[organization]/[module]/[revision]/[type]s/ivy-[revision].xml" />
-    <artifact pattern="http://repo.spring.io/libs-release/[organization]/[module]/[revision]/[type]s/[module](-[classifier])-[revision].[ext]" />
+    <ivy pattern="https://repo.spring.io/libs-release/[organization]/[module]/[revision]/[type]s/ivy-[revision].xml" />
+    <artifact pattern="https://repo.spring.io/libs-release/[organization]/[module]/[revision]/[type]s/[module](-[classifier])-[revision].[ext]" />
 </url>]]>
 			</programlisting>
 		<para>
@@ -135,7 +135,7 @@
 <repository>
     <id>springsource-repository</id>
     <name>Spring project snapshots, milestones, and releases</name>
-    <url>http://repo.spring.io/snapshot</url>
+    <url>https://repo.spring.io/snapshot</url>
 </repository>]]>
 			</programlisting>
 			<para>
diff --git a/src/reference/portlet.xml b/src/reference/portlet.xml
index 53b18b19..1c0ce7ff 100644
--- a/src/reference/portlet.xml
+++ b/src/reference/portlet.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Portlet Integration</title>
 	<sect1 xml:id="portlet-introduction">
 		<title>Introduction</title>
@@ -21,7 +21,7 @@
 		<title>Configuring web.xml and portlet.xml</title>
 		<para>
 			The configuration for a portlet depends on the portlet container used.
-			The sample applications, included with Web Flow, are both configured to use <link xl:href="http://portals.apache.org/pluto/">Apache Pluto</link>.
+			The sample applications, included with Web Flow, are both configured to use <link xl:href="https://portals.apache.org/pluto/">Apache Pluto</link>.
 		</para>
 		<para>
 			In general, the configuration requires adding a servlet mapping in the <code>web.xml</code> file to dispatch request to the portlet container.
@@ -107,7 +107,7 @@ public class ViewFlowHandler extends AbstractFlowHandler {
 			<title>Handler Mappings</title>
 			<para>
 				Spring Portlet MVC provides a rich set of methods to map portlet requests.
-				Complete documentation  is available in the <link xl:href="http://static.springframework.org/spring/docs/current/reference/portlet.html#portlet-handlermapping">Spring Reference Documentation</link>.
+				Complete documentation  is available in the <link xl:href="https://docs.spring.io/spring/docs/current/reference/portlet.html#portlet-handlermapping">Spring Reference Documentation</link>.
 			</para>
 			<para>
 				The <code>booking-portlet-mvc</code> sample application uses a <code>PortletModeHandlerMapping</code> to map portlet requests.
@@ -230,7 +230,7 @@ externalContext.requestMap.portletMode
 <programlisting language="java"><![CDATA[<?xml version="1.0"?>
 <!DOCTYPE faces-config PUBLIC
   "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+  "https://java.sun.com/dtd/web-facesconfig_1_0.dtd">
 
 <faces-config>
     <application>
diff --git a/src/reference/spring-faces.xml b/src/reference/spring-faces.xml
index e1aa71bc..52f9a2a6 100644
--- a/src/reference/spring-faces.xml
+++ b/src/reference/spring-faces.xml
@@ -5,8 +5,8 @@ xmlns:xl="http://www.w3.org/1999/xlink"
 xmlns:xi="http://www.w3.org/2001/XInclude"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="
-	http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-	http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+	http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+	http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>JSF Integration</title>
 
 	<sect1 xml:id="spring-faces-introduction">
@@ -108,7 +108,7 @@ xsi:schemaLocation="
 &lt;?xml version='1.0' encoding='UTF-8'?&gt;
 &lt;faces-config xmlns="http://java.sun.com/xml/ns/javaee"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
 		version="2.0"&gt;
 
 &lt;/faces-config&gt;
@@ -208,11 +208,11 @@ xsi:schemaLocation="
 	xmlns:faces="http://www.springframework.org/schema/faces"
 	si:schemaLocation="
 		http://www.springframework.org/schema/beans
-		http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+		https://www.springframework.org/schema/beans/spring-beans-4.0.xsd
 		http://www.springframework.org/schema/webflow-config
-		http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd
+		https://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd
 		http://www.springframework.org/schema/faces
-		http://www.springframework.org/schema/faces/spring-faces-2.4.xsd"&gt;
+		https://www.springframework.org/schema/faces/spring-faces-2.4.xsd"&gt;
 
 	&lt;!-- Executes flows: the central entry point into the Spring Web Flow system --&gt;
 	&lt;webflow:flow-executor id="flowExecutor"&gt;
@@ -280,9 +280,9 @@ public class WebFlowConfig extends AbstractFacesFlowConfiguration {
 		 xmlns:faces="http://www.springframework.org/schema/faces"
 		 xsi:schemaLocation="
 			 http://www.springframework.org/schema/beans
-			 http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+			 https://www.springframework.org/schema/beans/spring-beans-4.0.xsd
 			 http://www.springframework.org/schema/faces
-			 http://www.springframework.org/schema/faces/spring-faces-2.4.xsd"&gt;
+			 https://www.springframework.org/schema/faces/spring-faces-2.4.xsd"&gt;
 
 	&lt;faces:resources /&gt;
 
@@ -760,7 +760,7 @@ mvn package
 </filter-mapping>]]>
 			</programlisting>
 			<para>For more details refer to the
-			<link xl:href="http://primefaces.org/documentation.html">PrimeFaces documentation</link>.</para>
+			<link xl:href="https://primefaces.org/documentation.html">PrimeFaces documentation</link>.</para>
 		</sect2>
 
 		<sect2>
@@ -791,7 +791,7 @@ mvn package
 	}
 }</programlisting>
 			<para>For more details refer to the
-			<link xl:href="http://www.jboss.org/richfaces/docs">RichFaces documentation</link>.</para>
+			<link xl:href="https://www.jboss.org/richfaces/docs">RichFaces documentation</link>.</para>
 		</sect2>
 	</sect1>
 
@@ -809,7 +809,7 @@ mvn package
 &lt;?xml version="1.0"?&gt;
 &lt;!DOCTYPE facelet-taglib PUBLIC
 "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-"http://java.sun.com/dtd/facelet-taglib_1_0.dtd"&gt;
+"https://java.sun.com/dtd/facelet-taglib_1_0.dtd"&gt;
 &lt;facelet-taglib&gt;
 	&lt;namespace&gt;http://www.springframework.org/security/tags&lt;/namespace&gt;
 	&lt;tag&gt;
@@ -850,7 +850,7 @@ mvn package
 		<para>Now you are ready to use the tag library in your views. You can use
 		the authorize tag to include nested content conditionally:</para>
 
-		<programlisting language="xml">&lt;!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;
+		<programlisting language="xml">&lt;!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;
 &lt;ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:ui="http://java.sun.com/jsf/facelets"
 	xmlns:h="http://java.sun.com/jsf/html"
@@ -874,7 +874,7 @@ mvn package
 		<para>You can also use one of several EL functions in the rendered or
 		other attribute of any JSF component:</para>
 
-		<programlisting language="xml">&lt;!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;
+		<programlisting language="xml">&lt;!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;
 &lt;ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:ui="http://java.sun.com/jsf/facelets"
 	xmlns:h="http://java.sun.com/jsf/html"
diff --git a/src/reference/spring-js.xml b/src/reference/spring-js.xml
index 581eae2d..03855b13 100644
--- a/src/reference/spring-js.xml
+++ b/src/reference/spring-js.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Spring JavaScript Quick Reference</title>
 	<sect1 xml:id="spring-js-introduction">
 		<title>Introduction</title>
@@ -42,7 +42,7 @@
 		<para>
 			Note that starting with version 3.0.4, the Spring Framework includes
 			a replacement for the <code>ResourceServlet</code> (see the
-			<link xl:href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/mvc.html#mvc-static-resources">Spring Framework documentation</link>).
+			<link xl:href="https://docs.spring.io/spring/docs/3.0.x/spring-framework-reference/html/mvc.html#mvc-static-resources">Spring Framework documentation</link>).
 			With the new &lt;mvc:resources&gt; element resource requests (.js, .css) are handled by the
 			<code>DispatcherSevlet</code> without the need for a separate <code>ResourceServlet</code>.
 			Here is the relevant portion of the Spring MVC configuration in
@@ -53,8 +53,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<mvc:annotation-driven/>
 
@@ -102,8 +102,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	...
 
diff --git a/src/reference/spring-mvc.xml b/src/reference/spring-mvc.xml
index 31bcafaf..bda99896 100644
--- a/src/reference/spring-mvc.xml
+++ b/src/reference/spring-mvc.xml
@@ -5,8 +5,8 @@ xmlns:xl="http://www.w3.org/1999/xlink"
 xmlns:xi="http://www.w3.org/2001/XInclude"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="
-	http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-	http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+	http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+	http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 <title>Spring MVC Integration</title>
 
 <sect1 xml:id="spring-mvc-introduction">
@@ -307,7 +307,7 @@ public class BookingFlowHandler extends AbstractFlowHandler {
 		<para>These same redirect prefixes are also supported within a flow
 		definition when using the <code>externalRedirect:</code> directive in
 		conjunction with a view-state or end-state; for example,
-		<code>view="externalRedirect:http://springframework.org"</code></para>
+		<code>view="externalRedirect:https://springframework.org"</code></para>
 	</sect2>
 </sect1>
 
diff --git a/src/reference/system-setup.xml b/src/reference/system-setup.xml
index 90ccac11..de6cc5d2 100644
--- a/src/reference/system-setup.xml
+++ b/src/reference/system-setup.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>System Setup</title>
 	<sect1 xml:id="system-setup-introduction">
 		<title>Introduction</title>
@@ -29,9 +29,9 @@
        xmlns:webflow="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+           https://www.springframework.org/schema/beans/spring-beans-4.0.xsd
            http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd">
+           https://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd">
 
     <!-- Setup Web Flow here -->
 
diff --git a/src/reference/testing.xml b/src/reference/testing.xml
index b27ceb44..05b366cf 100644
--- a/src/reference/testing.xml
+++ b/src/reference/testing.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Testing flows</title>
 	<sect1 xml:id="testing-introduction">
 		<title>Introduction</title>
diff --git a/src/reference/upgrade-guide.xml b/src/reference/upgrade-guide.xml
index c2627518..3fe9b078 100644
--- a/src/reference/upgrade-guide.xml
+++ b/src/reference/upgrade-guide.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Upgrading from 1.0</title>
 	<sect1 xml:id="upgrade-guide-introduction">
 		<title>Introduction</title>
@@ -125,9 +125,9 @@ java org.springframework.webflow.upgrade.WebFlowUpgrader flow-to-upgrade.xml
        xmlns:webflow="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+           https://www.springframework.org/schema/beans/spring-beans-4.0.xsd
            http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd">
+           https://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd">
 			]]></programlisting>
 			<sect3 xml:id="upgrade-guide-webflow-config-schema-executor">
 				<title>flow-executor</title>
@@ -202,7 +202,7 @@ java org.springframework.webflow.upgrade.WebFlowUpgrader flow-to-upgrade.xml
 			</para>
 			<para>
 				In order for version 1 flows to work in Web Flow 2 the default view resolver must be overridden.
-				A common use case is to use <link xl:href="http://tiles.apache.org/">Apache Tiles</link> for view resolution.
+				A common use case is to use <link xl:href="https://tiles.apache.org/">Apache Tiles</link> for view resolution.
 				The following configuration will replace the default view resolver with a Tiles view resolver.
 				The <code>tilesViewResolver</code> in this example can be replaced with any other view resolver.
 			</para>
diff --git a/src/reference/views.xml b/src/reference/views.xml
index 6ee6d5b7..b3aba795 100644
--- a/src/reference/views.xml
+++ b/src/reference/views.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>Rendering views</title>
 	<sect1 xml:id="views-introduction">
 		<title>Introduction</title>
@@ -183,7 +183,7 @@
 		<sect2 xml:id="converter-options">
 			<title>Type Conversion Options</title>
 			<para>
-				Starting with version 2.1 Spring Web Flow uses the <link xl:href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/validation.html#core-convert">type conversion</link> and <link xl:href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/validation.html#format">formatting</link> system introduced in Spring 3 for nearly all type conversion needs.
+				Starting with version 2.1 Spring Web Flow uses the <link xl:href="https://docs.spring.io/spring/docs/3.0.x/spring-framework-reference/html/validation.html#core-convert">type conversion</link> and <link xl:href="https://docs.spring.io/spring/docs/3.0.x/spring-framework-reference/html/validation.html#format">formatting</link> system introduced in Spring 3 for nearly all type conversion needs.
 				Previously Web Flow applications used a type conversion mechanism that was different from the one in Spring MVC, which relied on the <code>java.beans.PropertyEditor</code> abstraction.
 				Spring 3 offers a modern type conversion alternative to PropertyEditors that was actually influenced by Web Flow's own type conversion system.
 				Hence Web Flow users should find it natural to work with the new Spring 3 type conversion.
@@ -241,9 +241,9 @@ public class ApplicationConversionService extends DefaultConversionService {
     xmlns:mvc="http://www.springframework.org/schema/mvc"
     xsi:schemaLocation="
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
+        https://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+        https://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<mvc:annotation-driven/>
 ]]>
@@ -288,9 +288,9 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio
     xmlns:mvc="http://www.springframework.org/schema/mvc"
     xsi:schemaLocation="
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
+        https://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+        https://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
     <mvc:annotation-driven conversion-service="applicationConversionService" />
 
@@ -362,7 +362,7 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio
 				The <code>DateTimeFormat</code> annotation on the other hand provides more fine-grained control where it is necessary to deviate from the default.
 			</para>
 			<para>
-				For more information on working with Spring 3 type conversion and formatting please refer to the relevant sections of the <link xl:href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/index.html">Spring documentation</link>.
+				For more information on working with Spring 3 type conversion and formatting please refer to the relevant sections of the <link xl:href="https://docs.spring.io/spring/docs/3.0.x/spring-framework-reference/html/index.html">Spring documentation</link>.
 			</para>
 		</sect2>
 	</sect1>
diff --git a/src/reference/whatsnew.xml b/src/reference/whatsnew.xml
index e32453ed..66e25e64 100644
--- a/src/reference/whatsnew.xml
+++ b/src/reference/whatsnew.xml
@@ -5,8 +5,8 @@
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
-		http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+		http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd
+		http://www.w3.org/1999/xlink https://www.docbook.org/xml/5.0/xsd/xlink.xsd">
 	<title>What's New</title>
 	<sect1 xml:id="whatsnew-swf-240">
 		<title>Spring Web Flow 2.4</title>
@@ -240,7 +240,7 @@ mvn package
 					a replacement for the ResourcesServlet. Please see
 					the Spring Framework documentation for details on the custom mvc namespace,
 					specifically the new
-					<link xl:href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/mvc.html#mvc-static-resources">"resources"</link>
+					<link xl:href="https://docs.spring.io/spring/docs/3.0.x/spring-framework-reference/html/mvc.html#mvc-static-resources">"resources"</link>
 					element.
 				</para>
 			</sect3>