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 5a02dcb7..598692a8 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 be22671d..2761edea 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.xsd">
+           https://www.springframework.org/schema/faces/spring-faces.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 df387639..9db767b7 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.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.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 8246ff20..35a6f3e5 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.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.xsd">
+           https://www.springframework.org/schema/webflow-config/spring-webflow-config.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-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 8e845bbb..49949fd9 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.xsd">
+           https://www.springframework.org/schema/webflow-config/spring-webflow-config.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 3f09b46c..b50c1c21 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.xsd">
+           https://www.springframework.org/schema/webflow-config/spring-webflow-config.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 ea503b39..9b6fcd57 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.xsd">
+           https://www.springframework.org/schema/webflow-config/spring-webflow-config.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 55ad0937..746f6d0d 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 55ad0937..746f6d0d 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 55ad0937..746f6d0d 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 55ad0937..746f6d0d 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 c97b9b58..9378afe9 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 cb23e905..bb4cb787 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 eaa59d43..20fc249a 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 e5ec8994..d53f91ce 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 55ad0937..746f6d0d 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 1edb85f9..3bf3e5ab 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 174c860b..78a9b484 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.xsd">
+           https://www.springframework.org/schema/beans/spring-beans.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 c9847920..b4d2e102 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 6eb83baf..087fc4c0 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.xsd"
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 6fc7b8c8..3e068ad9 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 99a63b30..d56f2206 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 fe26ed46..12ba0b9f 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 6c750058..b1de6eb0 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 5c031fc7..3c631aa2 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 9cb4e9b5..bd9fe7f6 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 a8ba0fec..224c4f40 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 130c75c1..41454340 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 6fc7b8c8..3e068ad9 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 7975e797..3e472688 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 906e08a0..44bdbd90 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.xsd" start-state="end">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 55ad0937..746f6d0d 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 743ec30c..e15840ba 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 5c001493..9d055bce 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 29c6fa04..2f592297 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 7a0436aa..0674d33f 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 1a4bf613..52b46d62 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 747c5a53..11ed4597 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 12f27372..13c21f66 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 8643e044..566612b8 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 b61cebc1..3bc5a4c4 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 4c57daea..af349b5c 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 70e12d57..8cad20f2 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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 2098e1bd..5978ece5 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.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow https://www.springframework.org/schema/webflow/spring-webflow.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/spring-webflow/src/test/resources/org/springframework/webflow/mvc/view/tiles-definitions.xml b/spring-webflow/src/test/resources/org/springframework/webflow/mvc/view/tiles-definitions.xml
index 10c11de6..0cfee030 100644
--- a/spring-webflow/src/test/resources/org/springframework/webflow/mvc/view/tiles-definitions.xml
+++ b/spring-webflow/src/test/resources/org/springframework/webflow/mvc/view/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/src/reference/actions.xml b/src/reference/actions.xml
index 0a55dd7e..d70c877d 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.xsd">
+						  https://www.springframework.org/schema/webflow/spring-webflow.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.xsd">
+						  https://www.springframework.org/schema/webflow/spring-webflow.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.xsd">
+						  https://www.springframework.org/schema/webflow/spring-webflow.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 4bf83a0f..aa5ddb17 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.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow.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.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow.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.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow.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.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow.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.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow.xsd">
 
     <input name="hotelId" />
 
diff --git a/src/reference/el.xml b/src/reference/el.xml
index 4290d132..d79b2ce7 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>
-				Web Flow uses the <link xl:href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/expressions.html">Spring Expression Language</link> (Spring EL).
+				Web Flow uses the <link xl:href="https://docs.spring.io/spring/docs/current/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.
 			</para>
@@ -87,7 +87,7 @@
 		<sect2 xml:id="el-unified-el">
 			<title>Unified EL</title>
 			<para>
-				Use of <link xl:href="http://en.wikipedia.org/wiki/Unified_Expression_Language">Unified EL</link>
+				Use of <link xl:href="https://en.wikipedia.org/wiki/Unified_Expression_Language">Unified EL</link>
 				also implies a dependency on <code>el-api</code> although that is typically <emphasis>provided</emphasis>
 				by your web container.
 				Although Spring EL is the default and recommended expression language to use,
@@ -140,7 +140,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 f792b2ef..366a8f48 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.xsd">
+                          https://www.springframework.org/schema/webflow/spring-webflow.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 ccc75073..2d592c83 100644
--- a/src/reference/index.xml
+++ b/src/reference/index.xml
@@ -3,7 +3,7 @@
 	  xmlns="http://docbook.org/ns/docbook" version="5.0"
 	  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">
+	  xsi:schemaLocation="http://docbook.org/ns/docbook https://www.docbook.org/xml/5.0/xsd/docbook.xsd">
 
 	<info>
 		<title>Spring Web Flow Reference Guide</title>
diff --git a/src/reference/overview.xml b/src/reference/overview.xml
index e1f73135..89876d01 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>
@@ -87,7 +87,7 @@
 <repository>
     <id>spring</id>
     <name>Spring Repository</name>
-    <url>http://repo.spring.io/snapshot</url>
+    <url>https://repo.spring.io/snapshot</url>
 </repository>]]>
 			</programlisting>
 			<para>
diff --git a/src/reference/spring-faces.xml b/src/reference/spring-faces.xml
index 82c562a2..52476f4d 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">
@@ -96,11 +96,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.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.xsd
+		https://www.springframework.org/schema/webflow-config/spring-webflow-config.xsd
 		http://www.springframework.org/schema/faces
-		http://www.springframework.org/schema/faces/spring-faces.xsd"&gt;
+		https://www.springframework.org/schema/faces/spring-faces.xsd"&gt;
 
 	&lt;!-- Executes flows: the central entry point into the Spring Web Flow system --&gt;
 	&lt;webflow:flow-executor id="flowExecutor"&gt;
@@ -168,9 +168,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.xsd
+			 https://www.springframework.org/schema/beans/spring-beans.xsd
 			 http://www.springframework.org/schema/faces
-			 http://www.springframework.org/schema/faces/spring-faces.xsd"&gt;
+			 https://www.springframework.org/schema/faces/spring-faces.xsd"&gt;
 
 	&lt;faces:resources /&gt;
 
@@ -653,7 +653,7 @@ mvn package
 </context-param>]]>
 			</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>
 	</sect1>
 
@@ -671,7 +671,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;
@@ -712,7 +712,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"
@@ -736,7 +736,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 47acd4a9..7f0cb12d 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>
@@ -34,8 +34,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.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<mvc:annotation-driven/>
 
@@ -83,8 +83,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.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	...
 
diff --git a/src/reference/spring-mvc.xml b/src/reference/spring-mvc.xml
index feff802c..9a0baa13 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 933d066e..ff414556 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.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.xsd">
+           https://www.springframework.org/schema/webflow-config/spring-webflow-config.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/views.xml b/src/reference/views.xml
index 8e343ce5..abf977c3 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.xsd
+        https://www.springframework.org/schema/mvc/spring-mvc.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd">
+        https://www.springframework.org/schema/beans/spring-beans.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.xsd
+        https://www.springframework.org/schema/mvc/spring-mvc.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd">
+        https://www.springframework.org/schema/beans/spring-beans.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 7cbd3ecd..75d6b9d0 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-250">
@@ -256,7 +256,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>