diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
index 984f5ada7b..48da214eb4 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
index 4229180233..852f747937 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:advisor advice-ref="countingAdvice" pointcut="within(org.springframework..*)"/>
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml
index 8350030c17..ed04cb45e0 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:pointcut id="myPointcut" expression="within(org.springframework..*)"/>
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
index 23e4a88b3f..8300b28051 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:pointcut id="pc" expression="within(org.springframework..*)"/>
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
index cd01ffd532..1162d714f3 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
index 850fbc15d1..b47670e08d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests-context.xml
index 6c9e44b560..acaf0bb345 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests-context.xml
@@ -1,6 +1,6 @@
 <config xmlns="http://www.springframework.org/schema/aop"
 				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-				xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+				xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<pointcut id="testPointcut" expression="execution(* foo(..)) and within(springbank.dao.AccountDao+)"/>
 	<pointcut id="testPointcut1" expression="execution(* springbank.dao.AccountDao.foo(..))"/>
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests-context.xml
index 21d1eedb40..89b8d261d4 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
index 5f00163fb5..1bfd0c2814 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	Tests for throws advice.
diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml
index feecab3e9c..1da296ea62 100644
--- a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:aop="http://www.springframework.org/schema/aop"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+        http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <bean id="scoped" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire-candidate="false">
     <aop:scoped-proxy/>
diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml
index 445b50d064..c159f311fc 100644
--- a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:aop="http://www.springframework.org/schema/aop"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+        http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <bean id="scoped" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire-candidate="true">
     <aop:scoped-proxy/>
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
index cbd660d7fe..8b622ce8c9 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml
index 07e9e4d3d9..93bdd2916f 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+ <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
index 33f30be78c..25cef707e9 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
index f633c66d5b..ee25b19d32 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml
index 4b408a3410..1853c4cd56 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
index 10ef6a35ae..1807801655 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
index 961269efde..8089430ec9 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
index 992f2675d9..26c7ae764d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml
index e5f94b8992..6be707bf51 100644
--- a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml
+++ b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:aspectj-autoproxy/>
 
diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml
index bd6439bb54..e3364e97fe 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml
+++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<bean class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$WireArbitraryExistingPojo"
 			factory-method="aspectOf"/>
diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml
index b43254c066..8d9b96b78d 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml
+++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:spring-configured/>
 
diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/springConfigured.xml b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/springConfigured.xml
index 324f7c3b13..6e786b230e 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/springConfigured.xml
+++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/springConfigured.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:spring-configured/>
 
diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml b/spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
index 5650a370d2..09f887f16d 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
+++ b/spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
@@ -4,10 +4,10 @@
 	xmlns:aop="http://www.springframework.org/schema/aop"
 	xmlns:cache="http://www.springframework.org/schema/cache"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 
 
 	<!--
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml
index 0d08cdcb56..c923cc2a4d 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml
index 0dae03ee94..9f9553761b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml
@@ -2,7 +2,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-2.0.xsd">
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<bean id="a" class="java.lang.Object" />
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
index 71586ad8d3..1ac72d2e86 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml
index c5fa5b2858..4807313fed 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml
index 28f8d65277..a719385e9c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml
index c88fd668a3..8dceadf072 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml
index d87aaffc63..bbd84e286a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="fooFactory" class="org.springframework.beans.factory.FooFactoryBean"/>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-abstract.xml b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-abstract.xml
index e82ccdc59b..9bd5ca7c57 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-abstract.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-abstract.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-circular.xml b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-circular.xml
index 1c328aa8d4..18fef0b000 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-circular.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-circular.xml
@@ -2,7 +2,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-3.0.xsd">
+                       https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
    <bean id="bean1" class="org.springframework.beans.factory.FactoryBeanTests$PassThroughFactoryBean" primary="true">
       <constructor-arg value="org.springframework.beans.factory.FactoryBeanTests$BeanImpl1"/>
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml
index d9b583910e..a40ed35bb9 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml
index 13f328c373..9208915935 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans default-lazy-init="true">
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml
index 1058161049..0fd8fc88e3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: beans1.xml,v 1.3 2006/08/20 19:08:40 jhoeller Exp $ -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml
index a5167f6bfe..a9232cb027 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: beans2.xml,v 1.3 2006/08/20 19:08:40 jhoeller Exp $ -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml
index 17721213c8..28b811b08e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!-- We are only using one definition file for the purposes of this test, since we do not have multiple
 	classloaders available in the environment to allow combining multiple files of the same name, but
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/beans1.xml b/spring-beans/src/test/java/org/springframework/beans/factory/access/beans1.xml
index 1058161049..0fd8fc88e3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/access/beans1.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/access/beans1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: beans1.xml,v 1.3 2006/08/20 19:08:40 jhoeller Exp $ -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/beans2.xml b/spring-beans/src/test/java/org/springframework/beans/factory/access/beans2.xml
index a5167f6bfe..a9232cb027 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/access/beans2.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/access/beans2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: beans2.xml,v 1.3 2006/08/20 19:08:40 jhoeller Exp $ -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml
index 3e5e8fa5ae..8899ef770a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml
@@ -2,7 +2,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-2.5.xsd">
+                https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
     <bean id="resolver" class="org.springframework.beans.factory.annotation.CustomAutowireConfigurerTests$CustomResolver"/>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml
index 2e2d9fd435..c14569c7fa 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml
index 3f0b9e5fc6..3a7bc4f578 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 	
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
index 490aab8790..e054df28df 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml
index 1c1978456c..0ebd714e01 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	     xmlns:util="http://www.springframework.org/schema/util"
-	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+	     xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+           http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.0.xsd">
 
 	<bean id="usesScope" class="org.springframework.tests.sample.beans.TestBean" scope="myScope"/>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml
index c2cc486e9d..12b0968204 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
-				"http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+				"https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml b/spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml
index 3e9a6577b5..c8a0ab7549 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
@@ -64,7 +64,7 @@
   </bean>
 
   <bean id="setBean" class="org.springframework.beans.factory.support.BeanFactoryGenericsTests$UrlSet">
-    <property name="urlNames" value="http://www.springframework.org"/>
+    <property name="urlNames" value="https://www.springframework.org"/>
   </bean>
 
 </beans>
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/callbacks.xml b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/callbacks.xml
index 9a4917c5e9..8e604833e6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/callbacks.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/callbacks.xml
@@ -2,7 +2,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"
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd"
 	default-lazy-init="true">
 
 	<bean name="spring-init" class="org.springframework.beans.factory.support.security.support.InitBean"/>
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml
index 8e53cee293..f5f975bf7b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml
@@ -2,7 +2,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-3.1.xsd">
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name" value="topLevel"/>
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml
index 12a2fb0860..7bd11a9871 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml
@@ -2,7 +2,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-3.1.xsd">
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name" value="original"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml
index d6be7a4426..2749cd2338 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml
@@ -2,7 +2,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-3.1.xsd"
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 		default-autowire-candidates="foo*">
 
 	<bean id="fooRepository" class="java.lang.Object"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml
index 49e415572c..632d0356ce 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml
@@ -2,7 +2,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-3.1.xsd">
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="foo" class="java.lang.Object"/>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml
index 90c5495d7c..bc030754df 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml
@@ -2,7 +2,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-3.1.xsd"
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	default-init-method="initMethod1"
 	default-destroy-method="destroyMethod1">
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml
index 3c3df4abf0..78601ebf4b 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml
@@ -2,7 +2,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-3.1.xsd">
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<!-- lazy == false (based on default XSD values) -->
 	<bean id="foo" class="java.lang.Object"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml
index 2edadb511e..55a5cf04e7 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml
@@ -2,7 +2,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-3.1.xsd"
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 		default-merge="false">
 
 	<bean id="abstractTestBean" class="org.springframework.tests.sample.beans.TestBean" abstract="true">
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml
index 5500aeedae..8a44f25d79 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml
@@ -2,7 +2,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-3.1.xsd">
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="foo" class="java.lang.String"/>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml
index fbd09ae0fc..74c2c2ff94 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml
@@ -2,7 +2,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-3.1.xsd">
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<beans profile="custom-default">
 		<bean id="foo" class="java.lang.String"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml
index 5fbc741ec8..fcb24a4fda 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml
@@ -2,7 +2,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-3.1.xsd"
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="dev,default">
 		<!-- bean should be processed if dev OR no profile is defined -->
 		<bean id="foo" class="java.lang.String"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml
index a7d425abf1..ca8cbf4c80 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml
@@ -2,7 +2,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-3.1.xsd">
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<beans profile="default">
 		<bean id="foo" class="java.lang.String"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml
index 8ae82bc8cf..7f391e8b73 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml
@@ -2,7 +2,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-3.1.xsd"
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="dev">
 
 	<bean id="foo" class="java.lang.String"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml
index dac5fb9244..e3a36f29f5 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml
@@ -2,7 +2,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-3.1.xsd"
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="dev,prod">
 
 	<bean id="foo" class="java.lang.String"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml
index b0a246c4a2..f5820c54c0 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml
@@ -2,7 +2,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-3.1.xsd"
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="!dev,prod">
 
 	<bean id="foo" class="java.lang.String"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml
index 656ea3aceb..49a8c7abd1 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml
@@ -2,7 +2,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-3.1.xsd">
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="foo" class="java.lang.String"/>
 </beans>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml
index 06ac54a37a..9d18522623 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml
@@ -2,7 +2,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-3.1.xsd"
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="!dev">
 
 	<bean id="foo" class="java.lang.String"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml
index aba52d7066..879b23caee 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml
@@ -2,7 +2,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-3.1.xsd"
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="prod">
 
 	<bean id="foo" class="java.lang.String"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml
index 8bfb9a9813..3d50231027 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml
@@ -2,7 +2,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-3.1.xsd"
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="dev prod">
 
 	<bean id="foo" class="java.lang.String"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml
index 922ba29048..0b0dbcef6e 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml
@@ -2,7 +2,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-3.1.xsd"
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="unknown">
 
 	<bean id="foo" class="java.lang.String"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
index 2fcb117954..0b67be5d87 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
index a2e966aab9..37a98d0ce8 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
index 9b93a16810..b47d4231ce 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 		default-autowire-candidates="">
 
 	<bean id="rob" class="org.springframework.tests.sample.beans.TestBean" autowire="byType"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
index 089517cd42..5df4f9c21d 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 		default-autowire-candidates="props*,*ly">
 
 	<bean id="rob" class="org.springframework.tests.sample.beans.TestBean" autowire="byType"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
index 7e262a0a0d..8503d255ad 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans default-lazy-init="true" default-autowire="constructor" default-dependency-check="objects"
 		default-init-method="myInit" default-destroy-method="myDestroy" default-merge="true">
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml
index bdfc3c4c31..299c52abef 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml
index 813049d1a5..1f22caddff 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
index d8fc1db88e..b3a6142b54 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
index 73294dfbae..6543962d56 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
 	<bean id="jenny" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>Jenny</value></property>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
index 8a31ff8696..92d5d3db1d 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="someList">
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml
index 635df1adc8..1a1b12529c 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans default-init-method="init" default-destroy-method="destroy">
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
index ffcd3f7da9..52b6445664 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 	<bean id="default" class="org.springframework.beans.factory.xml.FactoryMethods"
 			factory-method="defaultInstance">
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml
index a10029da32..25ffd4262b 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans default-init-method="foo" default-destroy-method="bar">
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/import.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/import.xml
index 278e5dff81..44b1c8f1e9 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/import.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/import.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml
index 085a29d85f..329d25898e 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml
index 430c8adc7e..6715273a63 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<foobar/>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml
index 7802a4c935..5f22ea3cef 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<bean xml:lang="en" id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
index d961644301..29bfd18e13 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:c="http://www.springframework.org/schema/c"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
  <!-- 
 	<bean id="simple1" class="org.springframework.tests.sample.beans.DummyBean">
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml
index 1773a1c9c6..a0503125f5 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:p="http://www.springframework.org/schema/c"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="error" class="org.springframework.tests.sample.beans.TestBean" c:name="error-bean">
 		<constructor-arg name="name" value="error-bean"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml
index 8dd70708d3..c942c9db60 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml
@@ -4,9 +4,9 @@
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xmlns:tx="http://www.springframework.org/schema/tx"
 		xmlns:p="http://www.springframework.org/schema/p"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-				http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+				http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
 
 	<bean id="rob" class="org.springframework.tests.sample.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally">
 		<property name="age" value="24"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml
index 384171fdc0..a165d91bce 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml
@@ -4,9 +4,9 @@
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xmlns:tx="http://www.springframework.org/schema/tx"
 		xmlns:p="http://www.springframework.org/schema/p"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-				http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+				http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
 
 	<bean id="rob" class="org.springframework.tests.sample.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally">
 		<property name="name" value="Rob Harrop"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml
index 933e66b7d0..c8887fe86d 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
index 2b71bca48f..3a6ee2dd19 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:util="http://www.springframework.org/schema/util"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<util:constant id="min" static-field="
 			java.lang.Integer.
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml
index 3cca869dbf..a872ae9d23 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml
@@ -6,7 +6,7 @@ This is a top level block comment
 <!-- trying --> <!-- to trick --> <!--
 				the parser now --> <!-- <beans>
 				-->
-<!-- more trickery-->  <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd"><!-- some nasty stuff -->
+<!-- more trickery-->  <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd"><!-- some nasty stuff -->
 
 <beans>
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml
index 20aa0f5374..c7e8abe5a5 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml
@@ -6,6 +6,6 @@ This is a top level block comment
 <!-- trying --> <!-- to trick --> <!--
 				the parser now --> <!-- <beans>
 				-->
-<!-- more trickery--><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-2.0.xsd"><!-- end -->
+<!-- more trickery--><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 https://www.springframework.org/schema/beans/spring-beans-2.0.xsd"><!-- end -->
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
 </beans>
\ No newline at end of file
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml
index 05c47afa53..5126d25395 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml
@@ -2,7 +2,7 @@
 <spring:beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:spring="http://www.springframework.org/schema/beans"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<spring:bean id="testBean1" class="org.springframework.tests.sample.beans.TestBean">
 		<spring:meta key="foo" value="bar"/>
diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml
index f3fe1a38a2..52158e71d8 100644
--- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml
+++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="scheduler"
 		class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml
index d920043283..55f2e8c899 100644
--- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml
+++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml
@@ -1,7 +1,7 @@
-<quartz xmlns="http://www.opensymphony.com/quartz/JobSchedulingData"
+<quartz xmlns="https://www.opensymphony.com/quartz/JobSchedulingData"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://www.opensymphony.com/quartz/JobSchedulingData
-				http://www.opensymphony.com/quartz/xml/job_scheduling_data_1_5.xsd"
+		xsi:schemaLocation="https://www.opensymphony.com/quartz/JobSchedulingData
+				https://www.opensymphony.com/quartz/xml/job_scheduling_data_1_5.xsd"
 		version="1.5">
 
 	<job>
diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml
index 40f5a8d762..b950bcae89 100644
--- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml
+++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml
index 02d8f3668b..df9af20cd5 100644
--- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml
+++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml
index 1708cce9c7..ac2bdc3cba 100644
--- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml
+++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml
@@ -2,7 +2,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">
 
 	<bean id="lazyInitSchedulerWithDefaultShutdownOrder" class="org.springframework.scheduling.quartz.SchedulerFactoryBean" lazy-init="true"/>
 
diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml
index 0c4c9578b2..34ff380a0e 100644
--- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml
+++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml
index 46410a7cd3..cb6747e2bb 100644
--- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml
+++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
index 66d0e85228..a3616c2df3 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="afterAdviceBindingTests" ref="testAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
index 97c02b3452..214013f01a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="afterReturningAdviceBindingTests" ref="testAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
index 77dd0c3624..c163932819 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	
 	<aop:config>
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
index 2198e32f49..20a1703e86 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="beforeAdviceBindingTests" ref="testAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
index e00fa847a7..8ba7742ffa 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="beforeAdviceBindingTests" ref="testAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
index 038614eccf..4374e54d64 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			 xmlns:aop="http://www.springframework.org/schema/aop"
-			 xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+			 xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 	
 	<aop:config>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
index 9ec75d75aa..2c97c86436 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
index b446755d57..4d6537107f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:aspectj-autoproxy/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
index 42dafc3e90..a0a7414348 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="beanNameMatchingTest" ref="counterAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
index 4aac362c73..626fa5d4d1 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="beforeAdviceBindingTests" ref="testAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
index f1d0bdc21c..395b3e467b 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:aop="http://www.springframework.org/schema/aop"
-     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+     xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
   <bean id="topsyTurvyAspect" class="org.springframework.aop.aspectj.TopsyTurvyAspect"/>
   
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
index ee552093f9..9cde2bd2d4 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-	   		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	   		http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
 	<aop:config>
 		<aop:aspect id="testAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
index fc449b6943..c4c2e40b1a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-	   		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	   		http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="beforeAdviceBindingTests" ref="introduction">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
index c88962cd53..b416933ed5 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name" value="aTestBean"/>
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
index 6a4a56e7f0..77499508c0 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config proxy-target-class="true">
 		<aop:aspect ref="counterAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
index f8ca001d0d..46205f5d74 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	
 	<aop:config>
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
index 94725cb5e3..17ae0428a2 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	
 	<aop:config>
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml
index 8bb019245e..c2a5a18d81 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="aspectOne" ref="firstTestAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml
index d55ed2d65e..15ec58154d 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml
@@ -3,8 +3,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect ref="monitoringAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml
index 0ec75f5737..d8d1e4dc23 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml
@@ -3,8 +3,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<bean id="counter" class="org.springframework.aop.aspectj.Counter"/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml
index 6eccaebfab..6db71439a5 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml
@@ -3,8 +3,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:aspectj-autoproxy/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml
index 89b5be547c..9628565d7f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml
@@ -3,8 +3,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<bean id="counter" class="org.springframework.aop.aspectj.Counter"/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
index 1100db6b5a..a27342a207 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	
 	<aop:config>
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
index 6fb76c1b52..b00acce42e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	
 	<aop:config>
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml
index 1e57557518..5d488c328f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
index 98bf02616e..45aa92e1d6 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:aspectj-autoproxy proxy-target-class="false"/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
index 4d2cb3c4bb..14678cff0f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 
 	<aop:config>
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml
index 7e1b50d118..c943b18eb5 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="annotationBindingAspect" ref="testAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml
index 9d3daabadd..a7e8694861 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:advisor advice-ref="testInterceptor" pointcut-ref="myPointcut"/>
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
index 6490decb21..7d4edf9b6b 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect ref="interfaceExtendingAspect">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml
index c8e78fc5ca..c700cf5c88 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<bean class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator">
 		<property name="customTargetSourceCreators">
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
index da15419d11..06188230e7 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<!--
 	<bean class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator" />
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml
index 2b23fab302..ed1fb59f5f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml
index 88907c1b6c..5e75184ad9 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-2.0.xsd"
 	default-lazy-init="true">
 
 	<aop:aspectj-autoproxy/>
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml
index abf8f91b90..8abd5753e7 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
 
      
     <!--
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
index 53c2a50c66..58bd5aba38 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<!--
 	<bean class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator" />
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
index efb221722a..bff7e013c9 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml
index 25f545b542..55e1b88daa 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml
index 5c39c0186b..8db5fb7a53 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xmlns:tx="http://www.springframework.org/schema/tx"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-				http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+				http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
 
 	<aop:aspectj-autoproxy proxy-target-class="true"/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml
index e00377721c..11f5a3d99f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml
index 9505a844d7..fca2d09920 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml
index 16293b388e..fe8a05b633 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:aspectj-autoproxy>
 	  <aop:include name="aspectOne"/>
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml
index 462d8bcdc6..0acc4a49ab 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
index b35902d133..8b43b40fa7 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
 	<aop:aspectj-autoproxy/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml
index 28898d11fa..839897c0fd 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xmlns:tx="http://www.springframework.org/schema/tx"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-				http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+				http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
 	<aop:aspectj-autoproxy/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
index 759e4c8944..9d2bfb607f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
      
     <!--
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml
index 453d22ccaf..de10c8c773 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<!--
 	<bean class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator" />
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml
index f70a7a15c0..c098514947 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:aspectj-autoproxy/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml
index 3b53bf5064..4891f7b7a9 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="http://www.springframework.org/schema/beans"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:aspectj-autoproxy/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml
index 8e662cc333..f233ccb861 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="http://www.springframework.org/schema/beans"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:aspectj-autoproxy proxy-target-class="true"/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml
index 6297095d17..46f8ba82be 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="http://www.springframework.org/schema/beans"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:aspectj-autoproxy proxy-target-class="false"/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml
index 86431f56ce..066e7229e9 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="http://www.springframework.org/schema/beans"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:aspectj-autoproxy/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
index 7abc4287b7..15ec7150b4 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
index a68195265d..6865c0d461 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
index f2b1e06472..d2feb4cd1b 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
index 4e098059b5..5770f0c64d 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
index 855bda381c..ef6dab39ec 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
 
 	<aop:config proxy-target-class="true" expose-proxy="true">
 		<aop:pointcut id="getNameCalls" expression="execution(* getName(..)) and within(*..ITestBean+)"/>
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
index 9df36d7a38..47a168f1aa 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
index c923829099..48c4ef100a 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
index 5fc378d78f..bfb326cd73 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:pointcut id="getNameCalls" expression="execution(* getName(..)) and within(*..ITestBean+)"/>
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
index 1ddb6b9a00..c66b4ce4f7 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
index 051d281260..3f858a7256 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
diff --git a/spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml b/spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml
index b1327c8bdb..5da48059fa 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<bean id="service" class="org.springframework.tests.sample.beans.TestBean" scope="prototype"/>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml
index 1994ce2028..8c2ce9a54b 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans default-dependency-check="all">
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
index 3cda6a7921..fd417d6262 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
index 7675fe6e0e..acd5111a2e 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
index dde1f91017..46acd03046 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	Tests for misconfiguring the proxy factory bean using a target source in the
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
index d0f5a89896..841efdf3ab 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
index e59244c49c..4318d669f7 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	Test that inner bean for target means that we can use
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml
index fd46c5552f..6f0de72edf 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
index 47cd14f94d..847e2ef014 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	Tests for misconfiguring the proxy factory bean using a target source in the
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
index 291385ce50..c24e5dd51c 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	Tests for independent prototype behavior.
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
index 396bfada12..1895bb3108 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	Tests for independent prototype behaviour.
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
index 07f2825c1f..c6eff47a93 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	Tests for independent prototype behaviour.
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
index 036dac321f..581e650d68 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	Tests for throws advice.
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
index a58e040b67..b8b1cfda8c 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
index 69bd476f3b..182e560154 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
index c64c7e6ef7..47e44b984f 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	Shows common interceptor along with advisor.
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml
index 0dbe5be5fb..5e09491819 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml
index a83a9842b2..1c5a1569d2 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml
index 4600ffd4a4..de33aa06b7 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
index d53272f0d5..98b112baac 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
index c9727ea856..2c390607f2 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-list.xml b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-list.xml
index 8541f002f2..6794fd8ba2 100644
--- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-list.xml
+++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-list.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<bean id="scopedList" class="java.util.ArrayList" scope="request">
 		<aop:scoped-proxy/>
diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-map.xml b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-map.xml
index 0c69a3f9cc..e335461be3 100644
--- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-map.xml
+++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-map.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<bean id="singletonMap" class="java.util.Collections" factory-method="singletonMap" scope="prototype">
 		<aop:scoped-proxy/>
diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-override.xml b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-override.xml
index 98587609b1..a1d8195d3a 100644
--- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-override.xml
+++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-override.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean" scope="request">
     <aop:scoped-proxy proxy-target-class="false"/>
diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-testbean.xml b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-testbean.xml
index f7ab67d107..75888861a0 100644
--- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-testbean.xml
+++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-testbean.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests-context.xml b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests-context.xml
index 298ae976fe..5df2325253 100644
--- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 	
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
index 9eaf910d08..203dc4233f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 	
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
index 2f7db21056..d27a0e3729 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:annotation-config/>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml
index 43510574ba..b47411efe7 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
index fc90f7905c..4fcc128074 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml
index 58738edd74..97ba826e9f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
-		"http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+		"https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 <beans>
 
 	<bean id="classNotFound" class="WhatALotOfRubbish"/>
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml
index 7729dbc788..c8c8da8b62 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="jenny" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>Jenny</value></property>
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
index 8370424f73..d446aaa8ec 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
index d500c48881..835b3d563b 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 	<bean id="rod1" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean">
 		<constructor-arg><ref bean="kerry2"/></constructor-arg>
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
index d703fddd21..6f928b9873 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml
index 3815538559..0e3eb51142 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans default-autowire="byType" default-dependency-check="objects">
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml
index 3451c1b37c..fc927edbaf 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans default-lazy-init="true">
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
index 10ae8ae09f..9b22b34b33 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<!--
 		Not yet in use: illustration of possible approach
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml
index 89b6f142db..9a8d80542d 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml
index b05465fec7..50e13257e4 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml
index e8754f4c87..006d2f1e8e 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml
index dd06299f4c..413c4ca206 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml
index cffa6d766d..429751e7bc 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml
index 0edee0888e..9dee51a45f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml
index 67f73e2944..7ac55f0cf2 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml
index a51b221ec5..32386439e8 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml
index cfc11301c7..2854aa80e5 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml
index 92968cf72b..1306bf0eba 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml
index d4100fbd1e..2ce58c86b0 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml
index 86da8d595d..eb01584dba 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml
index 0628149017..fb146c2171 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml
index 41ef4c71ec..9955d05d51 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
index cd232df3c0..6dacd2f6b7 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
index 2e49f71a54..8e974bf588 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	     xmlns:util="http://www.springframework.org/schema/util"
-	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+	     xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+           http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.0.xsd">
 
 	<!-- just ensures that one can use <ref local=""/> to refer to the various <util:collections/> types -->
 	
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml
index 251459cf61..0d21d35fa1 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
index 0a92c7426d..733efb6463 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "https://www.springframework.org/dtd/spring-beans.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml
index f575bcb44a..8903bb169d 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml
index c4383ad945..cd1aba69d2 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "https://www.springframework.org/dtd/spring-beans.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
index 9eb0813411..7ed135855f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "https://www.springframework.org/dtd/spring-beans.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml
index 31fa7a16ba..92e233b532 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
index daa269998e..6e202500f3 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
index 65fbd833c9..bb19259074 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml
index 9088b962e0..e3e115aef8 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml
index 393028d4f1..7cf4c96afb 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml
index 90de544437..45463198c7 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
index a771266aa9..959972152f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
index 8cd2e72569..12dc8336c7 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml
index a96c4d303d..90be0f13cf 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml
index 4968b12b3a..f151082e9b 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml
index 17c9c7e8f5..46f6111b93 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml
@@ -3,9 +3,9 @@
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:test="http://www.springframework.org/schema/beans/test"
 	   xmlns:util="http://www.springframework.org/schema/util"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
-       http://www.springframework.org/schema/beans/test http://www.springframework.org/schema/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.0.xsd
+       http://www.springframework.org/schema/beans/test https://www.springframework.org/schema/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd"
 	default-lazy-init="true">
 
 	<test:testBean id="testBean" name="Rob Harrop" age="23"/>
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml
index 81770ea423..90b0259256 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="jenny" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>Jenny</value></property>
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml
index 99d732a164..da5e835b8d 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml
index 929f26c0d7..22267a2cfd 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!-- We are only using one definition file for the purposes of this test, since we do not have multiple
 	classloaders available in the environment to allow combining multiple files of the same name, but
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml
index 7033e5517d..4ece947608 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-	                    http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+	                    https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
 	                    http://www.springframework.org/schema/context
-	                    http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+	                    https://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
 	<bean id="x1"
 	      class="org.springframework.context.annotation.DestroyMethodInferenceTests$WithLocalCloseMethod"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml
index d5d5137164..453fa97f82 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
 	<context:load-time-weaver weaver-class="org.springframework.instrument.classloading.SimpleLoadTimeWeaver"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml
index a6eb150f46..69ff95faa4 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="foo" class="org.springframework.context.annotation.Spr6602Tests$Foo">
 		<constructor-arg ref="barFactory" />
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTests.xml
index e352102048..a9f5a7d6d4 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="example.scannable" use-default-filters="false" annotation-config="false">
         <context:include-filter type="aspectj" expression="example.scannable.Stub*"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml
index a35ea02543..c58935a1e0 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans
-				http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+				https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 				http://www.springframework.org/schema/context
-				http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+				https://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<context:component-scan base-package="example.profilescan"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml
index 85bcd70173..a910e1161a 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
 		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
 				http://www.springframework.org/schema/context
-				http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+				https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<bean id="fooService" class="example.scannable.AutowiredQualifierFooService"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml
index e0c4ef6ea2..e19f9058d4 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:util="http://www.springframework.org/schema/util">
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml
index 0445566bde..2ea3203d33 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"
 	xmlns:context="http://www.springframework.org/schema/context">
 
 	<context:annotation-config/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml
index 344716316f..490afb34f4 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="xmlDeclaredBean" class="org.springframework.tests.sample.beans.TestBean">
 		<constructor-arg value="xml.declared"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
index 1b95433a63..d8bccf2a9b 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="proxiedXmlBean" class="org.springframework.tests.sample.beans.TestBean"/>
 	
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml
index 45fc0475ef..78d050be7e 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="secondLevelXmlDeclaredBean" class="java.lang.Object"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml
index 1446273e6d..60fff9b2df 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"
 	xmlns:context="http://www.springframework.org/schema/context">
 
 	<context:annotation-config/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/annotation-config.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/annotation-config.xml
index 2a424dcbd6..5eb5fc1364 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/annotation-config.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/annotation-config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"
 	xmlns:context="http://www.springframework.org/schema/context">
 
 	<context:annotation-config/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml
index 09e835f0c6..e0229337cb 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"
 	xmlns:context="http://www.springframework.org/schema/context">
 
 	<aop:aspectj-autoproxy proxy-target-class="true"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml
index 922aca4bdd..2a679cbb6e 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
 		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
 				http://www.springframework.org/schema/context
-				http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+				https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="org.springframework.context.annotation" use-default-filters="false">
 		<context:include-filter type="annotation" expression="org.springframework.context.annotation.ComponentScanParserTests$CustomAnnotation"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/customNameGeneratorTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/customNameGeneratorTests.xml
index 1451dae93d..c6215b7d6d 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/customNameGeneratorTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/customNameGeneratorTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="test, example.scannable"
 	    name-generator="org.springframework.context.annotation.TestBeanNameGenerator"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/customScopeResolverTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/customScopeResolverTests.xml
index df20982b67..32ca89d400 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/customScopeResolverTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/customScopeResolverTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="example.scannable"
 	    scope-resolver="org.springframework.context.annotation.TestScopeMetadataResolver"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/customTypeFilterTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/customTypeFilterTests.xml
index f8c1351fe5..6181d2151f 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/customTypeFilterTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/customTypeFilterTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
 		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
 				http://www.springframework.org/schema/context
-				http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+				https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="org.springframework.context.annotation" use-default-filters="false">
 		<context:include-filter type="custom" expression="org.springframework.context.annotation.ComponentScanParserTests$CustomTypeFilter"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByNameTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByNameTests.xml
index ea5fd0061c..a362923ede 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByNameTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByNameTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				            http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd"
         default-autowire="byName">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByTypeTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByTypeTests.xml
index 03dc019f40..405f0182f2 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByTypeTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByTypeTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				            http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd"
         default-autowire="byType">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireConstructorTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireConstructorTests.xml
index 4431641a7e..45b16bac1f 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireConstructorTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireConstructorTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				            http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd"
         default-autowire="constructor">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireNoTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireNoTests.xml
index cd7930f690..f756168c3d 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireNoTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireNoTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				            http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd"
         default-autowire="no">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml
index 46cbe2adb7..8c2909631b 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				            http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd"
         default-dependency-check="all">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml
index 505cb3b4b4..bb038edfc9 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				            http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd"
         default-dependency-check="objects"
         default-autowire="byName">
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml
index de592f96ee..e74eca9d51 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+        http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd"
     default-init-method="init" default-destroy-method="destroy">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitFalseTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitFalseTests.xml
index b16bae4cda..1c062cf8ce 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitFalseTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitFalseTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				            http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd"
         default-lazy-init="false">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitTrueTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitTrueTests.xml
index ed11edfa2b..39e408dd86 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitTrueTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitTrueTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				            http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd"
         default-lazy-init="true">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml
index eca6cd8cf8..3107e6aa2f 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+        http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd"
     default-init-method="myInit" default-destroy-method="myDestroy">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultWithNoOverridesTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/defaultWithNoOverridesTests.xml
index adfc3aa442..0a635bcb3c 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/defaultWithNoOverridesTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/defaultWithNoOverridesTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				            http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
             use-default-filters="false"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml
index eb44cc0cf0..2bff6fd4d1 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="example.scannable"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml
index d4f509b4be..9980545bea 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
 	    scope-resolver="not.a.valid.classname"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml
index 3bde5e6ac5..c8a40567b9 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
 	    name-generator="org.springframework.context.annotation.InvalidConstructorBeanNameGenerator"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/matchingResourcePatternTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/matchingResourcePatternTests.xml
index 02a949a8d4..491994286d 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/matchingResourcePatternTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/matchingResourcePatternTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="example."
                             resource-pattern="**/scannable/*.class"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml
index 1600695a65..5b4ea6e6ca 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="org.springframework."
                             resource-pattern="**/thispackagedoesnotexist/*.class"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyDefaultTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyDefaultTests.xml
index 83a1154190..2bce1ac9c6 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyDefaultTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyDefaultTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="example.scannable" use-default-filters="false">
 		<context:include-filter type="assignable" expression="example.scannable.ScopedProxyTestBean"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInterfacesTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInterfacesTests.xml
index 69e21adc92..e9d15faaec 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInterfacesTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInterfacesTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="example.scannable" use-default-filters="false" scoped-proxy="interfaces">
 		<context:include-filter type="assignable" expression="example.scannable.ScopedProxyTestBean"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml
index 5dd54e68e9..d06d20fd54 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="org.springframework.context.annotation"
 			use-default-filters="false" scoped-proxy="interfaces"
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyNoTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyNoTests.xml
index cb79e0f0a5..1b4ce15969 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyNoTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyNoTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="example.scannable"
 			use-default-filters="false" scoped-proxy="no">
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyTargetClassTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyTargetClassTests.xml
index 7d11182142..79bebe369d 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyTargetClassTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyTargetClassTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="example.scannable" use-default-filters="false" scoped-proxy="targetClass">
 		<context:include-filter type="assignable" expression="example.scannable.ScopedProxyTestBean"/>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml
index 46ad2980a4..f0229b6c29 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:annotation-config/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml b/spring-context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml
index ec67462481..81d8e7a9dc 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:component-scan base-package="example.scannable"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/importedResource.xml b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/importedResource.xml
index 6ce3074b51..78e61477c2 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/importedResource.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/importedResource.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:c="http://www.springframework.org/schema/c"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="myBean" class="java.lang.String" c:_0="myBean"/>
 </beans>
diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
index 6c95987712..a6ca7e9818 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 	<import resource="ClassPathXmlApplicationContextTests-resourceIm*.xml"/> 
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml
index 232374bd0e..442a334c42 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml b/spring-context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml
index 851e41b1bb..5420411cf8 100644
--- a/spring-context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 	<bean id="testBean" class="java.lang.Object"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/aliasForParent.xml b/spring-context/src/test/java/org/springframework/context/support/aliasForParent.xml
index 3f66e03499..423ac8efc7 100644
--- a/spring-context/src/test/java/org/springframework/context/support/aliasForParent.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/aliasForParent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml b/spring-context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml
index 8ab5e584a4..89ec37154b 100644
--- a/spring-context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/childWithProxy.xml b/spring-context/src/test/java/org/springframework/context/support/childWithProxy.xml
index 506907208f..2f818aa759 100644
--- a/spring-context/src/test/java/org/springframework/context/support/childWithProxy.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/childWithProxy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml b/spring-context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml
index e2dcc3fff1..829b40947c 100644
--- a/spring-context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/conversionService.xml b/spring-context/src/test/java/org/springframework/context/support/conversionService.xml
index bcfae1cdb5..97570ac2d0 100644
--- a/spring-context/src/test/java/org/springframework/context/support/conversionService.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/conversionService.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml b/spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml
index 5ddcbab67d..848dfbf496 100644
--- a/spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/invalidClass.xml b/spring-context/src/test/java/org/springframework/context/support/invalidClass.xml
index 3e7509aec7..0b87e24f0e 100644
--- a/spring-context/src/test/java/org/springframework/context/support/invalidClass.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/invalidClass.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/invalidValueType.xml b/spring-context/src/test/java/org/springframework/context/support/invalidValueType.xml
index 6a07f13fba..544451eefb 100644
--- a/spring-context/src/test/java/org/springframework/context/support/invalidValueType.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/invalidValueType.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/lifecycleTests.xml b/spring-context/src/test/java/org/springframework/context/support/lifecycleTests.xml
index f38a0d3d74..4b4b450def 100644
--- a/spring-context/src/test/java/org/springframework/context/support/lifecycleTests.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/lifecycleTests.xml
@@ -2,7 +2,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-2.0.xsd">
+        https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <bean id="bean4" class="org.springframework.context.support.LifecycleTestBean" depends-on="bean2"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/simpleContext.xml b/spring-context/src/test/java/org/springframework/context/support/simpleContext.xml
index c32ed74147..133d5c30c6 100644
--- a/spring-context/src/test/java/org/springframework/context/support/simpleContext.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/simpleContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/spr7283.xml b/spring-context/src/test/java/org/springframework/context/support/spr7283.xml
index df0a26a773..71a393a667 100644
--- a/spring-context/src/test/java/org/springframework/context/support/spr7283.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/spr7283.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.0.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
 	<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/spr7816.xml b/spring-context/src/test/java/org/springframework/context/support/spr7816.xml
index 4c399578a8..9882e9aace 100644
--- a/spring-context/src/test/java/org/springframework/context/support/spr7816.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/spr7816.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml b/spring-context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml
index 3c46c30820..1493fbfde4 100644
--- a/spring-context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:property-placeholder location="org/springframework/context/support/placeholder.properties"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/test/contextA.xml b/spring-context/src/test/java/org/springframework/context/support/test/contextA.xml
index 203e7a61c6..20b2eb97b0 100644
--- a/spring-context/src/test/java/org/springframework/context/support/test/contextA.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/test/contextA.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<import resource="import1.xml"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/test/contextB.xml b/spring-context/src/test/java/org/springframework/context/support/test/contextB.xml
index 261ce0698b..25b0def95d 100644
--- a/spring-context/src/test/java/org/springframework/context/support/test/contextB.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/test/contextB.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/test/contextC.xml b/spring-context/src/test/java/org/springframework/context/support/test/contextC.xml
index c1abb93e2a..7a40c61422 100644
--- a/spring-context/src/test/java/org/springframework/context/support/test/contextC.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/test/contextC.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:property-placeholder location="org/springframework/context/support/placeholder.properties"/>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/test/import1.xml b/spring-context/src/test/java/org/springframework/context/support/test/import1.xml
index f49285b811..9d647df8bb 100644
--- a/spring-context/src/test/java/org/springframework/context/support/test/import1.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/test/import1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/test/subtest/import2.xml b/spring-context/src/test/java/org/springframework/context/support/test/subtest/import2.xml
index 74b2f73fd2..35afe2a144 100644
--- a/spring-context/src/test/java/org/springframework/context/support/test/subtest/import2.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/test/subtest/import2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml b/spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
index e8767251a9..26d6ea15b7 100644
--- a/spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
+++ b/spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:util="http://www.springframework.org/schema/util"
 		xmlns:jee="http://www.springframework.org/schema/jee"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
-				http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+				http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.1.xsd
+				http://www.springframework.org/schema/jee https://www.springframework.org/schema/jee/spring-jee-3.1.xsd"
 		default-lazy-init="true">
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
diff --git a/spring-context/src/test/java/org/springframework/jmx/applicationContext.xml b/spring-context/src/test/java/org/springframework/jmx/applicationContext.xml
index d9a4d10cc7..e59e1588c0 100644
--- a/spring-context/src/test/java/org/springframework/jmx/applicationContext.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/applicationContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml b/spring-context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml
index c9c15cf771..8d79cf66b9 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml b/spring-context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml
index c4161779fa..2d2dd2df40 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:mbean-export server="server" />
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml b/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml
index c11ca5fc82..7359d87ba4 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:mbean-export server="server" registration="replaceExisting"/>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml b/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml
index 15f14a8664..79651d11a7 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:mbean-export server="server"/>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml
index 0e0ca9a6f3..dc5d5693ab 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml
index 5246986ac0..3a5e521fa3 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml
index 1d8df62050..ccebaf523a 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml
index c90c5284c2..7324a234e5 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml
index c43e200a59..ec6a2a85b5 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml
index 5a4c3585a7..1c74cdf847 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml
index b2fb253684..6618f94ad3 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml
index 16f4290a8f..6c765a2f83 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml
index 7dcf380c52..b67ba36e68 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml
index 20554a2a31..97c86e2991 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml
index 98944a9984..4ca363d2a1 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml b/spring-context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml
index e61a8eb0ad..56edce43cf 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 <beans>
 	<bean class="org.springframework.jmx.export.MBeanExporter" autowire="byName">
 		<property name="beans">
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml b/spring-context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml
index 960a57b12c..6d2ffa9c35 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+ <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml b/spring-context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml
index d028b5274c..d144dc4a34 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+ <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml b/spring-context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml
index 66c6033611..e569169019 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+ <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/customConfigurer.xml b/spring-context/src/test/java/org/springframework/jmx/export/customConfigurer.xml
index dea76ccada..9ebfeef9e4 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/customConfigurer.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/customConfigurer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+ <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/excludedBeans.xml b/spring-context/src/test/java/org/springframework/jmx/export/excludedBeans.xml
index 6dc3aba71f..b8ae29d15d 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/excludedBeans.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/excludedBeans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+ <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/lazyInit.xml b/spring-context/src/test/java/org/springframework/jmx/export/lazyInit.xml
index ddc1fb1da8..7b5b8b803c 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/lazyInit.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/lazyInit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml b/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml
index 9489f7bfe1..2a3513a954 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml b/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml
index 459820c27d..8b8699a8e2 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml b/spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
index 79790d3963..96f633058e 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml b/spring-context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml
index 2dc689973c..971658e21a 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
 		xmlns:task="http://www.springframework.org/schema/task"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-				http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.0.xsd
+				http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task-3.0.xsd">
 
 	<!--
 	<context:load-time-weaver aspectj-weaving="on"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml b/spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
index 116a7d6ab4..19b2a80309 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:lang="http://www.springframework.org/schema/lang"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-				http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+				http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
 
 	<lang:bsh id="messenger" script-source="classpath:org/springframework/scripting/bsh/Messenger.bsh"
 			script-interfaces="org.springframework.scripting.Messenger"
diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml b/spring-context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml
index ffa602cfdd..2f17aae234 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
-				"http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+				"https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 	<bean class="org.springframework.scripting.support.ScriptFactoryPostProcessor"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/bshContext.xml b/spring-context/src/test/java/org/springframework/scripting/bsh/bshContext.xml
index 27f6378f98..75479b902f 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/bshContext.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/bshContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans default-lazy-init="true">
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml b/spring-context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml
index a536596022..be11d75434 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans default-lazy-init="true">
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml
index f914df2882..8823202eac 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml
@@ -5,9 +5,9 @@
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:p="http://www.springframework.org/schema/p"
        xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+						http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+						http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 
     <aop:config >
        <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml
index cfad97c778..d377e5b7ee 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml
@@ -5,9 +5,9 @@
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:p="http://www.springframework.org/schema/p"
        xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+						http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+						http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 
     <aop:config >
        <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml
index 66be80b2a8..fcb066f956 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml
@@ -5,9 +5,9 @@
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:p="http://www.springframework.org/schema/p"
        xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+						http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+						http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 
     <aop:config >
        <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml
index 7d0a1dc816..f239a40ea3 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml
@@ -5,9 +5,9 @@
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:p="http://www.springframework.org/schema/p"
        xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+						http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+						http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 
     <aop:config >
        <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml
index 8c90f9b267..bbb09df7ce 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:lang="http://www.springframework.org/schema/lang"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
 	
 	<lang:groovy id="calculator" 
 		script-source="classpath:org/springframework/scripting/groovy/Calculator.groovy"
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/calculators.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/calculators.xml
index b936acc96e..5d540e4dfc 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/calculators.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/calculators.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
index eaad85d1f8..e33a7723e2 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:lang="http://www.springframework.org/schema/lang"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
 
 	<lang:groovy id="bean" script-source="classpath:org/springframework/scripting/groovy/ScriptBean.groovy" autowire="byType" dependency-check="all">
 		<lang:property name="name" value="Sophie Marceau"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml
index 973b317a16..aa5f0c845f 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
 	xmlns:lang="http://www.springframework.org/schema/lang"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-				http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+				http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-3.1.xsd">
 
 	<lang:groovy id="refreshableMessenger" refresh-check-delay="5000" proxy-target-class="true"
 		script-source="classpath:org/springframework/scripting/groovy/Messenger.groovy">
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml
index 8de3522ab6..2ba7aab3c7 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xmlns:lang="http://www.springframework.org/schema/lang"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-				http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+				http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
 
 	<aop:config>
 		<aop:aspect ref="getMessageAspect">
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml
index e8e17e1b29..bc4eb22db9 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
-				"http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+				"https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 	<bean class="org.springframework.scripting.support.ScriptFactoryPostProcessor"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml
index a159b1791e..bdb52852b7 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:lang="http://www.springframework.org/schema/lang"
 		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/lang
-				http://www.springframework.org/schema/lang/spring-lang.xsd"
+				https://www.springframework.org/schema/lang/spring-lang.xsd"
  		default-lazy-init="true">
 
 	<bean class="org.springframework.scripting.support.ScriptFactoryPostProcessor"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml
index 34c8b401d1..1728779b5f 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans default-lazy-init="true">
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml
index 7083ecf7b7..4f575678e5 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
 	xmlns:lang="http://www.springframework.org/schema/lang"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-				http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+				http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-3.1.xsd">
 				
 	<lang:defaults  proxy-target-class="true"/>
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
index 2d5692534d..3394b3df20 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 <beans>
 
 	<bean class="org.springframework.scripting.support.ScriptFactoryPostProcessor"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
index b32cc8294f..15e6c7a972 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 <beans>
 
 	<bean class="org.springframework.scripting.support.ScriptFactoryPostProcessor"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
index c3b4e80f16..8c608b9215 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 <beans>
 
 	<bean class="org.springframework.scripting.support.ScriptFactoryPostProcessor"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml
index 1516ac2dbc..19b25fb709 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml
index 2cd55ee7df..484b0e81bb 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml
index 6fa5b5b64f..c249edf1df 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml
@@ -4,9 +4,9 @@
 	   xmlns:lang="http://www.springframework.org/schema/lang"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
 	   xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.0.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-2.0.xsd
+http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<lang:jruby id="messenger"
 				script-interfaces="org.springframework.scripting.Messenger"
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
index 5df3894c08..71866567e3 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:lang="http://www.springframework.org/schema/lang"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
 
 	<lang:jruby id="messenger"
 			script-source="classpath:org/springframework/scripting/jruby/Messenger.rb"
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml
index 947cf0d821..5e823d0473 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
-				"http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+				"https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 	<bean class="org.springframework.scripting.support.ScriptFactoryPostProcessor"/>
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml
index 11f4fb56f0..88dac33825 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml
index 06b4e73ab5..99fc9c926d 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml
index f4ed0d736d..2f1b287c68 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml
index 2b9c694a38..949c03a85a 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/groovyReferences.xml b/spring-context/src/test/java/org/springframework/scripting/support/groovyReferences.xml
index 20bc7ee8c9..bd69d24953 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/groovyReferences.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/support/groovyReferences.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml
index 3982b48c7c..5af5cddf68 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:p="http://www.springframework.org/schema/p"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="foo" class="org.springframework.tests.sample.beans.TestBean" p:name="Baz"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
index 104a3fbb17..7e214f7e68 100644
--- a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
+++ b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
@@ -3,9 +3,9 @@
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:p="http://www.springframework.org/schema/p"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
-       		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-       		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd 
+       		http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+       		http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
 
 	<bean id="apc" class="org.springframework.aop.framework.autoproxy.InfrastructureAdvisorAutoProxyCreator"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
index 105a003504..9195caed73 100644
--- a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
+++ b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
@@ -3,9 +3,9 @@
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:cache="http://www.springframework.org/schema/cache"
        xmlns:p="http://www.springframework.org/schema/p"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
-       		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-       		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd 
+       		http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+       		http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd">
 
 	<cache:annotation-driven proxy-target-class="false" order="0" key-generator="keyGenerator"/>
 		
diff --git a/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml b/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml
index 5ebf54ddcb..adfbf1bfca 100644
--- a/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml
+++ b/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml
@@ -3,9 +3,9 @@
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:cache="http://www.springframework.org/schema/cache"
        xmlns:p="http://www.springframework.org/schema/p"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-       		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+       		http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+       		http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd">
 
 	<cache:advice id="cacheAdviceInterface" cache-manager="cacheManager">
 		<cache:caching cache="default">
diff --git a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml
index 1b4f07e110..268d1f6b7c 100644
--- a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml
+++ b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.0.xsd
+				http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<context:property-placeholder
 			location="classpath*:/org/springframework/context/config/test-*.properties,classpath*:/org/springframework/context/config/empty-*.properties,classpath*:/org/springframework/context/config/missing-*.properties"
diff --git a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-override.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-override.xml
index 647e08ff9b..a2f0278156 100644
--- a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-override.xml
+++ b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-override.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:context="http://www.springframework.org/schema/context"
-	   xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+	   xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd
+				http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<util:properties id="overrideProps">
 		<prop key="date.minutes">42</prop>
diff --git a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace-ignore.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace-ignore.xml
index 4714c36217..bc56ea27f9 100644
--- a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace-ignore.xml
+++ b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace-ignore.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:context="http://www.springframework.org/schema/context"
-	   xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+	   xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd
+				http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<util:properties id="placeholderProps">
 		<prop key="foo">bar</prop>
diff --git a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace.xml
index 92161968f7..9c6d940f0e 100644
--- a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace.xml
+++ b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:context="http://www.springframework.org/schema/context"
-	   xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+	   xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd
+				http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<util:properties id="placeholderProps">
 		<prop key="foo">bar</prop>
diff --git a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-simple.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-simple.xml
index a0b3eaf779..af58d0d989 100644
--- a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-simple.xml
+++ b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-simple.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd
+				http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<context:property-placeholder/>
 
diff --git a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-system.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-system.xml
index d5268c52bc..722aa0d2e1 100644
--- a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-system.xml
+++ b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-system.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd
+				http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<util:properties id="placeholderProps">
 		<prop key="foo">bar</prop>
diff --git a/spring-context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml b/spring-context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml
index f4c856877f..6dd88150ff 100644
--- a/spring-context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml
+++ b/spring-context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:context="http://www.springframework.org/schema/context"
-	   xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+	   xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.0.xsd
+				http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
 	<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
 		<property name="converters">
diff --git a/spring-context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml b/spring-context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml
index efb31d0297..54cb8595af 100644
--- a/spring-context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml
+++ b/spring-context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml
@@ -2,7 +2,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-2.5.xsd">
+                https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
 		<property name="scopes">
diff --git a/spring-context/src/test/resources/org/springframework/scheduling/config/annotationDrivenContext.xml b/spring-context/src/test/resources/org/springframework/scheduling/config/annotationDrivenContext.xml
index 72ca66bf39..894de8a6d1 100644
--- a/spring-context/src/test/resources/org/springframework/scheduling/config/annotationDrivenContext.xml
+++ b/spring-context/src/test/resources/org/springframework/scheduling/config/annotationDrivenContext.xml
@@ -3,9 +3,9 @@
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:task="http://www.springframework.org/schema/task"
 	   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/task
-				http://www.springframework.org/schema/task/spring-task.xsd">
+				https://www.springframework.org/schema/task/spring-task.xsd">
 
 	<task:annotation-driven executor="testExecutor" scheduler="testScheduler"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/scheduling/config/executorContext.xml b/spring-context/src/test/resources/org/springframework/scheduling/config/executorContext.xml
index 2aad933fa0..67c401d332 100644
--- a/spring-context/src/test/resources/org/springframework/scheduling/config/executorContext.xml
+++ b/spring-context/src/test/resources/org/springframework/scheduling/config/executorContext.xml
@@ -4,10 +4,10 @@
 	xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd"
 	default-lazy-init="true">
 
 	<task:executor id="default"/>
diff --git a/spring-context/src/test/resources/org/springframework/scheduling/config/lazyScheduledTasksContext.xml b/spring-context/src/test/resources/org/springframework/scheduling/config/lazyScheduledTasksContext.xml
index d54ba358b5..cbf5953750 100644
--- a/spring-context/src/test/resources/org/springframework/scheduling/config/lazyScheduledTasksContext.xml
+++ b/spring-context/src/test/resources/org/springframework/scheduling/config/lazyScheduledTasksContext.xml
@@ -3,8 +3,8 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:task="http://www.springframework.org/schema/task"
 		xsi:schemaLocation="
-			http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd"
+			http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd"
 		default-lazy-init="true">
 
 	<task:scheduled-tasks>
diff --git a/spring-context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml b/spring-context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml
index 48f5ebdb07..f51d1ee0e7 100644
--- a/spring-context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml
+++ b/spring-context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml
@@ -3,9 +3,9 @@
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:task="http://www.springframework.org/schema/task"
 	   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/task
-				http://www.springframework.org/schema/task/spring-task.xsd">
+				https://www.springframework.org/schema/task/spring-task.xsd">
 
 	<task:scheduled-tasks scheduler="testScheduler">
 		<task:scheduled ref="testBean" method="test" fixed-rate="1000"/>
diff --git a/spring-context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml b/spring-context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml
index 9d2f54fced..5ce62f61b4 100644
--- a/spring-context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml
+++ b/spring-context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml
@@ -3,9 +3,9 @@
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:task="http://www.springframework.org/schema/task"
 	   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/task
-				http://www.springframework.org/schema/task/spring-task.xsd">
+				https://www.springframework.org/schema/task/spring-task.xsd">
 
 	<task:scheduler id="defaultScheduler"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsProxyTargetClassTests.xml b/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsProxyTargetClassTests.xml
index f51d1563ca..46b746c381 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsProxyTargetClassTests.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsProxyTargetClassTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:lang="http://www.springframework.org/schema/lang"
 		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/lang
-				http://www.springframework.org/schema/lang/spring-lang-3.1.xsd"
+				https://www.springframework.org/schema/lang/spring-lang-3.1.xsd"
 		default-autowire="byName"
 		default-init-method="startup"
 		default-destroy-method="shutdown">
diff --git a/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml b/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
index e571ce2c88..de7c96f32b 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:lang="http://www.springframework.org/schema/lang"
 		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/lang
-				http://www.springframework.org/schema/lang/spring-lang-3.0.xsd"
+				https://www.springframework.org/schema/lang/spring-lang-3.0.xsd"
 		default-autowire="byName"
 		default-init-method="startup"
 		default-destroy-method="shutdown">
diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml b/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
index 15329647e2..975ae8859a 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	- Default SQL error codes for well-known databases.
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml
index 0b797a4216..729f8c2098 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 	<jdbc:embedded-database id="firstDataSource" />
 	<jdbc:embedded-database id="secondDataSource" />
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
index c8e43922ad..865c100583 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL">
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml
index 5a89b9183b..eed84a42f3 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL">
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml
index e8cd36088c..6910df702e 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL"/>
 	
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-nested-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-nested-config.xml
index 628e6412c8..09d7f99299 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-nested-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-nested-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL">
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql" execution="INIT"/>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml
index 24135d9fd5..73c7c71a70 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL"/>
 	
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml
index bf31c320cc..34514dfb6b 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL"/>
 	
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-config.xml
index 18de5ce819..707be45a11 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL"/>
 
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-nested-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-nested-config.xml
index 07d18a3197..f5812dcd66 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-nested-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-endings-nested-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL">
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql" encoding="ISO-8859-1"/>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
index 323a21072d..8fad2e5402 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL" />
 
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml
index 45ee2a972b..36f74c61a6 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL"/>
 	
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml
index 4a6f48300b..05b488d9f1 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL"/>
 	
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml
index 78fa0b8017..92c305a418 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:jdbc="http://www.springframework.org/schema/jdbc" 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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL" />
 
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
index e3711a096f..3ad756d27b 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.TestDataSourceWrapper"/>
 
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml
index c46f2f0723..6bae1728d6 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.TestDataSourceWrapper"/>
 
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml
index a2aa189832..00efa720c2 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 	
 <beans>
 
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-custom-translators-context.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-custom-translators-context.xml
index 5603f4bd0a..e252bf8fdb 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-custom-translators-context.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-custom-translators-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="H2"/>
 
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml
index dd3fc33004..debdb81bee 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 	
 <beans>
 
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml
index b44c0a9c1b..6efe9e91d8 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 	
 <beans>
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/jmsNamespaceHandlerTests.xml b/spring-jms/src/test/java/org/springframework/jms/config/jmsNamespaceHandlerTests.xml
index c9431ca417..f797bd381b 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/jmsNamespaceHandlerTests.xml
+++ b/spring-jms/src/test/java/org/springframework/jms/config/jmsNamespaceHandlerTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:jms="http://www.springframework.org/schema/jms"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-				http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-3.1.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+				http://www.springframework.org/schema/jms https://www.springframework.org/schema/jms/spring-jms-3.1.xsd">
 
 	<jms:listener-container connection-factory="testConnectionFactory" task-executor="testTaskExecutor"
 			destination-resolver="testDestinationResolver" message-converter="testMessageConverter"
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-context.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-context.xml
index b161b07f79..b634f92958 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-context.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-context.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="Person" transaction-type="RESOURCE_LOCAL">
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-multi.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-multi.xml
index d3c5739718..c6bbf26fca 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-multi.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-multi.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="Drivers" transaction-type="RESOURCE_LOCAL">
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence.xml
index c75da3e4a5..7b4e0fa0e3 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/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="Person" transaction-type="RESOURCE_LOCAL">
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml
index a2e4f06ab8..26263b661f 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml
index 3ce1da843c..0cfaf4a5b7 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 	
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager.xml
index 6779b221c3..35a1d4fd27 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager.xml
@@ -3,8 +3,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:load-time-weaver aspectj-weaving="on"/>
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/inject.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/inject.xml
index 09aa0eb7f3..5ac81b5c48 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/inject.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/inject.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:annotation-config/>
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/memdb.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/memdb.xml
index 6712f3d61e..6e47cc7ef5 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/memdb.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/memdb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/multi-jpa-emf.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/multi-jpa-emf.xml
index 74226ccb88..f7c5337ea7 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/multi-jpa-emf.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/multi-jpa-emf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml
index 20206d0a57..2bd2efec8a 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml
@@ -3,8 +3,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
 	<context:load-time-weaver aspectj-weaving="on"/>
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager.xml
index 2db5444076..ec73e768fd 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-complex.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-complex.xml
index 20ace4575a..9734588df4 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-complex.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-complex.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="pu1" transaction-type="RESOURCE_LOCAL">
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example1.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example1.xml
index 60381ff19a..1524f6b606 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example1.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example1.xml
@@ -1,7 +1,7 @@
 <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"
+          https://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
 	version="1.0">
 	
 	<persistence-unit name="OrderManagement" />
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example2.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example2.xml
index dbcaf71863..6ffe5a01ad 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example2.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example2.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="OrderManagement2">
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example3.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example3.xml
index 16afc29ec1..05fc867226 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example3.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example3.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="OrderManagement3">
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example4.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example4.xml
index 014c67d0fb..b6bda96a50 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example4.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example4.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="OrderManagement4"
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example5.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example5.xml
index a1f2bd59b1..9e88a8211a 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example5.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example5.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="OrderManagement5">
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example6.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example6.xml
index d43117327a..d96291e96b 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example6.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example6.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="pu">
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-1.0.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-1.0.xml
index 6218437f28..217436ce00 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-1.0.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-1.0.xml
@@ -1,7 +1,7 @@
 <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"
+          https://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
 			 version="1.0">
 
 	<persistence-unit name="NoExcludeElement" />
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-2.0.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-2.0.xml
index 6127bb6946..0438565647 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-2.0.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-2.0.xml
@@ -1,7 +1,7 @@
 <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_2_0.xsd"
+          https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
 			 version="2.0">
 
 	<persistence-unit name="NoExcludeElement" />
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-invalid.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-invalid.xml
index b31889b173..b9de32b090 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-invalid.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-invalid.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/>
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml
index a6869f952b..e5a4cb5c43 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 	
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager.xml
index a3cbcfc899..13c72787d6 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager.xml
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-orm/src/test/resources/org/springframework/beans/factory/xml/child.xml b/spring-orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
index fc90f7905c..4fcc128074 100644
--- a/spring-orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
+++ b/spring-orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-orm/src/test/resources/org/springframework/beans/factory/xml/test.xml b/spring-orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
index 933e66b7d0..c8887fe86d 100644
--- a/spring-orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
+++ b/spring-orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml b/spring-orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml
index 96b19990ac..e07f8fa660 100644
--- a/spring-orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml
+++ b/spring-orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml b/spring-orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml
index bd12f319b7..a82deb191f 100644
--- a/spring-orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml
+++ b/spring-orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml b/spring-oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml
index f54e293fdf..27268fd9b2 100644
--- a/spring-oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml
+++ b/spring-oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN" "http://castor.codehaus.org/mapping.dtd">
+<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN" "https://castor.codehaus.org/mapping.dtd">
 <mapping>
     <description>Castor generated mapping file</description>
     <class name="org.springframework.oxm.castor.Flights">
diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml b/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
index 9e7385f5ae..50fe760eaa 100644
--- a/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
+++ b/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oxm="http://www.springframework.org/schema/oxm"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/oxm https://www.springframework.org/schema/oxm/spring-oxm-3.1.xsd">
 
 	<!-- XMLBeans -->
 	<oxm:xmlbeans-marshaller id="xmlBeansMarshaller"
diff --git a/spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/tiles-test.xml b/spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/tiles-test.xml
index 27b4851511..f967fa2151 100644
--- a/spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/tiles-test.xml
+++ b/spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/tiles-test.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE tiles-definitions PUBLIC
        "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
-       "http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd">
+       "https://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd">
 
 <tiles-definitions>
 
diff --git a/spring-struts/src/test/resources/org/springframework/web/struts/WEB-INF/action-servlet.xml b/spring-struts/src/test/resources/org/springframework/web/struts/WEB-INF/action-servlet.xml
index f934cc1f1c..958864c583 100644
--- a/spring-struts/src/test/resources/org/springframework/web/struts/WEB-INF/action-servlet.xml
+++ b/spring-struts/src/test/resources/org/springframework/web/struts/WEB-INF/action-servlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml b/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml
index 194488e9f6..978b7c187d 100644
--- a/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml
+++ b/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" "https://tiles.apache.org/dtds/tiles-config_3_0.dtd">
 <tiles-definitions>
 	<definition name="standardLayout" templateExpression="/WEB-INF/layouts/standardLayout.jsp"/>
 </tiles-definitions>
diff --git a/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml b/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml
index c05d074fcf..19b92e6ef2 100644
--- a/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml
+++ b/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" "https://tiles.apache.org/dtds/tiles-config_3_0.dtd">
 <tiles-definitions>
 	<definition name="home" extends="standardLayout">
 		<put-attribute name="main" value="/WEB-INF/views/home.jsp" />
diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/root-context.xml b/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/root-context.xml
index 6456a634ca..68812aeff5 100644
--- a/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/root-context.xml
+++ b/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/root-context.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-3.1.xsd">
+		https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="personDao" class="org.mockito.Mockito" factory-method="mock">
 		<constructor-arg value="org.springframework.test.web.servlet.samples.context.PersonDao" />
diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/security.xml b/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/security.xml
index f6cb546bc7..5e83328e7a 100644
--- a/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/security.xml
+++ b/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/security.xml
@@ -1,8 +1,8 @@
 <b:beans xmlns:b="http://www.springframework.org/schema/beans"
 	xmlns="http://www.springframework.org/schema/security"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-3.1.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<http auto-config="true" use-expressions="true">
 		<intercept-url pattern="/**" access="hasRole('ROLE_USER')" />
diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml b/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml
index 615534d26d..0c442c5d7b 100644
--- a/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml
+++ b/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml
@@ -2,8 +2,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-3.1.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
     <mvc:annotation-driven />
 
diff --git a/spring-test-mvc/src/test/webapp/WEB-INF/layouts/tiles.xml b/spring-test-mvc/src/test/webapp/WEB-INF/layouts/tiles.xml
index 55c10df4fd..d2444d74b1 100644
--- a/spring-test-mvc/src/test/webapp/WEB-INF/layouts/tiles.xml
+++ b/spring-test-mvc/src/test/webapp/WEB-INF/layouts/tiles.xml
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "https://tiles.apache.org/dtds/tiles-config_2_1.dtd">
 
 <tiles-definitions>
 
diff --git a/spring-test-mvc/src/test/webapp/WEB-INF/views/tiles.xml b/spring-test-mvc/src/test/webapp/WEB-INF/views/tiles.xml
index 481d7625fc..c332299729 100644
--- a/spring-test-mvc/src/test/webapp/WEB-INF/views/tiles.xml
+++ b/spring-test-mvc/src/test/webapp/WEB-INF/views/tiles.xml
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "https://tiles.apache.org/dtds/tiles-config_2_1.dtd">
 
 <tiles-definitions>
 
diff --git a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
index b1939de12f..a33ac6e361 100644
--- a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<bean id="cat" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Garfield" />
diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml
index 3c4fc976b8..a5cd6ff07d 100644
--- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"
 		p:driverClassName="org.hsqldb.jdbcDriver" p:url="jdbc:hsqldb:mem:transactional_tests" p:username="sa" p:password="" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests$BareAnnotations-context.xml b/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests$BareAnnotations-context.xml
index 44d110480d..f34dae103e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests$BareAnnotations-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests$BareAnnotations-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<!-- intentionally empty: only needed so that the ContextLoader can find this file -->
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml
index 38def23cd7..e3f2a0598b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="properties"
 		class="org.springframework.beans.factory.config.PropertiesFactoryBean">
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
index 9f2fdef412..637998122d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="John Smith" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml
index 3c4fc976b8..a5cd6ff07d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"
 		p:driverClassName="org.hsqldb.jdbcDriver" p:url="jdbc:hsqldb:mem:transactional_tests" p:username="sa" p:password="" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml
index 666f357b7b..7ca966c425 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="databaseSetup"
 		class="org.springframework.test.context.junit4.BeforeAndAfterTransactionAnnotationTests$DatabaseSetup" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml
index 9df7964a91..037686d3b1 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="databaseSetup"
 		class="org.springframework.test.context.junit4.ClassLevelTransactionalSpringRunnerTests$DatabaseSetup" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
index a91178410a..846369c1ab 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<import resource="transactionalTests-context.xml" />
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
index d9663d7c17..f4072116b3 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"
 		p:driverClassName="org.hsqldb.jdbcDriver" p:url="jdbc:hsqldb:mem:transactional_tests" p:username="sa" p:password="" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
index 1c44b0c01b..f99eea03c9 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="databaseSetup"
 		class="org.springframework.test.context.junit4.DefaultRollbackTrueTransactionalSpringRunnerTests$DatabaseSetup" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml
index 3c4fc976b8..a5cd6ff07d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"
 		p:driverClassName="org.hsqldb.jdbcDriver" p:url="jdbc:hsqldb:mem:transactional_tests" p:username="sa" p:password="" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml
index c9e6fa0589..536aa344ed 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="databaseSetup"
 		class="org.springframework.test.context.junit4.MethodLevelTransactionalSpringRunnerTests$DatabaseSetup" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
index b40fed69ca..f7ade734d1 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="John Smith" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
index f6a90a62ea..949d90c186 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="pet" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Fido" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml
index d8c31a1868..4a488e2b94 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="foo" class="java.lang.String">
 		<constructor-arg value="Foo" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
index 67590a6b58..4b849807af 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="employee1" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="John Smith" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
index 44a8ae545c..996a9aff9b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"
 		p:driverClassName="org.hsqldb.jdbcDriver" p:url="jdbc:hsqldb:mem:transactional_tests" p:username="sa" p:password="" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
index cda53c569e..5acdee8295 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="databaseSetup"
 		class="org.springframework.test.context.junit4.RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests$DatabaseSetup" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
index 704b347873..27d136cda9 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="John Smith" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml
index d8e6c2f8e5..a3d4bd278c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="foo" class="java.lang.String">
 		<constructor-arg value="foo" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml
index d1f5ca7849..73da6672e8 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml
@@ -3,10 +3,10 @@
 	xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<context:component-scan base-package="org.springframework.test.context.junit4.orm" />
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml
index 025256301a..8f98d7d051 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN"
-		"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+		"https://hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping auto-import="true" default-lazy="false">
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml
index aa6478b989..b0598cc2fe 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN"
-		"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+		"https://hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping auto-import="true" default-lazy="false">
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/import.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/import.xml
index 3861d0ec59..c57db6e1fa 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/import.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<beans profile="dev">
 		<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml
index 0e672de084..872e9434e4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="pet" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Fido" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
index 7238260bd4..960a6cd0db 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="Yoda" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
index b40fed69ca..f7ade734d1 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="John Smith" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
index f6a90a62ea..949d90c186 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="pet" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Fido" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml
index 6b39409bc9..e069af3a62 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="foo" class="java.lang.String">
 		<constructor-arg value="normal" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass1-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass1-context.xml
index 6331470066..7d38a2c6fb 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass1-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass1-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<import resource="datasource-config.xml"/>
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass2-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass2-context.xml
index 6331470066..7d38a2c6fb 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass2-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass2-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<import resource="datasource-config.xml"/>
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/datasource-config.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/datasource-config.xml
index ed82b6f301..afb6017e8d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/datasource-config.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/datasource-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
 
 	<jdbc:embedded-database id="#{T(java.util.UUID).randomUUID().toString()}">
 		<jdbc:script location="classpath:/org/springframework/test/context/junit4/spr8849/spr8849-schema.sql" />
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml
index 01a7cf9f8c..8dadb4c66f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"
 		p:driverClassName="org.hsqldb.jdbcDriver" p:url="jdbc:hsqldb:mem:transactional_tests" p:username="sa" p:password=""/>
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml
index a057012802..1718f6085a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<!-- intentionally empty: only needed so that the ContextLoader can load a file -->
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml
index 44d110480d..f34dae103e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<!-- intentionally empty: only needed so that the ContextLoader can find this file -->
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
index a46a6da3d1..b2a20a9a2a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
 	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
 
 	<bean id="employee" class="org.springframework.tests.sample.beans.Employee" p:name="John Smith" p:age="42"
 		p:company="Acme Widgets, Inc." />
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml
index f1786428fb..65990dfa9e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
 
 	<jdbc:embedded-database id="dataSource" />
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml
index f1786428fb..65990dfa9e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
 
 	<jdbc:embedded-database id="dataSource" />
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml
index bbff4c9e56..2d78bf6520 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
 
 	<jdbc:embedded-database id="dataSource" />
 
diff --git a/spring-test/src/test/resources/org/springframework/test/context/hierarchies/standard/SingleTestClassWithTwoLevelContextHierarchyAndMixedConfigTypesTests-ChildConfig.xml b/spring-test/src/test/resources/org/springframework/test/context/hierarchies/standard/SingleTestClassWithTwoLevelContextHierarchyAndMixedConfigTypesTests-ChildConfig.xml
index 2189b42fee..8ce6952941 100644
--- a/spring-test/src/test/resources/org/springframework/test/context/hierarchies/standard/SingleTestClassWithTwoLevelContextHierarchyAndMixedConfigTypesTests-ChildConfig.xml
+++ b/spring-test/src/test/resources/org/springframework/test/context/hierarchies/standard/SingleTestClassWithTwoLevelContextHierarchyAndMixedConfigTypesTests-ChildConfig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:c="http://www.springframework.org/schema/c" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xmlns:c="http://www.springframework.org/schema/c" xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="bar" class="java.lang.String" c:_="bar" />
 
diff --git a/spring-test/src/test/resources/org/springframework/test/context/hierarchies/standard/TestHierarchyLevelTwoWithSingleLevelContextHierarchyAndMixedConfigTypesTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/hierarchies/standard/TestHierarchyLevelTwoWithSingleLevelContextHierarchyAndMixedConfigTypesTests-context.xml
index 3abc44bda6..91c9f59c24 100644
--- a/spring-test/src/test/resources/org/springframework/test/context/hierarchies/standard/TestHierarchyLevelTwoWithSingleLevelContextHierarchyAndMixedConfigTypesTests-context.xml
+++ b/spring-test/src/test/resources/org/springframework/test/context/hierarchies/standard/TestHierarchyLevelTwoWithSingleLevelContextHierarchyAndMixedConfigTypesTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:c="http://www.springframework.org/schema/c" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xmlns:c="http://www.springframework.org/schema/c" xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="foo" class="java.lang.String" c:_="foo-level-2" />
 
diff --git a/spring-test/src/test/resources/org/springframework/test/context/hierarchies/web/DispatcherWacRootWacEarTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/hierarchies/web/DispatcherWacRootWacEarTests-context.xml
index 496fc0b08e..9f755c03e5 100644
--- a/spring-test/src/test/resources/org/springframework/test/context/hierarchies/web/DispatcherWacRootWacEarTests-context.xml
+++ b/spring-test/src/test/resources/org/springframework/test/context/hierarchies/web/DispatcherWacRootWacEarTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:c="http://www.springframework.org/schema/c" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xmlns:c="http://www.springframework.org/schema/c" xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="dispatcher" class="java.lang.String" c:_="dispatcher" />
 
diff --git a/spring-test/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml
index d0c286154b..9eb8fced79 100644
--- a/spring-test/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml
+++ b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-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 />
 	<mvc:default-servlet-handler />
diff --git a/spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$ImproperDuplicateDefaultXmlAndConfigClassTestCase-context.xml b/spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$ImproperDuplicateDefaultXmlAndConfigClassTestCase-context.xml
index 6f4ac80752..b024689c1e 100644
--- a/spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$ImproperDuplicateDefaultXmlAndConfigClassTestCase-context.xml
+++ b/spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$ImproperDuplicateDefaultXmlAndConfigClassTestCase-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:c="http://www.springframework.org/schema/c"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<!-- intentionally empty: we just need the file to be present to fail the test -->
 
diff --git a/spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$XmlTestCase-context.xml b/spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$XmlTestCase-context.xml
index 965ab428bf..4165b41ea7 100644
--- a/spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$XmlTestCase-context.xml
+++ b/spring-test/src/test/resources/org/springframework/test/context/support/DelegatingSmartContextLoaderTests$XmlTestCase-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:c="http://www.springframework.org/schema/c"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="foo" class="java.lang.String" c:_="foo" />
 
diff --git a/spring-test/src/test/resources/org/springframework/test/context/web/BasicXmlWacTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/web/BasicXmlWacTests-context.xml
index 90653e21e8..220b78cace 100644
--- a/spring-test/src/test/resources/org/springframework/test/context/web/BasicXmlWacTests-context.xml
+++ b/spring-test/src/test/resources/org/springframework/test/context/web/BasicXmlWacTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:c="http://www.springframework.org/schema/c" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xmlns:c="http://www.springframework.org/schema/c" xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="foo" class="java.lang.String" c:_="bar" />
 
diff --git a/spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml
index 7f2a6c5b23..a8412fa930 100644
--- a/spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml
+++ b/spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="requestScopedTestBean" class="org.springframework.tests.sample.beans.TestBean" scope="request">
 		<property name="name" value="#{request.contextPath}" />
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/ra.xml b/spring-tx/src/main/java/org/springframework/jca/context/ra.xml
index 54f0b7a76d..4309c9a4f2 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/ra.xml
+++ b/spring-tx/src/main/java/org/springframework/jca/context/ra.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <connector xmlns="http://java.sun.com/xml/ns/j2ee"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee https://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
 		version="1.5">
 	<vendor-name>Spring Framework</vendor-name>
 	<eis-type>Spring Connector</eis-type>
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml b/spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml
index bd659fd893..1700e9de85 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml
@@ -4,10 +4,10 @@
 	   xmlns:aop="http://www.springframework.org/schema/aop"
 		 xmlns:context="http://www.springframework.org/schema/context"
 	   xmlns:tx="http://www.springframework.org/schema/tx"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+       http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd
+       http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
 	<tx:annotation-driven/>
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml b/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml
index 7207e09a60..6ead5633a8 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml
+++ b/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml
@@ -3,10 +3,10 @@
        xmlns:aop="http://www.springframework.org/schema/aop"
 	   xmlns:context="http://www.springframework.org/schema/context"
        xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-       		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
-       		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       		http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+       		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd
+       		http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 
 	<context:annotation-config/>
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml b/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
index a707e84fd3..5d8a8de156 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
+++ b/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 
 	<tx:annotation-driven proxy-target-class="true" order="0"/>
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml b/spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml
index e9ef193b44..7c038abe09 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/transactionalBeanFactory.xml b/spring-tx/src/test/java/org/springframework/transaction/interceptor/transactionalBeanFactory.xml
index 7b576f80f6..5681c67d23 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/transactionalBeanFactory.xml
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/transactionalBeanFactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml b/spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml
index a8adf10c6d..35b96652a7 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml
+++ b/spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml
@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xmlns:tx="http://www.springframework.org/schema/tx"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-				http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+				http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 
 	<aop:config>
 		<aop:advisor pointcut="execution(* *..ITestBean.*(..))" advice-ref="txAdvice"/>
diff --git a/spring-web/src/main/resources/META-INF/web-fragment.xml b/spring-web/src/main/resources/META-INF/web-fragment.xml
index e687c8b58e..ef85d0866a 100644
--- a/spring-web/src/main/resources/META-INF/web-fragment.xml
+++ b/spring-web/src/main/resources/META-INF/web-fragment.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-fragment 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-fragment_3_0.xsd"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
 	version="3.0" metadata-complete="true">
 
 	<name>spring_web</name>
diff --git a/spring-web/src/test/resources/org/springframework/http/converter/feed/atom.xml b/spring-web/src/test/resources/org/springframework/http/converter/feed/atom.xml
index 15b9ed69db..18f968a6ab 100644
--- a/spring-web/src/test/resources/org/springframework/http/converter/feed/atom.xml
+++ b/spring-web/src/test/resources/org/springframework/http/converter/feed/atom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.w3.org/2005/Atom http://www.kbcafe.com/rss/atom.xsd.xml">
+      xsi:schemaLocation="http://www.w3.org/2005/Atom https://www.kbcafe.com/rss/atom.xsd.xml">
     <title>title</title>
     <subtitle>subtitle</subtitle>
     <entry>
diff --git a/spring-web/src/test/resources/org/springframework/http/converter/feed/rss.xml b/spring-web/src/test/resources/org/springframework/http/converter/feed/rss.xml
index 7f0fe53c57..49c3053c43 100644
--- a/spring-web/src/test/resources/org/springframework/http/converter/feed/rss.xml
+++ b/spring-web/src/test/resources/org/springframework/http/converter/feed/rss.xml
@@ -2,7 +2,7 @@
 <rss version="2.0">
     <channel>
         <title>title</title>
-        <link>http://example.com</link>
+        <link>https://example.com</link>
         <description>description</description>
         <item>
             <title>title1</title>
diff --git a/spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml b/spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml
index 3ed39dfd7a..1b9769e7d1 100644
--- a/spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml
+++ b/spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml
@@ -2,7 +2,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-2.0.xsd">
+                https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<bean id="requestScopedObject" class="org.springframework.tests.sample.beans.TestBean" scope="request">
         <property name="name" value="#{request.contextPath}"/>
diff --git a/spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml b/spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml
index 92759852b5..d357806bdd 100644
--- a/spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml
+++ b/spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<bean id="requestScopedObject" class="org.springframework.tests.sample.beans.TestBean" scope="request">
 		<aop:scoped-proxy/>
diff --git a/spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml b/spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml
index e92f639f8c..a371316fd7 100644
--- a/spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml
+++ b/spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml
index 9a4a216313..40188c4fd3 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd" [
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd" [
 <!ENTITY contextInclude SYSTEM "org/springframework/web/portlet/context/WEB-INF/contextInclude.xml">
 ]>
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml
index 0ae01091c4..f865ad2a14 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml
index 58e00ac37e..f1b816e6a0 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml
index 1e7d04517d..3ffbdb2cb9 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml
index f8d44ee12b..4f177c4b95 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
index 85885f238d..56124d993c 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/parameterMapping.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/parameterMapping.xml
index f3fddf0d76..42c2df0143 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/parameterMapping.xml
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/parameterMapping.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeMapping.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeMapping.xml
index fc62e717e8..08dcc78525 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeMapping.xml
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeMapping.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeParameterMapping.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeParameterMapping.xml
index 066d1a88c2..420b5b810f 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeParameterMapping.xml
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeParameterMapping.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc-tiles3/src/test/resources/org/springframework/web/servlet/view/tiles3/tiles-definitions.xml b/spring-webmvc-tiles3/src/test/resources/org/springframework/web/servlet/view/tiles3/tiles-definitions.xml
index feb4a09cb8..dd2ffcb434 100644
--- a/spring-webmvc-tiles3/src/test/resources/org/springframework/web/servlet/view/tiles3/tiles-definitions.xml
+++ b/spring-webmvc-tiles3/src/test/resources/org/springframework/web/servlet/view/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-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml
index 6080b76eb0..32b583beda 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean class="org.springframework.tests.sample.beans.TestBean">
 		<constructor-arg value="${name}"/>
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml
index b4d7c366f2..9a023f5da2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd" [
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd" [
 <!ENTITY contextInclude SYSTEM "org/springframework/web/context/WEB-INF/contextInclude.xml">
 ]>
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-addition.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-addition.xml
index f213aa1996..90a4d7baa1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-addition.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-addition.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-context.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-context.xml
index 704859f049..cf04aa4fbe 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-context.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 </beans>
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/fail.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/fail.xml
index 54d05ef2a3..4cc4213c0c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/fail.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/fail.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/messageSource.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/messageSource.xml
index a40e827ba9..c954d650c8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/messageSource.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/messageSource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/themeSource.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/themeSource.xml
index 1e7d04517d..3ffbdb2cb9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/themeSource.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/themeSource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml
index 85885f238d..56124d993c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml
index 89c42365d4..b0dd8abea8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/beans1.xml b/spring-webmvc/src/test/java/org/springframework/web/context/beans1.xml
index 1058161049..0fd8fc88e3 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/beans1.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/beans1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: beans1.xml,v 1.3 2006/08/20 19:08:40 jhoeller Exp $ -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ref1.xml b/spring-webmvc/src/test/java/org/springframework/web/context/ref1.xml
index 60f521c91c..1456d8da79 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ref1.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ref1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!-- We are only using one definition file for the purposes of this test, since we do not have multiple
 	classloaders available in the environment to allow combining multiple files of the same name, but
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles2/tiles-definitions.xml b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles2/tiles-definitions.xml
index 8aac5812da..040a22365a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles2/tiles-definitions.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/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.0//EN"
-		"http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+		"https://tiles.apache.org/dtds/tiles-config_2_0.dtd">
 
 <tiles-definitions>
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/views.xml b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/views.xml
index ba6edee3bd..8384861113 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/views.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/views.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
index b49584e11d..84601a2913 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml
index eb7bf0f6ea..2bdd84592c 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-argument-resolvers.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-argument-resolvers.xml
index 2fbbda75b2..873dcca013 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-argument-resolvers.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-argument-resolvers.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
 
 	<mvc:annotation-driven>
 		<mvc:argument-resolvers>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-async-support.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-async-support.xml
index 07dad7e38e..64405231bb 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-async-support.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-async-support.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
 
 	<mvc:annotation-driven>
 		<mvc:async-support default-timeout="2500" task-executor="executor">
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-bean-decoration.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-bean-decoration.xml
index 2a4f599003..f3db626354 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-bean-decoration.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-bean-decoration.xml
@@ -3,8 +3,8 @@
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:p="http://www.springframework.org/schema/p"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
 
 	<mvc:annotation-driven />
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-content-negotiation-manager.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-content-negotiation-manager.xml
index 612999a52f..dc29831825 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-content-negotiation-manager.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-content-negotiation-manager.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
 	<mvc:annotation-driven content-negotiation-manager="contentNegotiationManager" />
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-conversion-service.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-conversion-service.xml
index 32d827a822..f479d08fb2 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-conversion-service.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-conversion-service.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
 
 	<mvc:annotation-driven conversion-service="conversionService" />
 	
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml
index 6efe9e1557..d055b41d28 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
 
 	<mvc:annotation-driven validator="validator" 
 		ignoreDefaultModelOnRedirect="true" enableMatrixVariables="true" />
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet-optional-attrs.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet-optional-attrs.xml
index 36a1cb2dc7..b1f174e84c 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet-optional-attrs.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet-optional-attrs.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
 
 	<mvc:default-servlet-handler default-servlet-name="custom" />
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet.xml
index 89f79e8d8d..5eebe81bc0 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-default-servlet.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
 
 	<mvc:default-servlet-handler />
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml
index 780d9c379e..23b9ee5540 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
 
 	<mvc:annotation-driven />
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-codes-resolver.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-codes-resolver.xml
index 0eea3e204f..e15163a5c5 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-codes-resolver.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-codes-resolver.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
 
 	<mvc:annotation-driven message-codes-resolver="messageCodesResolver"/>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters-defaults-off.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters-defaults-off.xml
index 81bfcdfcfc..bec48e390d 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters-defaults-off.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters-defaults-off.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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-3.2.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
 
 	<mvc:annotation-driven>
 		<mvc:message-converters register-defaults="false">
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters.xml
index 258952baf4..d79412441e 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-message-converters.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
 
 	<mvc:annotation-driven>
 		<mvc:message-converters>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching-mappings.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching-mappings.xml
index 875672b2f4..91d21e6695 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching-mappings.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching-mappings.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:mvc="http://www.springframework.org/schema/mvc"
        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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <mvc:resources mapping="/resources/**" location="/, classpath:/META-INF/" />
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml
index 8b27fa26f5..cebdbe6a7e 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:mvc="http://www.springframework.org/schema/mvc"
        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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <mvc:annotation-driven content-negotiation-manager="contentNegotiationManager">
         <mvc:path-matching
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-optional-attrs.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-optional-attrs.xml
index c38026b0a5..52bbecd3b7 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-optional-attrs.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-optional-attrs.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
 
 	<mvc:resources mapping="/resources/**" location="/, classpath:/META-INF/" cache-period="3600" order="5"/>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml
index 1d3dff9604..9337b496db 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
 
 	<mvc:resources mapping="/resources/**" location="/, classpath:/META-INF/" />
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-return-value-handlers.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-return-value-handlers.xml
index 0e095677e0..66ceab4714 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-return-value-handlers.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-return-value-handlers.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
 
 	<mvc:annotation-driven>
 		<mvc:return-value-handlers>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml
index db5627e069..d839aef886 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
 
 	<mvc:view-controller path="/" view-name="home"/>
 	
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml
index 4188835f46..8d46281408 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
 
 	<mvc:annotation-driven/>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config.xml
index 1b0b4c7212..449d28e6e9 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	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
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
 
 	<mvc:annotation-driven />
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map1.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map1.xml
index f4b473bb15..04fc0c064b 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map1.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml
index 9e89531838..ed51f2eaa3 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
index 08f51cffe8..a29a887d90 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map3.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map3.xml
index bc7a9e49a1..a8a8d3fc78 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map3.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml
index bd73342dc4..2287de9bdd 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml
index 214b8498b3..7980fe2ee8 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml
index 67ec8eda81..b7ba5066b3 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
diff --git a/src/reference/docbook/aop-api.xml b/src/reference/docbook/aop-api.xml
index a616d7b30d..8b36f7817d 100644
--- a/src/reference/docbook/aop-api.xml
+++ b/src/reference/docbook/aop-api.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 AOP APIs</title>
 
   <section xml:id="aop-api-introduction">
diff --git a/src/reference/docbook/aop.xml b/src/reference/docbook/aop.xml
index fafebe6127..724aa8e573 100644
--- a/src/reference/docbook/aop.xml
+++ b/src/reference/docbook/aop.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>Aspect Oriented Programming with Spring</title>
 
   <section xml:id="aop-introduction">
@@ -309,7 +309,7 @@
 
     <para>@AspectJ refers to a style of declaring aspects as regular Java
     classes annotated with Java 5 annotations. The @AspectJ style was
-    introduced by the <link xl:href="http://www.eclipse.org/aspectj">AspectJ
+    introduced by the <link xl:href="https://www.eclipse.org/aspectj">AspectJ
     project</link> as part of the AspectJ 5 release. Spring 2.0 interprets
     the same annotations as AspectJ 5, using a library supplied by AspectJ for
     pointcut parsing and matching. The AOP runtime is still pure Spring AOP
@@ -462,9 +462,9 @@ private void anyOldTransfer() {}<lineannotation>// the pointcut signature</linea
       <interfacename>@Pointcut</interfacename> annotation is a regular AspectJ
       5 pointcut expression. For a full discussion of AspectJ's pointcut
       language, see the <link
-      xl:href="http://www.eclipse.org/aspectj/doc/released/progguide/index.html">AspectJ
+      xl:href="https://www.eclipse.org/aspectj/doc/released/progguide/index.html">AspectJ
       Programming Guide</link> (and for Java 5 based extensions, the <link
-      xl:href="http://www.eclipse.org/aspectj/doc/released/adk15notebook/index.html">AspectJ
+      xl:href="https://www.eclipse.org/aspectj/doc/released/adk15notebook/index.html">AspectJ
       5 Developers Notebook</link>) or one of the books on AspectJ such as
       <quote>Eclipse AspectJ</quote> by Colyer et. al. or <quote>AspectJ in
       Action</quote> by Ramnivas Laddad.</para>
@@ -761,7 +761,7 @@ public class SystemArchitecture {
         type, <literal>(*,String)</literal> matches a method taking two
         parameters, the first can be of any type, the second must be a String.
         Consult the <link
-        xl:href="http://www.eclipse.org/aspectj/doc/released/progguide/semantics-pointcuts.html">
+        xl:href="https://www.eclipse.org/aspectj/doc/released/progguide/semantics-pointcuts.html">
         Language Semantics</link> section of the AspectJ Programming Guide
         for more information.</para>
 
@@ -2152,8 +2152,8 @@ public class SimpleProfiler {
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:aop="http://www.springframework.org/schema/aop"
       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
    <lineannotation>&lt;!-- this is the object that will be proxied by Spring's AOP infrastructure --&gt;</lineannotation>
    &lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
@@ -2463,7 +2463,7 @@ public @interface Idempotent {
       style. Clearly, if you are not using Java 5+ then the choice has been
       made for you... use the code style. If aspects play a large role in your
       design, and you are able to use the <link
-      xl:href="http://www.eclipse.org/ajdt/">AspectJ Development Tools
+      xl:href="https://www.eclipse.org/ajdt/">AspectJ Development Tools
       (AJDT)</link> plugin for Eclipse, then the AspectJ language syntax is
       the preferred option: it is cleaner and simpler because the language was
       purposefully designed for writing aspects. If you are not using Eclipse,
@@ -2907,7 +2907,7 @@ public class Account {
       '<literal>new</literal>' operator) as well as to
       <interfacename>Serializable</interfacename> objects that are undergoing
       deserialization (e.g., via <link
-      xl:href="http://java.sun.com/j2se/1.5.0/docs/api/java/io/Serializable.html">readResolve()</link>).</para>
+      xl:href="https://java.sun.com/j2se/1.5.0/docs/api/java/io/Serializable.html">readResolve()</link>).</para>
 
       <note>
         <para>One of the key phrases in the above paragraph is '<emphasis>in
@@ -2928,16 +2928,16 @@ public class Account {
 
         <para>You can find out more information about the language semantics
         of the various pointcut types in AspectJ <link
-        xl:href="http://www.eclipse.org/aspectj/doc/next/progguide/semantics-joinPoints.html">in
+        xl:href="https://www.eclipse.org/aspectj/doc/next/progguide/semantics-joinPoints.html">in
         this appendix</link> of the <link
-        xl:href="http://www.eclipse.org/aspectj/doc/next/progguide/index.html">AspectJ
+        xl:href="https://www.eclipse.org/aspectj/doc/next/progguide/index.html">AspectJ
         Programming Guide</link>.</para>
       </note>
 
       <para>For this to work the annotated types must be woven with the
       AspectJ weaver - you can either use a build-time Ant or Maven task to do
       this (see for example the <link
-      xl:href="http://www.eclipse.org/aspectj/doc/released/devguide/antTasks.html">AspectJ
+      xl:href="https://www.eclipse.org/aspectj/doc/released/devguide/antTasks.html">AspectJ
       Development Environment Guide</link>) or load-time weaving (see <xref
       linkend="aop-aj-ltw"/>). The
       <classname>AnnotationBeanConfigurerAspect</classname> itself needs
@@ -3182,7 +3182,7 @@ public class AppConfig {
       Framework: this section is not an introduction to LTW though. For full
       details on the specifics of LTW and configuring LTW with just AspectJ
       (with Spring not being involved at all), see the <link
-      xl:href="http://www.eclipse.org/aspectj/doc/released/devguide/ltw.html">LTW
+      xl:href="https://www.eclipse.org/aspectj/doc/released/devguide/ltw.html">LTW
       section of the AspectJ Development Environment Guide</link>.</para>
 
       <para>The value-add that the Spring Framework brings to AspectJ LTW is
@@ -3275,7 +3275,7 @@ public class ProfilingAspect {
         AspectJ.</para>
 
         <programlisting language="xml">&lt;!DOCTYPE aspectj PUBLIC
-        "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd"&gt;
+        "-//AspectJ//DTD//EN" "https://www.eclipse.org/aspectj/dtd/aspectj.dtd"&gt;
 &lt;aspectj&gt;
 
     &lt;weaver&gt;
@@ -3310,9 +3310,9 @@ public class ProfilingAspect {
        xmlns:context="http://www.springframework.org/schema/context"
        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/context
-    http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+    https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     <lineannotation>&lt;!-- a service object; we will be profiling its methods --&gt;</lineannotation>
     &lt;bean id="entitlementCalculationService"
@@ -3358,7 +3358,7 @@ public final class Main {
 
         <para>The '<literal>-javaagent</literal>' is a Java 5+ flag for
         specifying and enabling <link
-        xl:href="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/instrument/package-summary.html">agents
+        xl:href="https://java.sun.com/j2se/1.5.0/docs/api/java/lang/instrument/package-summary.html">agents
         to instrument programs running on the JVM</link>. The Spring
         Framework ships with such an agent, the
         <classname>InstrumentationSavingAgent</classname>, which is packaged
@@ -3447,7 +3447,7 @@ public final class Main {
 
         <para>The structure and contents of this file is detailed in the main
         AspectJ reference documentation, and the interested reader is <link
-        xl:href="http://www.eclipse.org/aspectj/doc/released/devguide/ltw-configuration.html">referred
+        xl:href="https://www.eclipse.org/aspectj/doc/released/devguide/ltw-configuration.html">referred
         to that resource</link>. (I appreciate that this section is brief,
         but the '<filename>aop.xml</filename>' file is 100% AspectJ - there is
         no Spring-specific information or semantics that apply to it, and so
@@ -3541,9 +3541,9 @@ public class AppConfig {
        xmlns:context="http://www.springframework.org/schema/context"
        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/context
-    http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+    https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     &lt;context:load-time-weaver/&gt;
 
@@ -3578,31 +3578,31 @@ http://www.springframework.org/schema/context
             <tbody>
               <row>
                 <entry><para>Running in <link
-                xl:href="http://www.bea.com/framework.jsp?CNT=index.htm&amp;FP=/content/products/weblogic/server">BEA's
+                xl:href="https://www.oracle.com/bea/index.html?CNT=index.htm&amp;FP=/content/products/weblogic/server">BEA's
                 Weblogic 10</link></para></entry>
                 <entry><para><classname>WebLogicLoadTimeWeaver</classname></para></entry>
               </row>
 
               <row>
                 <entry><para>Running in <link
-                xl:href="http://www-01.ibm.com/software/webservers/appserv/was/">IBM WebSphere Application Server 7</link></para></entry>
+                xl:href="https://www-01.ibm.com/software/webservers/appserv/was/">IBM WebSphere Application Server 7</link></para></entry>
                 <entry><para><classname>WebSphereLoadTimeWeaver</classname></para></entry>
               </row>
 
               <row>
                 <entry><para>Running in <link
-                xl:href="http://www.oracle.com/technology/products/oc4j/index.html">Oracle's
+                xl:href="https://www.oracle.com/technology/products/oc4j/index.html">Oracle's
                 OC4J</link></para></entry>
                 <entry><para><classname>OC4JLoadTimeWeaver</classname></para></entry>
               </row>
 
               <row>
-                <entry><para>Running in <link xl:href="http://glassfish.dev.java.net/">GlassFish</link></para></entry>
+                <entry><para>Running in <link xl:href="https://glassfish.dev.java.net/">GlassFish</link></para></entry>
                 <entry><para><classname>GlassFishLoadTimeWeaver</classname></para></entry>
               </row>
 
               <row>
-                <entry><para>Running in <link xl:href="http://www.jboss.org/jbossas/">JBoss AS</link></para></entry>
+                <entry><para>Running in <link xl:href="https://www.jboss.org/jbossas/">JBoss AS</link></para></entry>
                 <entry><para><classname>JBossLoadTimeWeaver</classname></para></entry>
               </row>
 
@@ -3617,7 +3617,7 @@ http://www.springframework.org/schema/context
               <row>
                 <entry><para>Fallback, expecting the underlying ClassLoader to follow common conventions
                 (e.g. applicable to <classname>TomcatInstrumentableClassLoader</classname> and
-                <link xl:href="http://www.caucho.com/">Resin</link>)</para></entry>
+                <link xl:href="https://www.caucho.com/">Resin</link>)</para></entry>
                 <entry><para><classname>ReflectiveLoadTimeWeaver</classname></para></entry>
               </row>
             </tbody>
@@ -3655,9 +3655,9 @@ public class AppConfig implements LoadTimeWeavingConfigurer {
        xmlns:context="http://www.springframework.org/schema/context"
        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/context
-    http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+    https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     &lt;context:load-time-weaver
             weaver-class="org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver"/&gt;
@@ -3739,7 +3739,7 @@ http://www.springframework.org/schema/context
         <section xml:id="aop-aj-ltw-environment-tomcat">
           <title>Tomcat</title>
 
-          <para><link xl:href="http://tomcat.apache.org/">Apache Tomcat</link>'s default class loader
+          <para><link xl:href="https://tomcat.apache.org/">Apache Tomcat</link>'s default class loader
           does not support class transformation which is why Spring provides an enhanced implementation that
           addresses this need. Named <classname>TomcatInstrumentableClassLoader</classname>, the loader works
           on Tomcat 5.0 and above and can be registered individually for <emphasis>each</emphasis> web application
@@ -3779,7 +3779,7 @@ http://www.springframework.org/schema/context
                 <para>For efficiency, the embedded per-web-app configuration style <!--Which one is inside the web-app config style? Reword. TR: REVISED, PLS REVIEW. Same change as for 5.0/5.5-->is
                 recommended because it will impact only applications that use
                 the custom class loader and does not require any changes to the server configuration.
-                See the Tomcat 6.0.x <link xl:href="http://tomcat.apache.org/tomcat-6.0-doc/config/context.html">documentation</link>
+                See the Tomcat 6.0.x <link xl:href="https://tomcat.apache.org/tomcat-6.0-doc/config/context.html">documentation</link>
                 for more details about available context locations.</para>
               </listitem>
             </orderedlist>
@@ -3818,7 +3818,7 @@ http://www.springframework.org/schema/context
                 <para>For efficiency, the embedded web-app configuration style<!--Which of the preceding is *inside the web-app config style*? Two paths contain webapp.
 TR: REVISED, PLS REVIEW. Chnaged the last one to *inside*--> is recommended
                 recommended because it will impact only applications that use the class loader. See the Tomcat 5.x <link
-                xl:href="http://tomcat.apache.org/tomcat-5.5-doc/config/context.html">documentation</link>
+                xl:href="https://tomcat.apache.org/tomcat-5.5-doc/config/context.html">documentation</link>
                 for more details about available context locations.</para>
 
                 <para>Tomcat versions prior to 5.5.20 contained a bug in the
@@ -3827,7 +3827,7 @@ TR: REVISED, PLS REVIEW. Chnaged the last one to *inside*--> is recommended
                 <emphasis>server.xml</emphasis> configuration, regardless of whether a class
                 loader is specified or whether it is the official or a custom
                 one. See Tomcat's bugzilla for <link
-                xl:href="http://issues.apache.org/bugzilla/show_bug.cgi?id=39704">more
+                xl:href="https://issues.apache.org/bugzilla/show_bug.cgi?id=39704">more
                 details</link>.</para><!--Will reader know what Tomcat's bugzilla is and where to find it? TR: OK AS IS. They just need to click on the hyerlink.-->
 
                 <para>In Tomcat 5.5.x, versions 5.5.20 or later, you should set
@@ -3896,7 +3896,7 @@ TR: REVISED, PLS REVIEW. Chnaged the last one to *inside*--> is recommended
           environments (depending on your operation policies). Additionally, the JDK agent will instrument the <emphasis>entire</emphasis>
           VM which can prove expensive.</para>
           <para>For performance reasons, it is recommended to use this configuration only if your target environment
-          (such as <link xl:href="http://www.eclipse.org/jetty/">Jetty</link>) does not have (or does not support) a dedicated LTW.</para>
+          (such as <link xl:href="https://www.eclipse.org/jetty/">Jetty</link>) does not have (or does not support) a dedicated LTW.</para>
         </section>
 
       </section>
@@ -3907,7 +3907,7 @@ TR: REVISED, PLS REVIEW. Chnaged the last one to *inside*--> is recommended
     <title>Further Resources</title>
 
     <para>More information on AspectJ can be found on the <link
-    xl:href="http://www.eclipse.org/aspectj">AspectJ website</link>.</para>
+    xl:href="https://www.eclipse.org/aspectj">AspectJ website</link>.</para>
 
     <para>The book <emphasis>Eclipse AspectJ</emphasis> by Adrian Colyer et.
     al. (Addison-Wesley, 2005) provides a comprehensive introduction and
diff --git a/src/reference/docbook/beans-annotation-config.xml b/src/reference/docbook/beans-annotation-config.xml
index 06d5e3c31a..e415f201e3 100644
--- a/src/reference/docbook/beans-annotation-config.xml
+++ b/src/reference/docbook/beans-annotation-config.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>Annotation-based container configuration</title>
 
   <sidebar>
@@ -29,7 +29,7 @@
       linkend="beans-java">JavaConfig</link> option, Spring allows annotations
       to be used in a non-invasive way, without touching the target components
       source code and that in terms of tooling, all configuration styles are
-      supported by the <link xl:href="http://www.springsource.com/products/sts"
+      supported by the <link xl:href="https://www.springsource.com/products/sts"
       >SpringSource Tool Suite</link>.</para>
   </sidebar>
 
@@ -68,23 +68,23 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      <lineannotation>xmlns:context="http://www.springframework.org/schema/context"</lineannotation>
      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/context
-         http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+         https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
    <lineannotation>&lt;context:annotation-config/&gt;</lineannotation>
 
 &lt;/beans&gt;</programlisting>
 
   <para>(The implicitly registered post-processors include <link
-    xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.html"
+    xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.html"
     ><classname>AutowiredAnnotationBeanPostProcessor</classname></link>, <link
-    xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.html"
+    xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.html"
     ><classname>CommonAnnotationBeanPostProcessor</classname></link>, <link
-    xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.html"
+    xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.html"
     ><classname>PersistenceAnnotationBeanPostProcessor</classname></link>, as
     well as the aforementioned <link
-    xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.html"
+    xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.html"
     ><classname>RequiredAnnotationBeanPostProcessor</classname></link>.)</para>
 
   <note>
@@ -362,9 +362,9 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   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/context
-      http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+      https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
   &lt;context:annotation-config/&gt;
 
@@ -479,9 +479,9 @@ public @interface Genre {
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   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/context
-      http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+      https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
   &lt;context:annotation-config/&gt;
 
@@ -602,9 +602,9 @@ public @interface MovieQualifier {
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   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/context
-      http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+      https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
   &lt;context:annotation-config/&gt;
 
@@ -643,7 +643,7 @@ public @interface MovieQualifier {
     <title><classname>CustomAutowireConfigurer</classname></title>
 
     <para>The <link
-      xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.html"
+      xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.html"
       ><classname>CustomAutowireConfigurer</classname></link> is a
       <interfacename>BeanFactoryPostProcessor</interfacename> that enables you
       to register your own custom qualifier annotation types even if they are
@@ -724,7 +724,7 @@ public @interface MovieQualifier {
         the <interfacename>ApplicationContext</interfacename> of which the
         <classname>CommonAnnotationBeanPostProcessor</classname> is aware. The
         names can be resolved through JNDI if you configure Spring's <link
-        xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/jndi/support/SimpleJndiBeanFactory.html"
+        xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/jndi/support/SimpleJndiBeanFactory.html"
         ><classname>SimpleJndiBeanFactory</classname></link> explicitly.
         However, it is recommended that you rely on the default behavior and
         simply use Spring's JNDI lookup capabilities to preserve the level of
diff --git a/src/reference/docbook/beans-classpath-scanning.xml b/src/reference/docbook/beans-classpath-scanning.xml
index c1930ab94d..8f1d7599be 100644
--- a/src/reference/docbook/beans-classpath-scanning.xml
+++ b/src/reference/docbook/beans-classpath-scanning.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>Classpath scanning and managed components</title>
 
   <para>Most examples in this chapter use XML to specify the configuration
@@ -27,7 +27,7 @@
 
   <note>
     <para>Starting with Spring 3.0, many features provided by the <link
-      xl:href="http://www.springsource.org/javaconfig">Spring JavaConfig
+      xl:href="https://www.springsource.org/javaconfig">Spring JavaConfig
       project</link> are part of the core Spring Framework. This allows you to
       define beans using Java rather than using the traditional XML files. Take
       a look at the <interfacename>@Configuration</interfacename>,
@@ -113,9 +113,9 @@ public class JpaMovieFinder implements MovieFinder {
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:context="http://www.springframework.org/schema/context"
      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/context
-         http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+         https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
    &lt;context:component-scan base-package="org.example"/&gt;
 
@@ -402,7 +402,7 @@ public class MovieFinderImpl implements MovieFinder {
     <note>
       <para>If you do not want to rely on the default bean-naming strategy, you
         can provide a custom bean-naming strategy. First, implement the <link
-        xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/support/BeanNameGenerator.html"
+        xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/support/BeanNameGenerator.html"
         ><interfacename>BeanNameGenerator</interfacename></link> interface, and
         be sure to include a default no-arg constructor. Then, provide the
         fully-qualified class name when configuring the scanner:</para>
@@ -439,7 +439,7 @@ public class MovieFinderImpl implements MovieFinder {
     <note>
       <para>To provide a custom strategy for scope resolution rather than
         relying on the annotation-based approach, implement the <link
-        xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/ScopeMetadataResolver.html"
+        xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/ScopeMetadataResolver.html"
         ><interfacename>ScopeMetadataResolver</interfacename></link> interface,
         and be sure to include a default no-arg constructor. Then, provide the
         fully-qualified class name when configuring the scanner:</para>
diff --git a/src/reference/docbook/beans-context-additional.xml b/src/reference/docbook/beans-context-additional.xml
index 8cf19e31ad..0fb0a1bfcf 100644
--- a/src/reference/docbook/beans-context-additional.xml
+++ b/src/reference/docbook/beans-context-additional.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>Additional Capabilities of the
     <interfacename>ApplicationContext</interfacename></title>
 
@@ -17,7 +17,7 @@
     functionality for managing and manipulating beans, including in a
     programmatic way. The <literal>org.springframework.context</literal> package
     adds the <link
-    xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/context/ApplicationContext.html"
+    xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/ApplicationContext.html"
     ><interfacename>ApplicationContext</interfacename></link> interface, which
     extends the <interfacename>BeanFactory</interfacename> interface, in
     addition to extending other interfaces to provide additional functionality
@@ -497,9 +497,9 @@ argument.required=Ebagum lad, the {0} argument is required, I say, required.</pr
         between Spring beans within the same application context. However, for
         more sophisticated enterprise integration needs, the
         separately-maintained <link
-        xl:href="http://springsource.org/spring-integration">Spring
+        xl:href="https://springsource.org/spring-integration">Spring
         Integration</link> project provides complete support for building
-        lightweight, <link xl:href="http://www.enterpriseintegrationpatterns.com"
+        lightweight, <link xl:href="https://www.enterpriseintegrationpatterns.com"
         >pattern-oriented</link>, event-driven architectures that build upon
         the well-known Spring programming model.</para>
     </note>
@@ -612,7 +612,7 @@ argument.required=Ebagum lad, the {0} argument is required, I say, required.</pr
       <interfacename>TaskExecutor</interfacename> abstraction.</para>
 
     <para>Check out the JavaDoc of the <link
-      xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/jca/context/SpringContextResourceAdapter.html"
+      xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/jca/context/SpringContextResourceAdapter.html"
       >SpringContextResourceAdapter</link> class for the configuration details
       involved in RAR deployment.</para>
 
diff --git a/src/reference/docbook/beans-customizing.xml b/src/reference/docbook/beans-customizing.xml
index 9e5c4284b9..f1f5663c51 100644
--- a/src/reference/docbook/beans-customizing.xml
+++ b/src/reference/docbook/beans-customizing.xml
@@ -6,8 +6,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xl="http://www.w3.org/1999/xlink"
     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>Customizing the nature of a bean</title>
 
   <section xml:id="beans-factory-lifecycle">
diff --git a/src/reference/docbook/beans-dependencies.xml b/src/reference/docbook/beans-dependencies.xml
index 7c09841290..d383c207c0 100644
--- a/src/reference/docbook/beans-dependencies.xml
+++ b/src/reference/docbook/beans-dependencies.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>Dependencies</title>
 
   <para>A typical enterprise application does not consist of a single object (or
@@ -180,7 +180,7 @@ public class ExampleBean {
           look up the parameter name from the constructor. If you can't compile
           your code with debug flag (or don't want to) you can use
           <interfacename><link
-          xl:href="http://download.oracle.com/javase/6/docs/api/java/beans/ConstructorProperties.html">@ConstructorProperties</link></interfacename>
+          xl:href="https://download.oracle.com/javase/6/docs/api/java/beans/ConstructorProperties.html">@ConstructorProperties</link></interfacename>
           JDK annotation to explicitly name your constructor arguments. The
           sample class would then have to look as follows:</para>
 
@@ -537,7 +537,7 @@ public class ExampleBean {
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:p="http://www.springframework.org/schema/p"
      xsi:schemaLocation="http://www.springframework.org/schema/beans
-     http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
+     https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
 &lt;bean id="myDataSource" class="org.apache.commons.dbcp.BasicDataSource"
       destroy-method="close"
@@ -552,8 +552,8 @@ public class ExampleBean {
 
       <para>The preceding XML is more succinct; however, typos are discovered at
         runtime rather than design time, unless you use an IDE such as <link
-        xl:href="http://www.jetbrains.com/idea/">IntelliJ IDEA</link> or the <link
-        xl:href="http://www.springsource.com/products/sts">SpringSource Tool
+        xl:href="https://www.jetbrains.com/idea/">IntelliJ IDEA</link> or the <link
+        xl:href="https://www.springsource.com/products/sts">SpringSource Tool
         Suite</link> (STS) that support automatic property completion when you
         create bean definitions. Such IDE assistance is highly
         recommended.</para>
@@ -972,7 +972,7 @@ support=support@example.co.uk</programlisting>
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:p="http://www.springframework.org/schema/p"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
-      http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
+      https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
   &lt;bean name="classic" class="com.example.ExampleBean"&gt;
       &lt;property name="email" value="foo@bar.com"/&gt;
@@ -995,7 +995,7 @@ support=support@example.co.uk</programlisting>
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:p="http://www.springframework.org/schema/p"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
-      http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
+      https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
   &lt;bean name="john-classic" class="com.example.Person"&gt;
       &lt;property name="name" value="John Doe"/&gt;
@@ -1047,7 +1047,7 @@ support=support@example.co.uk</programlisting>
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:c="http://www.springframework.org/schema/c"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
-      http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
+      https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
   &lt;bean id="bar" class="x.y.Bar"/&gt;
   &lt;bean id="baz" class="x.y.Baz"/&gt;
@@ -1475,7 +1475,7 @@ public class CommandManager implements ApplicationContextAware {
 
     <sidebar>
       <para>You can read more about the motivation for Method Injection in
-        <link xl:href="http://blog.springsource.com/2004/08/06/method-injection/"
+        <link xl:href="https://spring.io/blog/2004/08/06/method-injection/"
         >this blog entry</link>.</para>
     </sidebar>
 
diff --git a/src/reference/docbook/beans-extension-points.xml b/src/reference/docbook/beans-extension-points.xml
index d2a0aa80c3..6376fb4f17 100644
--- a/src/reference/docbook/beans-extension-points.xml
+++ b/src/reference/docbook/beans-extension-points.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>Container Extension Points</title>
 
   <para>Typically, an application developer does not need to subclass
@@ -185,9 +185,9 @@ public class InstantiationTracingBeanPostProcessor implements BeanPostProcessor
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:lang="http://www.springframework.org/schema/lang"
      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/lang
-         http://www.springframework.org/schema/lang/spring-lang.xsd"&gt;
+         https://www.springframework.org/schema/lang/spring-lang.xsd"&gt;
 
   &lt;lang:groovy id="messenger"
         script-source="classpath:org/springframework/scripting/groovy/Messenger.groovy"&gt;
diff --git a/src/reference/docbook/beans-java.xml b/src/reference/docbook/beans-java.xml
index 2a76971104..8decc4f885 100644
--- a/src/reference/docbook/beans-java.xml
+++ b/src/reference/docbook/beans-java.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>Java-based container configuration</title>
 
   <section xml:id="beans-java-basic-concepts">
@@ -723,7 +723,7 @@ public static void main(String[] args) {
             <literal>ServiceConfig</literal>, how do you know exactly where the
             <literal>@Autowired AccountRepository</literal> bean is declared?
             It's not explicit in the code, and this may be just fine. Remember
-            that the <link xl:href="http://www.springsource.com/products/sts"
+            that the <link xl:href="https://www.springsource.com/products/sts"
             >SpringSource Tool Suite</link> provides tooling that can render
             graphs showing how everything is wired up - that may be all you
             need. Also, your Java IDE can easily find all declarations and uses
diff --git a/src/reference/docbook/beans-scopes.xml b/src/reference/docbook/beans-scopes.xml
index 05d336edbc..6754d690e7 100644
--- a/src/reference/docbook/beans-scopes.xml
+++ b/src/reference/docbook/beans-scopes.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>Bean scopes</title>
 
   <para>When you create a bean definition, you create a
@@ -99,7 +99,7 @@
     <para>As of Spring 3.0, a <emphasis>thread scope</emphasis> is available,
       but is not registered by default. For more information, see the
       documentation for <link
-      xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/context/support/SimpleThreadScope.html"
+      xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/context/support/SimpleThreadScope.html"
       >SimpleThreadScope</link>. For instructions on how to register this or
       any other custom scope, see <xref
       linkend="beans-factory-scopes-custom-using"/>.</para>
@@ -393,9 +393,9 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:aop="http://www.springframework.org/schema/aop"
      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/aop
-         http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+         https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   <lineannotation>&lt;!-- an HTTP Session-scoped bean exposed as a proxy --&gt;</lineannotation>
   &lt;bean id="userPreferences" class="com.foo.UserPreferences" scope="session"&gt;
@@ -545,7 +545,7 @@
         implement your own scopes, see the <interfacename>Scope</interfacename>
         implementations that are supplied with the Spring Framework itself and
         the <link
-        xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/config/Scope.html"
+        xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/config/Scope.html"
         >Scope Javadoc</link>, which explains the methods you need to implement
         in more detail.</para>
 
@@ -640,9 +640,9 @@ beanFactory.registerScope("thread", threadScope);</programlisting>
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:aop="http://www.springframework.org/schema/aop"
      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/aop
-         http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+         https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;bean class="org.springframework.beans.factory.config.CustomScopeConfigurer"&gt;
       &lt;property name="scopes"&gt;
diff --git a/src/reference/docbook/beans-standard-annotations.xml b/src/reference/docbook/beans-standard-annotations.xml
index 486d14830b..e1baf82326 100644
--- a/src/reference/docbook/beans-standard-annotations.xml
+++ b/src/reference/docbook/beans-standard-annotations.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>Using JSR 330 Standard Annotations</title>
 
   <para>Starting with Spring 3.0, Spring offers support for JSR-330 standard annotations (Dependency Injection).
@@ -17,7 +17,7 @@
       <para>
       If you are using Maven, the <interfacename>javax.inject</interfacename> artifact is available
       in the standard Maven repository
-      (<link xl:href="http://repo1.maven.org/maven2/javax/inject/javax.inject/1/">http://repo1.maven.org/maven2/javax/inject/javax.inject/1/</link>).
+      (<link xl:href="https://repo1.maven.org/maven2/javax/inject/javax.inject/1/">https://repo1.maven.org/maven2/javax/inject/javax.inject/1/</link>).
       You can add the following dependency to your file pom.xml:
       </para>
     <programlisting language="xml">
@@ -170,7 +170,7 @@ component-scanning in the exact same way as when using Spring annotations:
                     </para>
                     <para>
                         <interfacename>javax.inject</interfacename> also provides a
-                        <link xl:href="http://download.oracle.com/javaee/6/api/javax/inject/Scope.html">@Scope</link> annotation.
+                        <link xl:href="https://download.oracle.com/javaee/6/api/javax/inject/Scope.html">@Scope</link> annotation.
                         Nevertheless, this one is only intended to be used for creating your own annotations.
                     </para>
                 </entry>
diff --git a/src/reference/docbook/beans.xml b/src/reference/docbook/beans.xml
index c164c1440b..818fb6bdd3 100644
--- a/src/reference/docbook/beans.xml
+++ b/src/reference/docbook/beans.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>The IoC container</title>
 
   <section xml:id="beans-introduction">
@@ -33,11 +33,11 @@ The footnote should x-ref to first section in that chapter but I can't find the
     <para>The <literal>org.springframework.beans</literal> and
       <literal>org.springframework.context</literal> packages are the basis for
       Spring Framework's IoC container. The <interfacename><link
-      xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/BeanFactory.html"
+      xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/BeanFactory.html"
       >BeanFactory</link></interfacename> interface provides an advanced
       configuration mechanism capable of managing any type of object.
       <literal><link
-      xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/context/ApplicationContext.html"
+      xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/ApplicationContext.html"
       >ApplicationContext</link></literal> is a sub-interface of
       <interfacename>BeanFactory.</interfacename> It adds easier integration
       with Spring's AOP features; message resource handling (for use in
@@ -84,9 +84,9 @@ The footnote should x-ref to first section in that chapter but I can't find the
       <classname>ApplicationContext</classname> interface are supplied
       out-of-the-box with Spring. In standalone applications it is common to
       create an instance of <link
-      xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/context/support/ClassPathXmlApplicationContext.html"
+      xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/context/support/ClassPathXmlApplicationContext.html"
       ><classname>ClassPathXmlApplicationContext</classname></link> or <link
-      xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/context/support/FileSystemXmlApplicationContext.html"
+      xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/context/support/FileSystemXmlApplicationContext.html"
       ><classname>FileSystemXmlApplicationContext</classname></link>.
       <!-- MLP: Beverly to review --> While XML has been the traditional format
       for defining configuration metadata you can instruct the container to use
@@ -99,9 +99,9 @@ The footnote should x-ref to first section in that chapter but I can't find the
       in a web application scenario, a simple eight (or so) lines of boilerplate
       J2EE web descriptor XML in the <literal>web.xml</literal> file of the
       application will typically suffice (see <xref linkend="context-create"/>).
-      If you are using the <link xl:href="http://www.springsource.com/produts/sts"
+      If you are using the <link xl:href="https://www.springsource.com/produts/sts"
       >SpringSource Tool Suite</link> Eclipse-powered development environment
-      or <link xl:href="http://www.springsource.org/roo">Spring Roo</link> this
+      or <link xl:href="https://www.springsource.org/roo">Spring Roo</link> this
       boilerplate configuration can be easily created with few mouse clicks or
       keystrokes.</para>
 
@@ -151,7 +151,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
         <listitem>
           <para><link linkend="beans-java">Java-based configuration</link>:
             Starting with Spring 3.0, many features provided by the <link
-            xl:href="http://www.springsource.org/javaconfig">Spring JavaConfig
+            xl:href="https://www.springsource.org/javaconfig">Spring JavaConfig
             project</link> became part of the core Spring Framework. Thus you
             can define beans external to your application classes by using Java
             rather than XML files. To use these new features, see the
@@ -187,7 +187,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
 &lt;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"&gt;
+           https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
   &lt;bean id="..." class="..."&gt;
     &lt;!-- collaborators and configuration for this bean go here --&gt;
@@ -241,7 +241,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
 &lt;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"&gt;
+           https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
   &lt;!-- services --&gt;
 
@@ -264,7 +264,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
 &lt;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"&gt;
+           https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
   &lt;bean id="accountDao"
       class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapAccountDao"&gt;
@@ -282,7 +282,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
       <para>In the preceding example, the service layer consists of the class
         <classname>PetStoreServiceImpl</classname>, and two data access objects
         of the type <classname>SqlMapAccountDao</classname> and SqlMapItemDao
-        are based on the <link xl:href="http://ibatis.apache.org/">iBatis</link>
+        are based on the <link xl:href="https://ibatis.apache.org/">iBatis</link>
         Object/Relational mapping framework. The <literal>property
         name</literal> element refers to the name of the JavaBean property, and
         the <literal>ref</literal> element refers to the name of another bean
@@ -1177,10 +1177,10 @@ cfg.postProcessBeanFactory(factory);</programlisting>
         a single ApplicationContext as a parent to WebApplicationContexts across
         WAR files. In this case you should look into using the utility class
         <link
-        xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/context/access/ContextSingletonBeanFactoryLocator.html"
+        xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/context/access/ContextSingletonBeanFactoryLocator.html"
         ><classname>ContextSingletonBeanFactoryLocator</classname></link>
         locator that is described in this <link
-        xl:href="http://blog.springsource.com/2007/06/11/using-a-shared-parent-application-context-in-a-multi-war-spring-application/"
+        xl:href="https://spring.io/blog/2007/06/11/using-a-shared-parent-application-context-in-a-multi-war-spring-application/"
         >SpringSource team blog entry</link>.</para>
     </section>
   </section>
diff --git a/src/reference/docbook/cache.xml b/src/reference/docbook/cache.xml
index 040b6fa5e3..9ac276cca4 100644
--- a/src/reference/docbook/cache.xml
+++ b/src/reference/docbook/cache.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>Cache Abstraction</title>
 
     <section xml:id="cache-introduction">
@@ -32,7 +32,7 @@
     performance but does that by allowing the same data to be read multiple times in a fast fashion.</para>
 
     <para>A further explanation of the differences between two can be found
-    <link xl:href="http://en.wikipedia.org/wiki/Cache#The_difference_between_buffer_and_cache">here</link>.</para>
+    <link xl:href="https://en.wikipedia.org/wiki/Cache#The_difference_between_buffer_and_cache">here</link>.</para>
     </sidebar>
 
     <para>At its core, the abstraction applies caching to Java methods, reducing thus the number of executions based on the
@@ -57,7 +57,7 @@
     <para>Note that just like other services in Spring Framework, the caching service is an abstraction (not a cache implementation) and requires
     the use of an actual storage to store the cache data - that is, the abstraction frees the developer from having to write the caching
     logic but does not provide the actual stores. There are two integrations available out of the box, for JDK <literal>java.util.concurrent.ConcurrentMap</literal>
-    and <link xl:href="http://ehcache.org/">EhCache</link> - see <xref linkend="cache-plug"/> for more information on plugging in other cache stores/providers.</para>
+    and <link xl:href="https://www.ehcache.org/">EhCache</link> - see <xref linkend="cache-plug"/> for more information on plugging in other cache stores/providers.</para>
     </section>
 
     <section xml:id="cache-annotations">
@@ -305,8 +305,8 @@ public class AppConfig {
 
         <programlisting language="xml"><![CDATA[<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"]]>
     <emphasis role="bold">xmlns:cache="http://www.springframework.org/schema/cache"</emphasis><![CDATA[
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd]]>
-        <emphasis role="bold">http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd</emphasis><![CDATA[">]]>
+    xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd]]>
+        <emphasis role="bold">http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd</emphasis><![CDATA[">]]>
     <emphasis role="bold"><![CDATA[<cache:annotation-driven />]]></emphasis>
 <![CDATA[</beans>]]></programlisting>
 
@@ -577,7 +577,7 @@ public Book findBook(ISBN isbn, boolean checkWarehouse, boolean includeUsed)]]><
 
         <para>GemFire is a memory-oriented/disk-backed, elastically scalable, continuously available, active (with built-in pattern-based subscription notifications),
         globally replicated database and provides fully-featured edge caching. For further information on how to use GemFire as a CacheManager (and more), please refer
-        to the <link xl:href="http://static.springsource.org/spring-gemfire/docs/1.0.0.RELEASE/reference/html/">Spring GemFire reference documentation</link>.</para>
+        to the <link xl:href="https://docs.spring.io/spring-gemfire/docs/1.0.0.RELEASE/reference/html/">Spring GemFire reference documentation</link>.</para>
     </section>
 
     <section xml:id="cache-store-configuration-noop">
@@ -607,7 +607,7 @@ public Book findBook(ISBN isbn, boolean checkWarehouse, boolean includeUsed)]]><
 
     <para>Clearly there are plenty of caching products out there that can be used as a backing store. To plug them in, one needs to provide a <interfacename>CacheManager</interfacename> and
     <interfacename>Cache</interfacename> implementation since unfortunately there is no available standard that we can use instead. This may sound harder then it is since in practice,
-    the classes tend to be simple <link xl:href="http://en.wikipedia.org/wiki/Adapter_pattern">adapter</link>s that map the caching abstraction framework on top of the storage API as the <literal>ehcache</literal> classes can show.
+    the classes tend to be simple <link xl:href="https://en.wikipedia.org/wiki/Adapter_pattern">adapter</link>s that map the caching abstraction framework on top of the storage API as the <literal>ehcache</literal> classes can show.
     Most <interfacename>CacheManager</interfacename> classes can use the classes in <literal>org.springframework.cache.support</literal> package, such as <classname>AbstractCacheManager</classname>
     which takes care of the boiler-plate code leaving only the actual <emphasis>mapping</emphasis> to be completed. We hope that in time, the libraries that provide integration with Spring
     can fill in this small configuration gap.</para>
diff --git a/src/reference/docbook/cci.xml b/src/reference/docbook/cci.xml
index 051d587da5..d3b977704a 100644
--- a/src/reference/docbook/cci.xml
+++ b/src/reference/docbook/cci.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>JCA CCI</title>
 
   <section xml:id="cci-introduction">
diff --git a/src/reference/docbook/classic-aop-spring.xml b/src/reference/docbook/classic-aop-spring.xml
index 68cb0d62db..c52caef4a1 100644
--- a/src/reference/docbook/classic-aop-spring.xml
+++ b/src/reference/docbook/classic-aop-spring.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>Classic Spring AOP Usage</title>
 
   <para>In this appendix we discuss
diff --git a/src/reference/docbook/classic-spring.xml b/src/reference/docbook/classic-spring.xml
index fe44039b83..a2ccb05978 100644
--- a/src/reference/docbook/classic-spring.xml
+++ b/src/reference/docbook/classic-spring.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>Classic Spring Usage</title>
 
   <para>This appendix discusses some classic Spring usage patterns as a
diff --git a/src/reference/docbook/dao.xml b/src/reference/docbook/dao.xml
index 98fe5c226c..a1cc09cec3 100644
--- a/src/reference/docbook/dao.xml
+++ b/src/reference/docbook/dao.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>DAO support</title>
 
   <section xml:id="dao-introduction">
diff --git a/src/reference/docbook/dynamic-languages.xml b/src/reference/docbook/dynamic-languages.xml
index 2cbed3a10a..c6f1f8bcf7 100644
--- a/src/reference/docbook/dynamic-languages.xml
+++ b/src/reference/docbook/dynamic-languages.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>Dynamic language support</title>
 
   <section xml:id="dynamic-language-introduction">
@@ -23,7 +23,7 @@
         There is nothing stopping the inclusion of further languages though. If you want
         to see support for &lt;<emphasis>insert your favourite dynamic language here</emphasis>&gt;,
         you can always raise an issue on Spring's
-        <link xl:href="http://opensource.atlassian.com/projects/spring/secure/Dashboard.jspa">JIRA</link>
+        <link xl:href="https://opensource.atlassian.com/projects/spring/secure/Dashboard.jspa">JIRA</link>
         page (or implement such support yourself).
       </para>
     </sidebar>
@@ -130,8 +130,8 @@ class GroovyMessenger implements Messenger {
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:lang="http://www.springframework.org/schema/lang"
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang.xsd">
 
     ]]><lineannotation>&lt;!-- this is the bean definition for the Groovy-backed Messenger implementation --&gt;</lineannotation><![CDATA[
     <lang:groovy id="messenger" script-source="classpath:Messenger.groovy">
@@ -1041,8 +1041,8 @@ class TestBeanValidator implements Validator {
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:lang="http://www.springframework.org/schema/lang"
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang.xsd">
 
     <lang:groovy id="messenger" script-source="classpath:Messenger.groovy" ]]><lineannotation>scope="prototype"</lineannotation><![CDATA[>
         <lang:property name="message" value="I Can Do The RoboCop" />
@@ -1068,10 +1068,10 @@ http://www.springframework.org/schema/lang http://www.springframework.org/schema
     </para>
     <itemizedlist>
       <listitem>
-        <para>The <link xl:href="http://jruby.codehaus.org/">JRuby</link> homepage</para>
+        <para>The <link xl:href="https://jruby.codehaus.org/">JRuby</link> homepage</para>
       </listitem>
       <listitem>
-        <para>The <link xl:href="http://groovy.codehaus.org/">Groovy</link> homepage</para>
+        <para>The <link xl:href="https://groovy.codehaus.org/">Groovy</link> homepage</para>
       </listitem>
       <listitem>
         <para>The <link xl:href="http://www.beanshell.org/">BeanShell</link> homepage</para>
diff --git a/src/reference/docbook/ejb.xml b/src/reference/docbook/ejb.xml
index 3ebf18a009..1ca0d182d9 100644
--- a/src/reference/docbook/ejb.xml
+++ b/src/reference/docbook/ejb.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>Enterprise JavaBeans (EJB) integration</title>
 
     <section xml:id="ejb-introduction">
diff --git a/src/reference/docbook/expressions.xml b/src/reference/docbook/expressions.xml
index d13951a5f3..5cb6820b4d 100644
--- a/src/reference/docbook/expressions.xml
+++ b/src/reference/docbook/expressions.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 Expression Language (SpEL)</title>
 
   <section xml:id="expressions-intro">
@@ -960,7 +960,7 @@ String queryResultString =
       <title>The Elvis Operator</title>
 
       <para>The Elvis operator is a shortening of the ternary operator syntax
-      and is used in the <link xl:href="http://groovy.codehaus.org/Operators#Operators-ElvisOperator(%3F%3A)">Groovy</link>
+      and is used in the <link xl:href="https://groovy.codehaus.org/Operators#Operators-ElvisOperator(%3F%3A)">Groovy</link>
       language. With the ternary operator syntax you usually have to repeat a
       variable twice, for example:</para>
 
@@ -1001,7 +1001,7 @@ System.out.println(name); // Elvis Presley</programlisting>
 
       <para>The Safe Navigation operator is used to avoid a
       <literal>NullPointerException</literal> and comes from the <link
-      xl:href="http://groovy.codehaus.org/Operators#Operators-SafeNavigationOperator(%3F.)">Groovy</link>
+      xl:href="https://groovy.codehaus.org/Operators#Operators-SafeNavigationOperator(%3F.)">Groovy</link>
       language. Typically when you have a reference to an object you might
       need to verify that it is not null before accessing methods or
       properties of the object. To avoid this, the safe navigation operator
diff --git a/src/reference/docbook/images/ejb.svg b/src/reference/docbook/images/ejb.svg
index d8b275784a..d7aa88684f 100644
--- a/src/reference/docbook/images/ejb.svg
+++ b/src/reference/docbook/images/ejb.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "https://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <!-- Generated by Microsoft Visio 11.0, SVG Export, v1.0 ejb.svg Page-1 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="4.25667in"
 		height="2.64in" viewBox="0 0 306.48 190.08" xml:space="preserve" color-interpolation-filters="sRGB" class="st9">
diff --git a/src/reference/docbook/images/full.svg b/src/reference/docbook/images/full.svg
index 31b18f916f..0a4d069484 100644
--- a/src/reference/docbook/images/full.svg
+++ b/src/reference/docbook/images/full.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "https://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <!-- Generated by Microsoft Visio 11.0, SVG Export, v1.0 full.svg Page-1 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="4.97167in"
 		height="3.59998in" viewBox="0 0 357.96 259.199" xml:space="preserve" color-interpolation-filters="sRGB" class="st9">
diff --git a/src/reference/docbook/images/remoting.svg b/src/reference/docbook/images/remoting.svg
index 2b2d59337b..65690bf332 100644
--- a/src/reference/docbook/images/remoting.svg
+++ b/src/reference/docbook/images/remoting.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "https://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <!-- Generated by Microsoft Visio 11.0, SVG Export, v1.0 remoting.svg Page-1 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="4.70667in"
 		height="2.65333in" viewBox="0 0 338.88 191.04" xml:space="preserve" color-interpolation-filters="sRGB" class="st9">
diff --git a/src/reference/docbook/images/spring-overview.svg b/src/reference/docbook/images/spring-overview.svg
index dc5f41612f..422516c329 100644
--- a/src/reference/docbook/images/spring-overview.svg
+++ b/src/reference/docbook/images/spring-overview.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "https://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <!-- Generated by Microsoft Visio 11.0, SVG Export, v1.0 spring-overview.svg Page-1 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="8.26772in"
 		height="11.6929in" viewBox="0 0 595.276 841.89" xml:space="preserve" color-interpolation-filters="sRGB" class="st5">
diff --git a/src/reference/docbook/images/thirdparty-web.svg b/src/reference/docbook/images/thirdparty-web.svg
index a3966dbefb..494cfb9106 100644
--- a/src/reference/docbook/images/thirdparty-web.svg
+++ b/src/reference/docbook/images/thirdparty-web.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "https://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <!-- Generated by Microsoft Visio 11.0, SVG Export, v1.0 thirdparty-web.svg Page-1 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="4.90667in"
 		height="3.29238in" viewBox="0 0 353.28 237.051" xml:space="preserve" color-interpolation-filters="sRGB" class="st9">
diff --git a/src/reference/docbook/index.xml b/src/reference/docbook/index.xml
index a3e2c92d5c..c59668aa81 100644
--- a/src/reference/docbook/index.xml
+++ b/src/reference/docbook/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 Framework Reference Documentation</title>
@@ -203,7 +203,7 @@
       <para>This document is a reference guide to Spring Framework features.
       If you have any requests, comments, or questions on this document,
       please post them on the user mailing list or on the support forums at
-      <link xl:href="http://forum.springsource.org/"></link>.<!-- Missing link above. PDF shows it as http://forum.springsource.org/ --></para>
+      <link xl:href="https://forum.spring.io/"></link>.<!-- Missing link above. PDF shows it as https://forum.spring.io/ --></para>
     </partintro>
 
     <xi:include href="overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/src/reference/docbook/jdbc.xml b/src/reference/docbook/jdbc.xml
index 6c87dd8adb..7f8969e8fb 100644
--- a/src/reference/docbook/jdbc.xml
+++ b/src/reference/docbook/jdbc.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>Data access with JDBC</title>
 
   <section xml:id="jdbc-introduction">
@@ -453,9 +453,9 @@ private static final class ActorMapper implements RowMapper&lt;Actor&gt; {
     xmlns:context="http://www.springframework.org/schema/context"
     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/context
-        http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+        https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     &lt;bean id="corporateEventDao" class="com.example.JdbcCorporateEventDao"&gt;
         &lt;property name="dataSource" ref="dataSource"/&gt;
@@ -502,9 +502,9 @@ public class JdbcCorporateEventDao implements CorporateEventDao {
     xmlns:context="http://www.springframework.org/schema/context"
     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/context
-        http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+        https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     &lt;!-- Scans within the base package of the application for @Components to configure as beans --&gt;
     &lt;context:component-scan base-package="org.springframework.docs.test" /&gt;
@@ -623,7 +623,7 @@ public int countOfActorsByFirstName(String firstName) {
       <classname>BeanPropertySqlParameterSource</classname> class. This class
       wraps an arbitrary JavaBean (that is, an instance of a class that
       adheres to <link
-      xl:href="http://java.sun.com/products/javabeans/docs/spec.html">the JavaBean
+      xl:href="https://java.sun.com/products/javabeans/docs/spec.html">the JavaBean
       conventions</link>), and uses the properties of the wrapped JavaBean as
       the source of named parameter values.</para>
 
@@ -2669,8 +2669,8 @@ SqlTypeValue value = new AbstractSqlTypeValue() {
     <para>The <literal>org.springframework.jdbc.datasource.embedded</literal>
     package provides support for embedded Java database engines. Support for
     <link xl:href="http://www.hsqldb.org">HSQL</link>, <link
-    xl:href="http://www.h2database.com">H2</link>, and <link
-    xl:href="http://db.apache.org/derby">Derby</link> is provided natively. You
+    xl:href="https://www.h2database.com">H2</link>, and <link
+    xl:href="https://db.apache.org/derby">Derby</link> is provided natively. You
     can also use an extensible API to plug in new embedded database types and
     <classname>DataSource</classname> implementations.</para>
 
diff --git a/src/reference/docbook/jms.xml b/src/reference/docbook/jms.xml
index 23b24fc249..9ff927f488 100644
--- a/src/reference/docbook/jms.xml
+++ b/src/reference/docbook/jms.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>JMS (Java Message Service)</title>
 
   <section xml:id="jms-introduction">
@@ -922,8 +922,8 @@ public interface SessionAwareMessageListener {
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        <emphasis role="bold">xmlns:jms="http://www.springframework.org/schema/jms"</emphasis>
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-<emphasis role="bold">http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms.xsd"</emphasis>&gt;
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+<emphasis role="bold">http://www.springframework.org/schema/jms https://www.springframework.org/schema/jms/spring-jms.xsd"</emphasis>&gt;
 
 <lineannotation>&lt;!-- &lt;bean/&gt; definitions here --&gt;</lineannotation>
 
diff --git a/src/reference/docbook/jmx.xml b/src/reference/docbook/jmx.xml
index 05e8588ebf..8915c49469 100644
--- a/src/reference/docbook/jmx.xml
+++ b/src/reference/docbook/jmx.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>JMX</title>
 
   <section xml:id="jmx-introduction">
@@ -1617,15 +1617,15 @@ public class JmxTestBean implements IJmxTestBean, NotificationPublisherAware {
 
     <itemizedlist>
       <listitem>
-        <para>The <link xl:href="http://java.sun.com/products/JavaManagement/">JMX homepage</link> at Sun</para>
+        <para>The <link xl:href="https://java.sun.com/products/JavaManagement/">JMX homepage</link> at Sun</para>
       </listitem>
 
       <listitem>
-        <para>The <link xl:href="http://jcp.org/aboutJava/communityprocess/final/jsr003/index3.html">JMX specification</link> (JSR-000003)</para>
+        <para>The <link xl:href="https://jcp.org/aboutJava/communityprocess/final/jsr003/index3.html">JMX specification</link> (JSR-000003)</para>
       </listitem>
 
       <listitem>
-        <para>The <link xl:href="http://jcp.org/aboutJava/communityprocess/final/jsr160/index.html">JMX Remote API specification</link> (JSR-000160)</para>
+        <para>The <link xl:href="https://jcp.org/aboutJava/communityprocess/final/jsr160/index.html">JMX Remote API specification</link> (JSR-000160)</para>
       </listitem>
 
       <listitem>
@@ -1635,7 +1635,7 @@ public class JmxTestBean implements IJmxTestBean, NotificationPublisherAware {
       </listitem>
 
       <listitem>
-        <para><link xl:href="http://java.sun.com/developer/technicalArticles/J2SE/jmx.html">Getting Started with JMX</link> - an introductory article from Sun.</para>
+        <para><link xl:href="https://java.sun.com/developer/technicalArticles/J2SE/jmx.html">Getting Started with JMX</link> - an introductory article from Sun.</para>
       </listitem>
     </itemizedlist>
   </section>
diff --git a/src/reference/docbook/mail.xml b/src/reference/docbook/mail.xml
index bcc1325fd4..6597d226d8 100644
--- a/src/reference/docbook/mail.xml
+++ b/src/reference/docbook/mail.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>Email</title>
 
   <section xml:id="mail-introduction">
@@ -17,10 +17,10 @@
         application in order to be able to use the Spring Framework's email library.</para>
         <itemizedlist>
             <listitem>
-                <para>The <link xl:href="http://java.sun.com/products/javamail/">JavaMail</link> <filename class="libraryfile">mail.jar</filename> library</para>
+                <para>The <link xl:href="https://java.sun.com/products/javamail/">JavaMail</link> <filename class="libraryfile">mail.jar</filename> library</para>
             </listitem>
             <listitem>
-                <para>The <link xl:href="http://java.sun.com/products/javabeans/jaf/downloads/index.html">JAF</link> <filename class="libraryfile">activation.jar</filename> library</para>
+                <para>The <link xl:href="https://java.sun.com/products/javabeans/jaf/downloads/index.html">JAF</link> <filename class="libraryfile">activation.jar</filename> library</para>
             </listitem>
         </itemizedlist>
         <para>All of these libraries are freely available on the web.</para>
@@ -303,7 +303,7 @@ sender.send(message);]]></programlisting>
             to create email content.</para>
             <section xml:id="mail-templates-example">
                 <title>A Velocity-based example</title>
-                <para>To use <link xl:href="http://velocity.apache.org">Velocity</link> to
+                <para>To use <link xl:href="https://velocity.apache.org">Velocity</link> to
                 create your email template(s), you will need to have the Velocity libraries
                 available on your classpath. You will also need to create one or more Velocity templates
                 for the email content that your application needs. Find below the Velocity
@@ -376,7 +376,7 @@ public class SimpleRegistrationService implements RegistrationService {
 <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">
 
    <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
       <property name="host" value="mail.csonth.gov.uk"/>
diff --git a/src/reference/docbook/migration-3.1.xml b/src/reference/docbook/migration-3.1.xml
index 15ca8d4979..af8fcfd66e 100644
--- a/src/reference/docbook/migration-3.1.xml
+++ b/src/reference/docbook/migration-3.1.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>Migrating to Spring Framework 3.1</title>
 
   <para>In this appendix we discuss what users will want to know when upgrading to
diff --git a/src/reference/docbook/migration-3.2.xml b/src/reference/docbook/migration-3.2.xml
index 79f5c9150c..5632ddd6c2 100644
--- a/src/reference/docbook/migration-3.2.xml
+++ b/src/reference/docbook/migration-3.2.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>Migrating to Spring Framework 3.2</title>
 
   <para>In this appendix we discuss what users will want to know when upgrading to
@@ -60,7 +60,7 @@
     <title>For OSGi users</title>
     <para>OSGi metadata is no longer published within individual Spring Framework
     jar MANIFEST.MF files. Please see this
-    <link xl:href="http://www.springsource.org/springframework-ebr">announcement</link>
+    <link xl:href="https://www.springsource.org/springframework-ebr">announcement</link>
     for more information about how users can get OSGi-ready versions of Spring
     Framework 3.2 jars.</para>
   </section>
@@ -158,10 +158,10 @@
       means of understanding what's changed between versions. Going forward these will be
       published between each minor version, e.g. from 3.1.3.RELEASE to 3.1.4.RELEASE; from
       the latest maintenance version to the latest GA release, e.g.
-      <link xl:href="http://static.springsource.org/spring-framework/docs/3.1.3.RELEASE_to_3.2.0.RELEASE">
+      <link xl:href="https://docs.spring.io/spring-framework/docs/3.1.3.RELEASE_to_3.2.0.RELEASE">
       3.1.3.RELEASE to 3.2.0.RELEASE</link>; and in between each milestone
       and/or RC for users who are tracking next-generation development, e.g.
-      <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RC2_to_3.2.0.RELEASE">
+      <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RC2_to_3.2.0.RELEASE">
       3.2.0.RC2 to 3.2.0.RELEASE</link>.
       </para>
     </section>
@@ -171,183 +171,183 @@
       <para>The following packages and types have been wholly or partially deprecated
       in Spring Framework 3.2 and may be removed in a future version. Click through
       to the linked Javadoc for each item for exact details. See also the
-      <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/deprecated-list.html">
+      <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/deprecated-list.html">
       complete list of deprecations</link> in the framework.</para>
       <itemizedlist>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/orm/ibatis/package-summary.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/orm/ibatis/package-summary.html">
           org.springframework.orm.ibatis</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/scheduling/backportconcurrent/package-summary.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/scheduling/backportconcurrent/package-summary.html">
           org.springframework.scheduling.backportconcurrent</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/ejb/support/package-summary.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/ejb/support/package-summary.html">
           org.springframework.ejb.support</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.html">
           org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/jsf/DelegatingVariableResolver.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/jsf/DelegatingVariableResolver.html">
           org.springframework.web.jsf.DelegatingVariableResolver</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/jsf/SpringBeanVariableResolver.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/jsf/SpringBeanVariableResolver.html">
           org.springframework.web.jsf.SpringBeanVariableResolver</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/ui/velocity/CommonsLoggingLogSystem.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/ui/velocity/CommonsLoggingLogSystem.html">
           org.springframework.ui.velocity.CommonsLoggingLogSystem</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/ui/velocity/VelocityEngineUtils.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/ui/velocity/VelocityEngineUtils.html">
           org.springframework.ui.velocity.VelocityEngineUtils</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/beans/factory/config/BeanReferenceFactoryBean.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/beans/factory/config/BeanReferenceFactoryBean.html">
           org.springframework.beans.factory.config.BeanReferenceFactoryBean</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/beans/factory/config/CommonsLogFactoryBean.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/beans/factory/config/CommonsLogFactoryBean.html">
           org.springframework.beans.factory.config.CommonsLogFactoryBean</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.html">
           org.springframework.beans.instrument.classloading.oc4j.OC4JLoadTimeWeaver</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/transaction/jta/OC4JJtaTransactionManager.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/transaction/jta/OC4JJtaTransactionManager.html">
           org.springframework.transaction.jta.OC4JJtaTransactionManager</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/util/ExpressionEvaluationUtils.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/util/ExpressionEvaluationUtils.html">
           org.springframework.web.util.ExpressionEvaluationUtils</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.html">
           org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.html">
           org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerExceptionResolver</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.html">
           org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.html">
           org.springframework.web.servlet.mvc.annotation.ServletAnnotationMappingUtils</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/jmx/support/MBeanRegistrationSupport.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/jmx/support/MBeanRegistrationSupport.html">
           org.springframework.jmx.support.MBeanRegistrationSupport</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/test/context/ContextConfigurationAttributes.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/test/context/ContextConfigurationAttributes.html">
           org.springframework.test.context.ContextConfigurationAttributes</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.html">
           org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests</link>:
           use of the <varname>simpleJdbcTemplate</varname> instance variable has been deprecated
           in favor of the new <varname>jdbcTemplate</varname> instance variable.</para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.html">
           org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests</link>:
           use of the <varname>simpleJdbcTemplate</varname> instance variable has been deprecated
           in favor of the new <varname>jdbcTemplate</varname> instance variable.</para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/test/jdbc/SimpleJdbcTestUtils.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/test/jdbc/SimpleJdbcTestUtils.html">
           org.springframework.test.jdbc.SimpleJdbcTestUtils</link> has been deprecated in
           favor of <classname>JdbcTestUtils</classname> which now contains all of the
           functionality previously available in <classname>SimpleJdbcTestUtils</classname>.</para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.html">
           org.springframework.web.servlet.view.ContentNegotiatingViewResolver</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/transaction/interceptor/TransactionAspectUtils.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/transaction/interceptor/TransactionAspectUtils.html">
           org.springframework.transaction.interceptor.TransactionAspectUtils</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/http/HttpStatus.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/http/HttpStatus.html">
           org.springframework.http.HttpStatus</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/util/UriUtils.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/web/util/UriUtils.html">
           org.springframework.web.util.UriUtils</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.html">
           org.springframework.orm.jpa.vendor.TopLinkJpaDialect</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.html">
           org.springframework.orm.jpa.vendor.TopLinkJpaVendorAdapter</link>
           </para>
         </listitem>
         <listitem>
           <para>
-          <link xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/util/CachingMapDecorator.html">
+          <link xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.RELEASE/javadoc-api/org/springframework/util/CachingMapDecorator.html">
           org.springframework.orm.util.CachingMapDecorator</link>
           </para>
         </listitem>
diff --git a/src/reference/docbook/mvc.xml b/src/reference/docbook/mvc.xml
index 6d1101cf03..07e0263d19 100644
--- a/src/reference/docbook/mvc.xml
+++ b/src/reference/docbook/mvc.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>Web MVC framework</title>
 
   <section xml:id="mvc-introduction">
@@ -749,9 +749,9 @@ public class HelloWorldController {
     xmlns:context="http://www.springframework.org/schema/context"
     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/context
-        http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+        https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     &lt;context:component-scan base-package="org.springframework.samples.petclinic.web"/&gt;
 
@@ -958,13 +958,13 @@ public class ClinicController {
         <para>A URI Template is a URI-like string, containing one or more
         variable names. When you substitute values for these variables, the
         template becomes a URI. The <link
-        xl:href="http://bitworking.org/projects/URI-Templates/">proposed
+        xl:href="https://bitworking.org/projects/URI-Templates/">proposed
         RFC</link> for URI Templates defines how a URI is parameterized. For
         example, the URI Template
-        <code>http://www.example.com/users/{userId}</code> contains the
+        <code>https://www.example.com/users/{userId}</code> contains the
         variable <emphasis>userId</emphasis>. Assigning the value
         <emphasis>fred</emphasis> to the variable yields
-        <code>http://www.example.com/users/fred</code>.</para>
+        <code>https://www.example.com/users/fred</code>.</para>
 
         <para>In Spring MVC you can use the
         <interfacename>@PathVariable</interfacename> annotation on a method
@@ -1096,11 +1096,11 @@ public class RelativePathUriTemplateController {
         <title>Matrix Variables</title>
 
         <para>The URI specification
-        <link xl:href="http://tools.ietf.org/html/rfc3986#section-3.3">RFC 3986</link>
+        <link xl:href="https://tools.ietf.org/html/rfc3986#section-3.3">RFC 3986</link>
         defines the possibility of including name-value pairs within path segments.
         There is no specific term used in the spec.
         The general "URI path parameters" could be applied although the more unique
-        <link xl:href="http://www.w3.org/DesignIssues/MatrixURIs.html">"Matrix URIs"</link>,
+        <link xl:href="https://www.w3.org/DesignIssues/MatrixURIs.html">"Matrix URIs"</link>,
         originating from an old post by Tim Berners-Lee, is also frequently used
         and fairly well known. Within Spring MVC these are referred to
         as matrix variables.</para>
@@ -2514,7 +2514,7 @@ deferredResult.setResult(data);
 
       <para>Explaining the motivation for async request processing and when or why to use it
       are beyond the scope of this document. For further information you may wish to read
-      <link xl:href="http://blog.springsource.org/2012/05/06/spring-mvc-3-2-preview-introducing-servlet-3-async-support/">this blog post series</link>.
+      <link xl:href="https://blog.springsource.org/2012/05/06/spring-mvc-3-2-preview-introducing-servlet-3-async-support/">this blog post series</link>.
       </para>
 
       <section xml:id="mvc-ann-async-exceptions">
@@ -2598,7 +2598,7 @@ deferredResult.setResult(data);
 
           <programlisting language="xml">&lt;web-app 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-app_3_0.xsd"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     version="3.0"&gt;
 
     ...
@@ -2835,7 +2835,7 @@ public class TimeBasedAccessInterceptor extends HandlerInterceptorAdapter {
         if (openingTime &lt;= hour &amp;&amp; hour &lt; closingTime) {
             return true;
         } else {
-            response.sendRedirect("http://host.com/outsideOfficeHours.html");
+            response.sendRedirect("https://host.com/outsideOfficeHours.html");
             return false;
         }
     }
@@ -3219,7 +3219,7 @@ public String upload(...) {
         simply operate in terms of logical view names. A logical view name
         such as <literal>redirect:/myapp/some/resource</literal> will redirect
         relative to the current Servlet context, while a name such as
-        <literal>redirect:http://myhost.com/some/arbitrary/path</literal> will
+        <literal>redirect:https://myhost.com/some/arbitrary/path</literal> will
         redirect to an absolute URL.</para>
       </section>
 
@@ -3260,9 +3260,9 @@ public String upload(...) {
         <listitem>
           <para>Use a distinct URI for each resource, typically by using a
           different file extension in the URI. For example, the URI<literal>
-          http://www.example.com/users/fred.pdf</literal> requests a PDF
+          https://www.example.com/users/fred.pdf</literal> requests a PDF
           representation of the user fred, and
-          <literal>http://www.example.com/users/fred.xml</literal> requests an
+          <literal>https://www.example.com/users/fred.xml</literal> requests an
           XML representation.</para>
         </listitem>
       </itemizedlist>
@@ -3271,15 +3271,15 @@ public String upload(...) {
         <listitem>
           <para>Use the same URI for the client to locate the resource, but
           set the <literal>Accept</literal> HTTP request header to list the
-          <link xl:href="http://en.wikipedia.org/wiki/Internet_media_type">media
+          <link xl:href="https://en.wikipedia.org/wiki/Internet_media_type">media
           types</link> that it understands. For example, an HTTP request for
-          <literal>http://www.example.com/users/fred</literal> with an
+          <literal>https://www.example.com/users/fred</literal> with an
           <literal>Accept</literal> header set to <literal>application/pdf
           </literal>requests a PDF representation of the user fred, while
-          <literal>http://www.example.com/users/fred</literal> with an
+          <literal>https://www.example.com/users/fred</literal> with an
           <literal>Accept</literal> header set to <literal>text/xml</literal>
           requests an XML representation. This strategy is known as <link
-          xl:href="http://en.wikipedia.org/wiki/Content_negotiation">content
+          xl:href="https://en.wikipedia.org/wiki/Content_negotiation">content
           negotiation</link>.</para>
         </listitem>
       </itemizedlist>
@@ -3492,7 +3492,7 @@ public class ContentController {
     <para>For example you can expand and encode a URI template string:</para>
 
 <programlisting language="java">UriComponents uriComponents =
-        UriComponentsBuilder.fromUriString("http://example.com/hotels/{hotel}/bookings/{booking}").build();
+        UriComponentsBuilder.fromUriString("https://example.com/hotels/{hotel}/bookings/{booking}").build();
 
 URI uri = uriComponents.expand("42", "21").encode().toUri();
 </programlisting>
@@ -3680,7 +3680,7 @@ ServletUriComponentsBuilder ucb =
       <literal>*.view</literal> resources containing a parameter named
       <literal>siteLanguage</literal> will now change the locale. So, for
       example, a request for the following URL,
-      <literal>http://www.sf.net/home.view?siteLanguage=nl</literal> will
+      <literal>https://www.sf.net/home.view?siteLanguage=nl</literal> will
       change the site language to Dutch.</para>
 
       <programlisting language="xml">&lt;bean id="localeChangeInterceptor"
@@ -3847,7 +3847,7 @@ background=/themes/cool/img/coolBg.jpg</programlisting>
       <literal>org.springframework.web.multipart</literal> package. Spring
       provides one <interfacename>MultipartResolver</interfacename>
       implementation for use with <link
-      xl:href="http://jakarta.apache.org/commons/fileupload"> <emphasis>Commons
+      xl:href="https://jakarta.apache.org/commons/fileupload"> <emphasis>Commons
       FileUpload</emphasis></link> and another for use with Servlet 3.0
       multipart request parsing.</para>
 
@@ -4627,7 +4627,7 @@ public class ErrorController {
     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"&gt;
+        https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     <lineannotation>&lt;!-- this bean with the well known name generates view names for us --&gt;</lineannotation>
     &lt;bean id="viewNameTranslator"
@@ -4686,7 +4686,7 @@ public class ErrorController {
   <section xml:id="mvc-etag">
     <title>ETag support</title>
 
-    <para>An <link xl:href="http://en.wikipedia.org/wiki/HTTP_ETag">ETag</link>
+    <para>An <link xl:href="https://en.wikipedia.org/wiki/HTTP_ETag">ETag</link>
     (entity tag) is an HTTP response header returned by an HTTP/1.1 compliant
     web server used to determine change in content at a given URL. It can be
     considered to be the more sophisticated successor to the
@@ -4879,9 +4879,9 @@ public class WebConfig {
     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
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc.xsd"&gt;
+        https://www.springframework.org/schema/mvc/spring-mvc.xsd"&gt;
 
     &lt;mvc:annotation-driven /&gt;
 
@@ -5025,7 +5025,7 @@ public class WebConfig extends WebMvcConfigurerAdapter {
         <para>To customize the default configuration of
         <literal>&lt;mvc:annotation-driven /&gt;</literal> check what
         attributes and sub-elements it supports. You can view the
-        <link xl:href="http://static.springsource.org/schema/mvc/spring-mvc.xsd">Spring MVC XML schema</link>
+        <link xl:href="https://schema.spring.io/mvc/spring-mvc.xsd">Spring MVC XML schema</link>
         or use the code completion feature of your IDE to discover
         what attributes and sub-elements are available.
         The sample below shows a subset of what is available:</para>
@@ -5412,7 +5412,7 @@ public class WebConfig extends WebMvcConfigurerAdapter {
         <listitem>
           <para>There are many excellent articles and tutorials that show how to
           build web applications with Spring MVC. Read them at the <link
-          xl:href="http://www.springsource.org/documentation">Spring
+          xl:href="https://www.springsource.org/documentation">Spring
           Documentation</link> page.</para>
         </listitem>
 
diff --git a/src/reference/docbook/new-in-3.0.xml b/src/reference/docbook/new-in-3.0.xml
index 41136fd450..770c614988 100644
--- a/src/reference/docbook/new-in-3.0.xml
+++ b/src/reference/docbook/new-in-3.0.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>New Features and Enhancements in Spring Framework 3.0</title>
 
   <para>If you have been using the Spring Framework for some time, you will be
@@ -57,7 +57,7 @@
     this documentation, some errors may nevertheless have crept in. If you do
     spot any typos or even more serious errors, and you can spare a few cycles
     during lunch, please do bring the error to the attention of the Spring
-    team by <link xl:href="http://jira.springframework.org/">raising an
+    team by <link xl:href="https://jira.springframework.org/">raising an
     issue</link>.</para>
   </section>
 
@@ -67,7 +67,7 @@
     <para>
         There are many excellent articles and tutorials that show how to get
         started with Spring Framework 3 features. Read them at the
-        <link xl:href="http://www.springsource.org/documentation">Spring Documentation</link> page.
+        <link xl:href="https://www.springsource.org/documentation">Spring Documentation</link> page.
       </para>
       <para xml:id="new-in-3.0-samples">
       The samples have been improved and updated to take advantage of the new features in Spring
@@ -84,7 +84,7 @@
       some samples (in particular Petclinic) to illustrate various features.</para>
 
       <note><para>For more information on Subversion (or in short SVN), see the project homepage at:
-      <literal>http://subversion.apache.org/</literal></para>
+      <literal>https://subversion.apache.org/</literal></para>
       </note>
 
   </section>
@@ -292,7 +292,7 @@
       across all the products in the Spring portfolio. Its language features
       are driven by the requirements of the projects in the Spring portfolio,
       including tooling requirements for code completion support within the
-      Eclipse based <link xl:href="http://www.springsource.com/products/sts">SpringSource
+      Eclipse based <link xl:href="https://www.springsource.com/products/sts">SpringSource
       Tool Suite</link>.</para>
 
       <para>The following is an example of how the Expression Language can be
@@ -325,7 +325,7 @@ public class RewardsTestDatabase {
         <title>Java based bean metadata</title>
 
         <para>Some core features from the <link
-        xl:href="http://www.springsource.org/javaconfig">JavaConfig</link>
+        xl:href="https://www.springsource.org/javaconfig">JavaConfig</link>
         project have been added to the Spring Framework now. This means that
         the following annotations are now directly supported: <itemizedlist>
             <listitem>
diff --git a/src/reference/docbook/new-in-3.1.xml b/src/reference/docbook/new-in-3.1.xml
index 8a56bfd647..ce614880bf 100644
--- a/src/reference/docbook/new-in-3.1.xml
+++ b/src/reference/docbook/new-in-3.1.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>New Features and Enhancements in Spring Framework 3.1</title>
 
   <para>This is a list of new features for Spring Framework 3.1. A number of features
@@ -24,7 +24,7 @@
 
       <listitem>
         <para><link
-        xl:href="http://blog.springsource.com/2011/02/23/spring-3-1-m1-caching/">
+        xl:href="https://spring.io/blog/2011/02/23/spring-3-1-m1-caching/">
         Cache Abstraction</link> (SpringSource team blog)</para>
       </listitem>
     </itemizedlist>
@@ -36,13 +36,13 @@
     <itemizedlist>
       <listitem>
         <para><link
-        xl:href="http://blog.springsource.com/2011/02/11/spring-framework-3-1-m1-released/">
+        xl:href="https://spring.io/blog/2011/02/11/spring-framework-3-1-m1-released/">
         XML profiles</link> (SpringSource Team Blog)</para>
       </listitem>
 
       <listitem>
         <para><link
-        xl:href="http://blog.springsource.com/2011/02/14/spring-3-1-m1-introducing-profile/">
+        xl:href="https://spring.io/blog/2011/02/14/spring-3-1-m1-introducing-profile/">
         Introducing @Profile</link> (SpringSource Team Blog)</para>
       </listitem>
 
@@ -64,7 +64,7 @@
     <itemizedlist>
       <listitem>
         <para><link
-        xl:href="http://blog.springsource.com/2011/02/11/spring-framework-3-1-m1-released/">
+        xl:href="https://spring.io/blog/2011/02/11/spring-framework-3-1-m1-released/">
         Environment Abstraction</link> (SpringSource Team Blog)</para>
       </listitem>
 
@@ -80,7 +80,7 @@
     <itemizedlist>
       <listitem>
         <para><link
-        xl:href="http://blog.springsource.com/2011/02/15/spring-3-1-m1-unified-property-management/">
+        xl:href="https://spring.io/blog/2011/02/15/spring-3-1-m1-unified-property-management/">
         Unified Property Management</link> (SpringSource Team Blog)</para>
       </listitem>
 
@@ -194,7 +194,7 @@
     <itemizedlist>
       <listitem>
         <para><link
-        xl:href="http://blog.springsource.com/2011/06/21/spring-3-1-m2-testing-with-configuration-classes-and-profiles/">Spring
+        xl:href="https://spring.io/blog/2011/06/21/spring-3-1-m2-testing-with-configuration-classes-and-profiles/">Spring
         3.1 M2: Testing with @Configuration Classes and Profiles</link>
         (SpringSource Team Blog)</para>
       </listitem>
@@ -274,7 +274,7 @@
       </listitem>
 
       <listitem>
-        <para><link xl:href="http://bit.ly/lrDHja">Diff from Spring's
+        <para><link xl:href="https://bit.ly/lrDHja">Diff from Spring's
         Greenhouse reference application</link> demonstrating migration
         from web.xml to
         <interfacename>WebApplicationInitializer</interfacename></para>
diff --git a/src/reference/docbook/new-in-3.2.xml b/src/reference/docbook/new-in-3.2.xml
index dc53ce9777..bff0e0b31b 100644
--- a/src/reference/docbook/new-in-3.2.xml
+++ b/src/reference/docbook/new-in-3.2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter version="5.0"
-         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"
+         xsi:schemaLocation="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"
          xml:id="new-in-3.2" xmlns="http://docbook.org/ns/docbook"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -72,7 +72,7 @@
     also enables selective suffix pattern matching for incoming requests.
     For more details, see the Javadoc of
     <link
-    xl:href="http://static.springsource.org/spring-framework/docs/3.2.0.BUILD-SNAPSHOT/api/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.html#setUseRegisteredSuffixPatternMatch(boolean)">RequestMappingHandlerMapping.setUseRegisteredSuffixPatternMatch</link>.</para>
+    xl:href="https://docs.spring.io/spring-framework/docs/3.2.0.BUILD-SNAPSHOT/api/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.html#setUseRegisteredSuffixPatternMatch(boolean)">RequestMappingHandlerMapping.setUseRegisteredSuffixPatternMatch</link>.</para>
   </section>
 
   <section xml:id="new-in-3.2-webmvc-controller-advice">
diff --git a/src/reference/docbook/orm.xml b/src/reference/docbook/orm.xml
index 5861abe61e..517c711af8 100644
--- a/src/reference/docbook/orm.xml
+++ b/src/reference/docbook/orm.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>Object Relational Mapping (ORM) Data Access</title>
 
   <section xml:id="orm-introduction">
@@ -231,7 +231,7 @@ public class ProductDaoImpl implements ProductDao {
     <title>Hibernate</title>
 
     <para>We will start with a coverage of <link
-    xl:href="http://www.hibernate.org/">Hibernate 3</link> in a Spring
+    xl:href="https://hibernate.org/">Hibernate 3</link> in a Spring
     environment, using it to demonstrate the approach that Spring takes
     towards integrating O/R mappers. This section will cover many issues in
     detail and show different variations of DAO implementations and
@@ -419,11 +419,11 @@ TR: REVISED, PLS REVIEW.-->This declarative transaction capability allows you
        xmlns:tx="http://www.springframework.org/schema/tx"
        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/tx
-       http://www.springframework.org/schema/tx/spring-tx.xsd
+       https://www.springframework.org/schema/tx/spring-tx.xsd
        http://www.springframework.org/schema/aop
-       http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+       https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   <lineannotation>&lt;!-- SessionFactory, DataSource, etc. omitted --&gt;</lineannotation>
 
@@ -512,11 +512,11 @@ TR: REVISED, PLS REVIEW.-->This declarative transaction capability allows you
        xmlns:tx="http://www.springframework.org/schema/tx"
        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/tx
-       http://www.springframework.org/schema/tx/spring-tx.xsd
+       https://www.springframework.org/schema/tx/spring-tx.xsd
        http://www.springframework.org/schema/aop
-       http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+       https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   <lineannotation>&lt;!-- SessionFactory, DataSource, etc. omitted --&gt;</lineannotation>
 
@@ -1155,11 +1155,11 @@ TR: OK AS IS. Two different callback methhods - one is Spring's (*afterCompletio
         xmlns:tx="http://www.springframework.org/schema/tx"
         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/tx
-   http://www.springframework.org/schema/tx/spring-tx.xsd
+   https://www.springframework.org/schema/tx/spring-tx.xsd
    http://www.springframework.org/schema/aop
-   http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+   https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;bean id="myTxManager" class="org.springframework.orm.jdo.JdoTransactionManager"&gt;
     &lt;property name="persistenceManagerFactory" ref="myPmf"/&gt;
@@ -1260,7 +1260,7 @@ TR: OK AS IS. Two different callback methhods - one is Spring's (*afterCompletio
     <para>The Spring JPA, available under the
     <literal>org.springframework.orm.jpa</literal> package, offers
     comprehensive support for the <link
-    xl:href="http://java.sun.com/developer/technicalArticles/J2EE/jpa/index.html">Java
+    xl:href="https://java.sun.com/developer/technicalArticles/J2EE/jpa/index.html">Java
     Persistence API</link> in a similar manner to the integration with
     Hibernate or JDO, while being aware of the underlying implementation in
     order to provide additional features.</para>
@@ -1459,7 +1459,7 @@ TR: OK AS IS. The requirement is to provide the classloader for the runtime envi
         plugged in a specific manner, depending whether the environment is a
         web container or application server. <!--Preceding: is this what you mean? Avoid slashes (web container/application server); slashes mean different things depending on context.--><!--Revise if necessary. TR: OK.-->
         Hooking <literal>ClassTransformers</literal> through a Java 5 <link
-        xl:href="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/instrument/package-summary.html">agent</link>
+        xl:href="https://java.sun.com/j2se/1.5.0/docs/api/java/lang/instrument/package-summary.html">agent</link>
         typically is not efficient. The agents work against the
         <emphasis>entire virtual machine</emphasis> and inspect
         <emphasis>every</emphasis> class that is loaded, which is usually
@@ -1736,11 +1736,11 @@ TR: REVISED, PLS REVIEW. Should be *inside your war*. --><!-- </para>
        xmlns:tx="http://www.springframework.org/schema/tx"
        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/tx
-       http://www.springframework.org/schema/tx/spring-tx.xsd
+       https://www.springframework.org/schema/tx/spring-tx.xsd
        http://www.springframework.org/schema/aop
-       http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+       https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;bean id="myTxManager" class="org.springframework.orm.jpa.JpaTransactionManager"&gt;
     &lt;property name="entityManagerFactory" ref="myEmf"/&gt;
diff --git a/src/reference/docbook/overview.xml b/src/reference/docbook/overview.xml
index 9bef8ee488..2770d7ece6 100644
--- a/src/reference/docbook/overview.xml
+++ b/src/reference/docbook/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 to Spring Framework</title>
 
   <para>Spring Framework is a Java platform that provides comprehensive
@@ -56,7 +56,7 @@
       <firstterm>Dependency Injection</firstterm>.</para>
 
       <para>For insight into IoC and DI, refer to Fowler's article at <link
-      xl:href="http://martinfowler.com/articles/injection.html">http://martinfowler.com/articles/injection.html</link>.</para>
+      xl:href="https://martinfowler.com/articles/injection.html">https://martinfowler.com/articles/injection.html</link>.</para>
     </sidebar>
 
     <para>Java applications -- a loose term that runs the gamut from
@@ -362,7 +362,7 @@ TR: OK. Added to diagram.--></para>
       places:<itemizedlist>
           <listitem>
             <para>On the community download site <link
-            xl:href="http://www.springsource.org/download/community">http://www.springsource.org/download/community</link>.
+            xl:href="https://www.springsource.org/download/community">https://www.springsource.org/download/community</link>.
             Here you find all the Spring jars bundled together into a zip file
             for easy download. The names of the jars here since version 3.0
             are in the form
@@ -393,7 +393,7 @@ TR: OK. Added to diagram.--></para>
             dependencies are also in this "long" form, with external libraries
             (not from SpringSource) having the prefix
             <code>com.springsource</code>. See the <link
-            xl:href="http://www.springsource.com/repository/app/faq">FAQ</link>
+            xl:href="https://www.springsource.com/repository/app/faq">FAQ</link>
             for more information.</para>
           </listitem>
 
@@ -529,7 +529,7 @@ TR: OK. Added to diagram.--></para>
                 <entry>Various</entry>
 
                 <entry><link
-                xl:href="http://www.springsource.com/repository">http://www.springsource.com/repository</link></entry>
+                xl:href="https://www.springsource.com/repository">https://www.springsource.com/repository</link></entry>
               </row>
 
               <row>
@@ -596,7 +596,7 @@ TR: OK. Added to diagram.--></para>
         <programlisting language="xml">&lt;repositories&gt;
    &lt;repository&gt;
       &lt;id&gt;com.springsource.repository.maven.release&lt;/id&gt;
-      &lt;url&gt;http://repo.springsource.org/release/&lt;/url&gt;
+      &lt;url&gt;https://repo.springsource.org/release/&lt;/url&gt;
       &lt;snapshots&gt;&lt;enabled&gt;false&lt;/enabled&gt;&lt;/snapshots&gt;
    &lt;/repository&gt;
 &lt;/repositories&gt;</programlisting>
@@ -606,7 +606,7 @@ TR: OK. Added to diagram.--></para>
         <programlisting language="xml">&lt;repositories&gt;
    &lt;repository&gt;
       &lt;id&gt;com.springsource.repository.maven.milestone&lt;/id&gt;
-      &lt;url&gt;http://repo.springsource.org/milestone/&lt;/url&gt;
+      &lt;url&gt;https://repo.springsource.org/milestone/&lt;/url&gt;
       &lt;snapshots&gt;&lt;enabled&gt;false&lt;/enabled&gt;&lt;/snapshots&gt;
    &lt;/repository&gt;
 &lt;/repositories&gt;</programlisting>
@@ -616,7 +616,7 @@ TR: OK. Added to diagram.--></para>
         <programlisting language="xml">&lt;repositories&gt;
    &lt;repository&gt;
       &lt;id&gt;com.springsource.repository.maven.snapshot&lt;/id&gt;
-      &lt;url&gt;http://repo.springsource.org/snapshot/&lt;/url&gt;
+      &lt;url&gt;https://repo.springsource.org/snapshot/&lt;/url&gt;
       &lt;snapshots&gt;&lt;enabled&gt;true&lt;/enabled&gt;&lt;/snapshots&gt;
    &lt;/repository&gt;
 &lt;/repositories&gt;</programlisting>
@@ -640,14 +640,14 @@ TR: OK. Added to diagram.--></para>
         <programlisting language="xml">&lt;repositories&gt;
    &lt;repository&gt;
       &lt;id&gt;com.springsource.repository.bundles.release&lt;/id&gt;
-      &lt;url&gt;http://repository.springsource.com/maven/bundles/release/&lt;/url&gt;
+      &lt;url&gt;https://repository.springsource.com/maven/bundles/release/&lt;/url&gt;
    &lt;/repository&gt;
 &lt;/repositories&gt;</programlisting>
 
         <para>If you are managing your dependencies by hand, the URL in the
         repository declaration above is not browsable, but there is a user
         interface at <link
-        xl:href="http://www.springsource.com/repository">http://www.springsource.com/repository</link>
+        xl:href="https://www.springsource.com/repository">https://www.springsource.com/repository</link>
         that can be used to search for and download dependencies. It also has
         handy snippets of Maven and Ivy configuration that you can copy and
         paste if you are using those tools.</para>
@@ -657,7 +657,7 @@ TR: OK. Added to diagram.--></para>
         <title>Ivy Dependency Management</title>
 
         <para>If you prefer to use <link
-        xl:href="http://ant.apache.org/ivy">Ivy</link> to manage dependencies
+        xl:href="https://ant.apache.org/ivy">Ivy</link> to manage dependencies
         then there are similar names and configuration options. </para>
 
         <para>To configure Ivy to point to the SpringSource EBR add the
@@ -668,18 +668,18 @@ TR: OK. Added to diagram.--></para>
 
   &lt;url name="com.springsource.repository.bundles.release"&gt;
 
-    &lt;ivy pattern="http://repository.springsource.com/ivy/bundles/release/
+    &lt;ivy pattern="https://repository.springsource.com/ivy/bundles/release/
       [organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /&gt;
-    &lt;artifact pattern="http://repository.springsource.com/ivy/bundles/release/
+    &lt;artifact pattern="https://repository.springsource.com/ivy/bundles/release/
       [organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /&gt;
 
   &lt;/url&gt;
 
   &lt;url name="com.springsource.repository.bundles.external"&gt;
 
-    &lt;ivy pattern="http://repository.springsource.com/ivy/bundles/external/
+    &lt;ivy pattern="https://repository.springsource.com/ivy/bundles/external/
        [organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /&gt;
-    &lt;artifact pattern="http://repository.springsource.com/ivy/bundles/external/
+    &lt;artifact pattern="https://repository.springsource.com/ivy/bundles/external/
        [organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /&gt;
 
   &lt;/url&gt;
@@ -746,7 +746,7 @@ TR: OK. Added to diagram.--></para>
         problematic. If we could turn back the clock and start Spring now
         as a new project it would use a different logging dependency. The
         first choice would probably be the Simple Logging Facade for Java (<link
-        xl:href="http://www.slf4j.org">SLF4J</link>), which is also used by a lot
+        xl:href="https://www.slf4j.org">SLF4J</link>), which is also used by a lot
         of other tools that people use with Spring inside their
         applications.</para>
 
@@ -851,7 +851,7 @@ TR: OK. Added to diagram.--></para>
 
           <para>A more common choice amongst SLF4J users, which uses fewer steps
           and generates fewer dependencies, is to bind directly to <link
-          xl:href="http://logback.qos.ch">Logback</link>. This removes the extra
+          xl:href="https://logback.qos.ch">Logback</link>. This removes the extra
           binding step because Logback implements SLF4J directly, so you only need
           to depend on two libraries not four (<code>jcl-over-slf4j</code> and
           <code>logback</code>). If you do that you might also need to exclude the
@@ -863,7 +863,7 @@ TR: OK. Added to diagram.--></para>
         <title>Using Log4J</title>
 
         <para>Many people use <link
-        xl:href="http://logging.apache.org/log4j">Log4j</link> as a logging
+        xl:href="https://logging.apache.org/log4j">Log4j</link> as a logging
         framework for configuration and management purposes. It's efficient
         and well-established, and in fact it's what we use at runtime when we
         build and test Spring. Spring also provides some utilities for
diff --git a/src/reference/docbook/oxm.xml b/src/reference/docbook/oxm.xml
index 608b847f26..8bc0e82068 100644
--- a/src/reference/docbook/oxm.xml
+++ b/src/reference/docbook/oxm.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>Marshalling XML using O/X Mappers</title>
 
     <section xml:id="oxm-introduction">
@@ -319,9 +319,9 @@ public class Application {
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     ]]><emphasis role="bold"><![CDATA[xmlns:oxm="http://www.springframework.org/schema/oxm"]]></emphasis>
     <![CDATA[xsi:schemaLocation="http://www.springframework.org/schema/beans
-    ]]><![CDATA[http://www.springframework.org/schema/beans/spring-beans.xsd
+    ]]><![CDATA[https://www.springframework.org/schema/beans/spring-beans.xsd
     ]]><emphasis role="bold"><![CDATA[http://www.springframework.org/schema/oxm
-    ]]><![CDATA[http://www.springframework.org/schema/oxm/spring-oxm.xsd"]]></emphasis><![CDATA[>
+    ]]><![CDATA[https://www.springframework.org/schema/oxm/spring-oxm.xsd"]]></emphasis><![CDATA[>
 ]]></programlisting>
         <para>
             Currently, the following tags are available:
@@ -441,7 +441,7 @@ public class Application {
             though a mapping file can be used to have more control over the behavior of Castor.
         </para>
         <para>
-            For more information on Castor, refer to the <link xl:href="http://castor.codehaus.org/xml-framework.html">
+            For more information on Castor, refer to the <link xl:href="https://castor.codehaus.org/xml-framework.html">
             <citetitle>Castor web site</citetitle></link>. The Spring integration classes reside in the
             <package>org.springframework.oxm.castor</package> package.
         </para>
@@ -465,7 +465,7 @@ public class Application {
             <para>
                 Although it is possible to rely on Castor's default marshalling behavior, it might be necessary to have
                 more control over it. This can be accomplished using a Castor mapping file. For more information, refer
-                to <link xl:href="http://castor.codehaus.org/xml-mapping.html">Castor XML Mapping</link>.
+                to <link xl:href="https://castor.codehaus.org/xml-mapping.html">Castor XML Mapping</link>.
             </para>
             <para>
                 The mapping can be set using the <property>mappingLocation</property> resource property, indicated
@@ -570,7 +570,7 @@ public class Application {
             <interfacename>XmlObject</interfacename>, and contain XML binding information in them.
         </para>
         <para>
-            For more information on XMLBeans, refer to the <link xl:href="http://xmlbeans.apache.org/">
+            For more information on XMLBeans, refer to the <link xl:href="https://xmlbeans.apache.org/">
                <citetitle>XMLBeans web site </citetitle></link>. The Spring-WS integration classes reside
             in the <package>org.springframework.oxm.xmlbeans</package> package.
         </para>
@@ -727,7 +727,7 @@ public class Application {
             generates clean XML.
         </para>
         <para>
-            For more information on XStream, refer to the <link xl:href="http://xstream.codehaus.org/">
+            For more information on XStream, refer to the <link xl:href="https://xstream.codehaus.org/">
             <citetitle>XStream web site</citetitle></link>. The Spring integration classes reside in the
             <package>org.springframework.oxm.xstream</package> package.
         </para>
@@ -764,7 +764,7 @@ public class Application {
                   This will make sure that only the registered classes are eligible for unmarshalling.
                 </para>
                 <para>
-                  Additionally, you can register <link xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/oxm/xstream/XStreamMarshaller.html#setConverters(com.thoughtworks.xstream.converters.ConverterMatcher[])">
+                  Additionally, you can register <link xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/oxm/xstream/XStreamMarshaller.html#setConverters(com.thoughtworks.xstream.converters.ConverterMatcher[])">
                   custom converters</link> to make sure that only your supported classes can be unmarshalled.
                   You might want to add a <classname>CatchAllConverter</classname> as the last converter in the list,
                   in addition to converters that explicitly support the domain classes that should be supported.
diff --git a/src/reference/docbook/portlet.xml b/src/reference/docbook/portlet.xml
index b658ab2e8c..ee6befe8ec 100644
--- a/src/reference/docbook/portlet.xml
+++ b/src/reference/docbook/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 MVC Framework</title>
 
   <section xml:id="portlet-introduction">
@@ -971,7 +971,7 @@ public class SampleController extends AbstractController {
     in the <literal>org.springframework.web.portlet.multipart</literal>
     package. Spring provides a <interfacename>PortletMultipartResolver</interfacename>
     for use with
-    <link xl:href="http://jakarta.apache.org/commons/fileupload">Commons FileUpload</link>.
+    <link xl:href="https://jakarta.apache.org/commons/fileupload">Commons FileUpload</link>.
     How uploading files is supported will be described in the rest of this section.</para>
 
     <para>By default, no multipart handling will be done by Spring Portlet
@@ -1295,7 +1295,7 @@ public class FileUploadBean {
 &lt;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"&gt;
+        https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     &lt;bean class="org.springframework.web.portlet.mvc.annotation.DefaultAnnotationHandlerMapping"/&gt;
 
@@ -1347,9 +1347,9 @@ public class FileUploadBean {
     xmlns:context="http://www.springframework.org/schema/context"
     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/context
-        http://www.springframework.org/schema/context/spring-context.xsd"&gt;
+        https://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     &lt;context:component-scan base-package="org.springframework.samples.petportal.portlet"/&gt;
 
diff --git a/src/reference/docbook/preface.xml b/src/reference/docbook/preface.xml
index 0f7d5388f4..75c22f0476 100644
--- a/src/reference/docbook/preface.xml
+++ b/src/reference/docbook/preface.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>Preface</title>
 
   <para>Developing software applications is hard enough even with good tools
@@ -37,6 +37,6 @@
 
   <para>This document provides a reference guide to Spring's features. If you
   have any requests or comments, please add an issue at
-  <link xl:href="http://jira.springsource.org/SPR" />.
+  <link xl:href="https://jira.springsource.org/SPR" />.
   </para>
 </preface>
diff --git a/src/reference/docbook/remoting.xml b/src/reference/docbook/remoting.xml
index 643221af8e..132d3d9896 100644
--- a/src/reference/docbook/remoting.xml
+++ b/src/reference/docbook/remoting.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>Remoting and web services using Spring</title>
 
   <section xml:id="remoting-introduction">
@@ -217,7 +217,7 @@ public class AccountServiceImpl implements AccountService {
 
     <para>Hessian offers a binary HTTP-based remoting protocol. It is
     developed by Caucho and more information about Hessian itself can be found
-    at <link xl:href="http://www.caucho.com"></link>.</para>
+    at <link xl:href="https://www.caucho.com/"></link>.</para>
 
     <section xml:id="remoting-caucho-protocols-hessian">
       <title>Wiring up the <classname>DispatcherServlet</classname> for
@@ -372,7 +372,7 @@ public class AccountServiceImpl implements AccountService {
         <para>Of course, this example doesn't show a flexible kind of security
         infrastructure. For more options as far as security is concerned, have
         a look at the Spring Security project at <link
-          xl:href="http://static.springsource.org/spring-security/site/"></link>.</para>
+          xl:href="https://docs.spring.io/spring-security/site/"></link>.</para>
       </note>
     </section>
   </section>
@@ -392,7 +392,7 @@ public class AccountServiceImpl implements AccountService {
     by J2SE to perform HTTP calls or Commons
     <classname>HttpClient</classname>. Use the latter if you need more
     advanced and easy-to-use functionality. Refer to <link
-    xl:href="http://jakarta.apache.org/commons/httpclient">jakarta.apache.org/commons/httpclient</link>
+    xl:href="https://jakarta.apache.org/commons/httpclient">jakarta.apache.org/commons/httpclient</link>
     for more info.</para>
 
     <section xml:id="remoting-httpinvoker-server">
@@ -1042,7 +1042,7 @@ public class SimpleCheckingAccountService implements CheckingAccountService {
 &lt;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"&gt;
+        https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     &lt;bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"&gt;
         &lt;property name="brokerURL" value="tcp://ep-t43:61616"/&gt;
@@ -1064,7 +1064,7 @@ public class SimpleCheckingAccountService implements CheckingAccountService {
 &lt;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"&gt;
+         https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     &lt;bean id="checkingAccountService"
           class="org.springframework.jms.remoting.JmsInvokerServiceExporter"&gt;
@@ -1109,7 +1109,7 @@ public class Server {
 &lt;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"&gt;
+        https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     &lt;bean id="checkingAccountService"
           class="org.springframework.jms.remoting.JmsInvokerProxyFactoryBean"&gt;
@@ -1136,7 +1136,7 @@ public class Client {
 }</programlisting>
 
     <para>You may also wish to investigate the support provided by the <link
-    xl:href="http://lingo.codehaus.org/">Lingo</link> project, which (to quote
+    xl:href="https://lingo.codehaus.org/">Lingo</link> project, which (to quote
     the homepage blurb) <quote>
         <emphasis>... is a lightweight POJO based remoting and messaging
         library based on the Spring Framework's remoting libraries which
@@ -1244,7 +1244,7 @@ public class Client {
       common REST operations this approach is too low level as shown
       below.</para>
 
-      <programlisting>String uri = "http://example.com/hotels/1/bookings";
+      <programlisting>String uri = "https://example.com/hotels/1/bookings";
 
 PostMethod post = new PostMethod(uri);
 String request = // create booking request content
@@ -1279,28 +1279,28 @@ if (HttpStatus.SC_CREATED == post.getStatusCode()) {
               <entry>DELETE</entry>
 
               <entry><link
-              xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#delete(String,%20Object...)">delete</link></entry>
+              xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#delete(String,%20Object...)">delete</link></entry>
             </row>
 
             <row>
               <entry>GET</entry>
 
               <entry><link
-              xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#getForObject(String,%20Class,%20Object...)">getForObject</link></entry>
+              xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#getForObject(String,%20Class,%20Object...)">getForObject</link></entry>
             </row>
 
             <row>
               <entry></entry>
 
               <entry><link
-              xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#getForEntity(String,%20Class,%20Object...)">getForEntity</link></entry>
+              xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#getForEntity(String,%20Class,%20Object...)">getForEntity</link></entry>
             </row>
 
             <row>
               <entry>HEAD</entry>
 
               <entry><link
-              xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#headForHeaders(String,%20Object...)">headForHeaders(String
+              xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#headForHeaders(String,%20Object...)">headForHeaders(String
               url, String… urlVariables)</link></entry>
             </row>
 
@@ -1308,7 +1308,7 @@ if (HttpStatus.SC_CREATED == post.getStatusCode()) {
               <entry>OPTIONS</entry>
 
               <entry><link
-              xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#optionsForAllow(String,%20Object...)">optionsForAllow(String
+              xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#optionsForAllow(String,%20Object...)">optionsForAllow(String
               url, String… urlVariables)</link></entry>
             </row>
 
@@ -1316,7 +1316,7 @@ if (HttpStatus.SC_CREATED == post.getStatusCode()) {
               <entry>POST</entry>
 
               <entry><link
-              xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#postForLocation(String,%20Object,%20Object...)">postForLocation(String
+              xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#postForLocation(String,%20Object,%20Object...)">postForLocation(String
               url, Object request, String… urlVariables)</link></entry>
             </row>
 
@@ -1324,7 +1324,7 @@ if (HttpStatus.SC_CREATED == post.getStatusCode()) {
               <entry></entry>
 
               <entry><link
-              xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#postForObject(java.lang.String,%20java.lang.Object,%20java.lang.Class,%20java.lang.String...)">postForObject(String
+              xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#postForObject(java.lang.String,%20java.lang.Object,%20java.lang.Class,%20java.lang.String...)">postForObject(String
                   url, Object request, Class&lt;T&gt; responseType, String…
                   uriVariables)</link></entry>
             </row>
@@ -1333,7 +1333,7 @@ if (HttpStatus.SC_CREATED == post.getStatusCode()) {
               <entry>PUT</entry>
 
               <entry><link
-              xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#put(String,%20Object,%20Object...)">put(String
+              xl:href="https://docs.spring.io/spring/docs/current/api/org/springframework/web/client/RestTemplate.html#put(String,%20Object,%20Object...)">put(String
               url, Object request, String…urlVariables)</link></entry>
             </row>
           </tbody>
@@ -1373,7 +1373,7 @@ if (HttpStatus.SC_CREATED == post.getStatusCode()) {
       <literal>String</literal> variable length argument or a
       <literal>Map&lt;String,String&gt;</literal>. For example,</para>
 
-      <programlisting language="java">String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/bookings/{booking}",
+      <programlisting language="java">String result = restTemplate.getForObject("https://example.com/hotels/{hotel}/bookings/{booking}",
                                           String.class,"42", "21");
 </programlisting>
 
@@ -1381,7 +1381,7 @@ if (HttpStatus.SC_CREATED == post.getStatusCode()) {
 
       <programlisting language="java">Map&lt;String, String&gt; vars = Collections.singletonMap("hotel", "42");
 String result =
-  restTemplate.getForObject("http://example.com/hotels/{hotel}/rooms/{hotel}", String.class, vars);
+  restTemplate.getForObject("https://example.com/hotels/{hotel}/rooms/{hotel}", String.class, vars);
 </programlisting>
 
       <para>using a <literal>Map&lt;String,String&gt;</literal>.</para>
@@ -1411,7 +1411,7 @@ String result =
       <classname>HttpClient</classname> directly rewritten to use the
       <classname>RestTemplate</classname> is shown below</para>
 
-      <programlisting>uri = "http://example.com/hotels/{id}/bookings";
+      <programlisting>uri = "https://example.com/hotels/{id}/bookings";
 
 RestTemplate template = new RestTemplate();
 
@@ -1459,12 +1459,12 @@ URI location = template.postForLocation(uri, booking, "1");
         For example the following:
         </para>
 
-        <programlisting language="java">restTemplate.getForObject("http://example.com/hotel list", String.class);</programlisting>
+        <programlisting language="java">restTemplate.getForObject("https://example.com/hotel list", String.class);</programlisting>
 
-        <para>will perform a GET on <filename>http://example.com/hotel%20list</filename>.
+        <para>will perform a GET on <filename>https://example.com/hotel%20list</filename>.
         That means if the input URL String is already encoded, it will be encoded twice --
-        i.e. <filename>http://example.com/hotel%20list</filename> will become
-        <filename>http://example.com/hotel%2520list</filename>.
+        i.e. <filename>https://example.com/hotel%20list</filename> will become
+        <filename>https://example.com/hotel%2520list</filename>.
         If this is not the intended effect, use the
         <classname>java.net.URI</classname> method variant, which assumes
         the URL is already encoded is also generally useful if you want
@@ -1477,7 +1477,7 @@ URI location = template.postForLocation(uri, booking, "1");
         </para>
 
         <programlisting language="java">UriComponents uriComponents =
-        UriComponentsBuilder.fromUriString("http://example.com/hotels/{hotel}/bookings/{booking}").build()
+        UriComponentsBuilder.fromUriString("https://example.com/hotels/{hotel}/bookings/{booking}").build()
             .expand("42", "21")
             .encode();
 
@@ -1511,7 +1511,7 @@ URI uri = uriComponents.toUri();</programlisting>
 requestHeaders.set("MyRequestHeader", "MyValue");
 HttpEntity&lt;?&gt; requestEntity = new HttpEntity(requestHeaders);
 
-HttpEntity&lt;String&gt; response = template.exchange("http://example.com/hotels/{hotel}",
+HttpEntity&lt;String&gt; response = template.exchange("https://example.com/hotels/{hotel}",
   HttpMethod.GET, requestEntity, String.class, "42");
 
 String responseHeader = response.getHeaders().getFirst("MyResponseHeader");
diff --git a/src/reference/docbook/resources.xml b/src/reference/docbook/resources.xml
index 9ccd6d8550..3bc37073b9 100644
--- a/src/reference/docbook/resources.xml
+++ b/src/reference/docbook/resources.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>Resources</title>
 
   <section xml:id="resources-introduction">
@@ -293,7 +293,7 @@
 
     <programlisting language="java">Resource template = ctx.getResource("file:/some/resource/path/myTemplate.txt");</programlisting>
 
-    <programlisting language="java">Resource template = ctx.getResource("http://myhost.com/resource/path/myTemplate.txt");</programlisting>
+    <programlisting language="java">Resource template = ctx.getResource("https://myhost.com/resource/path/myTemplate.txt");</programlisting>
 
     <para>The following table summarizes the strategy for converting
     <classname>String</classname>s to
@@ -341,7 +341,7 @@
           <row>
             <entry><para>http:</para></entry>
 
-            <entry><para> <literal>http://myserver/logo.png</literal>
+            <entry><para> <literal>https://myserver/logo.png</literal>
             </para></entry>
 
             <entry><para>Loaded as a
diff --git a/src/reference/docbook/scheduling.xml b/src/reference/docbook/scheduling.xml
index 55c36cbc1b..3181a85404 100644
--- a/src/reference/docbook/scheduling.xml
+++ b/src/reference/docbook/scheduling.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>Task Execution and Scheduling</title>
 
   <section xml:id="scheduling-introduction">
@@ -25,7 +25,7 @@
     <para>Spring also features integration classes for supporting scheduling
     with the <classname>Timer</classname>, part of the JDK since 1.3, and the
     Quartz Scheduler (<link
-    xl:href="http://quartz-scheduler.org"></link>). Both of those
+    xl:href="https://www.quartz-scheduler.org/"></link>). Both of those
     schedulers are set up using a <interfacename>FactoryBean</interfacename>
     with optional references to <classname>Timer</classname> or
     <classname>Trigger</classname> instances, respectively. Furthermore, a
@@ -612,7 +612,7 @@ void doSomething(String s) {
       be considered in light of the executor's queue capacity. For the full
       description of the relationship between pool size and queue capacity,
       consult the documentation for <link
-      xl:href="http://java.sun.com/javase/6/docs/api/java/util/concurrent/ThreadPoolExecutor.html">ThreadPoolExecutor</link>.
+      xl:href="https://java.sun.com/javase/6/docs/api/java/util/concurrent/ThreadPoolExecutor.html">ThreadPoolExecutor</link>.
       The main idea is that when a task is submitted, the executor will first
       try to use a free thread if the number of active threads is currently
       less than the core size. If the core size has been reached, then the
@@ -710,7 +710,7 @@ void doSomething(String s) {
     <classname>Job</classname> and <classname>JobDetail</classname> objects to
     realize scheduling of all kinds of jobs. For the basic concepts behind
     Quartz, have a look at <link
-    xl:href="http://quartz-scheduler.org"></link>. For convenience
+    xl:href="https://www.quartz-scheduler.org/"></link>. For convenience
     purposes, Spring offers a couple of classes that simplify the usage of
     Quartz within Spring-based applications.</para>
 
@@ -884,7 +884,7 @@ public class ExampleJob extends QuartzJobBean {
       <classname>SchedulerFactoryBean</classname> for you to set, such as the
       calendars used by the job details, properties to customize Quartz with,
       etc. Have a look at the <link
-      xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/scheduling/quartz/SchedulerFactoryBean.html">SchedulerFactoryBean
+      xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/scheduling/quartz/SchedulerFactoryBean.html">SchedulerFactoryBean
       Javadoc</link> for more information.</para>
     </section>
   </section>
diff --git a/src/reference/docbook/spring-form.tld.xml b/src/reference/docbook/spring-form.tld.xml
index a28237adbe..6a2aa4cebb 100644
--- a/src/reference/docbook/spring-form.tld.xml
+++ b/src/reference/docbook/spring-form.tld.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-form.tld</title>
    <section xml:id="spring-form.tld-intro">
       <title>Introduction</title>
@@ -15,7 +15,7 @@
                     the Spring Framework provides you with some tags for evaluating errors, setting
                     themes and outputting internationalized messages.</para>
        <para>Please note that the various tags generated by this form tag library
-                    are compliant with the <link xl:href="http://www.w3.org/TR/xhtml1/">XHTML-1.0-Strict specification</link> and attendant <link xl:href="http://www.w3.org/TR/xhtml1/dtds.html#a_dtd_XHTML-1.0-Strict">DTD</link>.</para>
+                    are compliant with the <link xl:href="https://www.w3.org/TR/xhtml1/">XHTML-1.0-Strict specification</link> and attendant <link xl:href="https://www.w3.org/TR/xhtml1/dtds.html#a_dtd_XHTML-1.0-Strict">DTD</link>.</para>
        <para>This appendix describes the <literal>spring-form.tld</literal> tag library.</para>
        <itemizedlist>
           <listitem>
diff --git a/src/reference/docbook/spring.tld.xml b/src/reference/docbook/spring.tld.xml
index 0ae0a49ea3..e308ccf475 100644
--- a/src/reference/docbook/spring.tld.xml
+++ b/src/reference/docbook/spring.tld.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.tld</title>
    <section xml:id="spring.tld-intro">
       <title>Introduction</title>
@@ -15,7 +15,7 @@
                     the Spring Framework provides you with some tags for evaluating errors, setting
                     themes and outputting internationalized messages.</para>
        <para>Please note that the various tags generated by this form tag library
-                    are compliant with the <link xl:href="http://www.w3.org/TR/xhtml1/">XHTML-1.0-Strict specification</link> and attendant <link xl:href="http://www.w3.org/TR/xhtml1/dtds.html#a_dtd_XHTML-1.0-Strict">DTD</link>.</para>
+                    are compliant with the <link xl:href="https://www.w3.org/TR/xhtml1/">XHTML-1.0-Strict specification</link> and attendant <link xl:href="https://www.w3.org/TR/xhtml1/dtds.html#a_dtd_XHTML-1.0-Strict">DTD</link>.</para>
        <para>This appendix describes the <literal>spring.tld</literal> tag library.</para>
        <itemizedlist>
           <listitem>
diff --git a/src/reference/docbook/swf-sidebar.xml b/src/reference/docbook/swf-sidebar.xml
index 0d69d2617f..296b2868b5 100644
--- a/src/reference/docbook/swf-sidebar.xml
+++ b/src/reference/docbook/swf-sidebar.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 Web Flow</title>
 
   <para>Spring Web Flow (SWF) aims to be the best solution for the management
@@ -23,6 +23,6 @@
   that drive business processes.</para>
 
   <para>For more information about SWF, consult the
-  <link xl:href="http://www.springframework.org/webflow">Spring Web Flow website</link>.
+  <link xl:href="https://www.springframework.org/webflow">Spring Web Flow website</link>.
   </para>
 </sidebar>
diff --git a/src/reference/docbook/testing.xml b/src/reference/docbook/testing.xml
index e1ff6a7dda..be645df0c4 100644
--- a/src/reference/docbook/testing.xml
+++ b/src/reference/docbook/testing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter version="5.0"
-         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"
+         xsi:schemaLocation="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"
          xml:id="testing" xmlns="http://docbook.org/ns/docbook"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -83,7 +83,7 @@
         usage with Spring's Web MVC framework, which are useful for testing web
         contexts and controllers. These mock objects are generally more
         convenient to use than dynamic mock objects such as <link
-        xl:href="http://www.easymock.org">EasyMock</link> or existing Servlet
+        xl:href="http://easymock.org/">EasyMock</link> or existing Servlet
         API mock objects such as <link
         xl:href="http://www.mockobjects.com">MockObjects</link>.</para>
       </section>
@@ -2187,7 +2187,7 @@ public class WacTests {
             executing tests with a build framework such as Ant, Maven, or Gradle
             it is important to make sure that the build framework does not
             <emphasis>fork</emphasis> between tests. For example, if the <link
-            xl:href="http://maven.apache.org/plugins/maven-surefire-plugin/test-mojo.html#forkMode">forkMode</link>
+            xl:href="https://maven.apache.org/plugins/maven-surefire-plugin/test-mojo.html#forkMode">forkMode</link>
             for the Maven Surefire plug-in is set to <literal>always</literal>
             or <literal>pertest</literal>, the TestContext framework will not be
             able to cache application contexts between test classes and the
@@ -2521,7 +2521,7 @@ public class HibernateTitleRepositoryTests {
 &lt;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"&gt;
+           https://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     <lineannotation>&lt;!-- this bean will be injected into the HibernateTitleRepositoryTests class --&gt;</lineannotation>
     &lt;bean id="<emphasis role="bold">titleRepository</emphasis>" class="<emphasis
@@ -3708,7 +3708,7 @@ public class HibernateClinicTests extends AbstractClinicTests { }
 
     <itemizedlist>
       <listitem>
-        <para><link xl:href="http://www.junit.org/">JUnit</link>: <quote>
+        <para><link xl:href="https://www.junit.org/">JUnit</link>: <quote>
         <emphasis>A programmer-oriented testing framework for Java</emphasis>
         </quote>. Used by the Spring Framework in its test suite.</para>
       </listitem>
@@ -3727,12 +3727,12 @@ public class HibernateClinicTests extends AbstractClinicTests { }
       </listitem>
 
       <listitem>
-        <para><link xl:href="http://en.wikipedia.org/wiki/Mock_Object">"Mock
+        <para><link xl:href="https://en.wikipedia.org/wiki/Mock_Object">"Mock
         Objects"</link>: Article in Wikipedia.</para>
       </listitem>
 
       <listitem>
-        <para><link xl:href="http://www.easymock.org/">EasyMock</link>: Java
+        <para><link xl:href="http://easymock.org/">EasyMock</link>: Java
         library <quote> <emphasis>that provides Mock Objects for interfaces (and
         objects through the class extension) by generating them on the fly using
         Java's proxy mechanism.</emphasis> </quote> Used by the Spring Framework
@@ -3740,12 +3740,12 @@ public class HibernateClinicTests extends AbstractClinicTests { }
       </listitem>
 
       <listitem>
-        <para><link xl:href="http://www.jmock.org/">JMock</link>: Library that
+        <para><link xl:href="http://jmock.org/">JMock</link>: Library that
         supports test-driven development of Java code with mock objects.</para>
       </listitem>
 
       <listitem>
-        <para><link xl:href="http://mockito.org/">Mockito</link>: Java mock
+        <para><link xl:href="https://mockito.github.io">Mockito</link>: Java mock
         library based on the <link
         xl:href="http://xunitpatterns.com/Test%20Spy.html">test spy</link>
         pattern.</para>
diff --git a/src/reference/docbook/transaction.xml b/src/reference/docbook/transaction.xml
index 2faac4652e..648b3d29cb 100644
--- a/src/reference/docbook/transaction.xml
+++ b/src/reference/docbook/transaction.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>Transaction Management</title>
 
   <section xml:id="transaction-intro">
@@ -188,7 +188,7 @@ TR: OK AS IS - I think it's fine as is - the concepts apply to both programmatic
         resources, which is not a requirement for many applications. Many
         high-end applications use a single, highly scalable database (such as
         Oracle RAC) instead. Standalone transaction managers such as <link
-        xl:href="http://www.atomikos.com/">Atomikos Transactions</link> and
+        xl:href="https://www.atomikos.com/">Atomikos Transactions</link> and
         <link xl:href="http://jotm.objectweb.org/">JOTM</link> are other
         options. Of course, you may need other application server capabilities
         such as Java Message Service (JMS) and J2EE Connector Architecture
@@ -380,9 +380,9 @@ TR:REVISED, PLS REVIEW-->
      xmlns:jee="http://www.springframework.org/schema/jee"
      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/jee
-     http://www.springframework.org/schema/jee/spring-jee.xsd"&gt;
+     https://www.springframework.org/schema/jee/spring-jee.xsd"&gt;
 
   &lt;jee:jndi-lookup id="dataSource" jndi-name="jdbc/jpetstore"/&gt;
 
@@ -800,11 +800,11 @@ public class DefaultFooService implements FooService {
      <lineannotation>xmlns:tx="http://www.springframework.org/schema/tx"</lineannotation>
      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
      <lineannotation>http://www.springframework.org/schema/tx
-     http://www.springframework.org/schema/tx/spring-tx.xsd</lineannotation>
+     https://www.springframework.org/schema/tx/spring-tx.xsd</lineannotation>
      http://www.springframework.org/schema/aop
-     http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+     https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   <lineannotation>&lt;!-- this is the service object that we want to make transactional --&gt;</lineannotation>
   &lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
@@ -1084,11 +1084,11 @@ if the underlying application server infrastructure throws an Error the transact
   xmlns:tx="http://www.springframework.org/schema/tx"
   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/tx
-  http://www.springframework.org/schema/tx/spring-tx.xsd
+  https://www.springframework.org/schema/tx/spring-tx.xsd
   http://www.springframework.org/schema/aop
-  http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+  https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;aop:config&gt;
 
@@ -1128,11 +1128,11 @@ if the underlying application server infrastructure throws an Error the transact
   xmlns:tx="http://www.springframework.org/schema/tx"
   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/tx
-  http://www.springframework.org/schema/tx/spring-tx.xsd
+  https://www.springframework.org/schema/tx/spring-tx.xsd
   http://www.springframework.org/schema/aop
-  http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+  https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;aop:config&gt;
 
@@ -1361,11 +1361,11 @@ public class DefaultFooService implements FooService {
      xmlns:tx="http://www.springframework.org/schema/tx"
      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/tx
-     http://www.springframework.org/schema/tx/spring-tx.xsd
+     https://www.springframework.org/schema/tx/spring-tx.xsd
      http://www.springframework.org/schema/aop
-     http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+     https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   <lineannotation>&lt;!-- this is the service object that we want to make transactional --&gt;</lineannotation>
   &lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
@@ -2026,11 +2026,11 @@ public class SimpleProfiler implements Ordered {
      xmlns:tx="http://www.springframework.org/schema/tx"
      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/tx
-   http://www.springframework.org/schema/tx/spring-tx.xsd
+   https://www.springframework.org/schema/tx/spring-tx.xsd
    http://www.springframework.org/schema/aop
-   http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+   https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
 
@@ -2081,11 +2081,11 @@ TR: REVISED, PLS REVIEW. changed to 'desired'; seems clear that the desired orde
      xmlns:tx="http://www.springframework.org/schema/tx"
      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/tx
-   http://www.springframework.org/schema/tx/spring-tx.xsd
+   https://www.springframework.org/schema/tx/spring-tx.xsd
    http://www.springframework.org/schema/aop
-   http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
+   https://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
 
@@ -2191,7 +2191,7 @@ AnnotationTransactionAspect.aspectOf().setTransactionManager(txManager); </progr
       <para>To weave your applications with the
       <classname>AnnotationTransactionAspect</classname> you must either build
       your application with AspectJ (see the <link
-      xl:href="http://www.eclipse.org/aspectj/doc/released/devguide/index.html">AspectJ
+      xl:href="https://www.eclipse.org/aspectj/doc/released/devguide/index.html">AspectJ
       Development Guide</link>) or use load-time weaving. See <xref
       linkend="aop-aj-ltw" /> for a discussion of load-time weaving with
       AspectJ.</para>
@@ -2523,7 +2523,7 @@ txManager.commit(status);</programlisting>
     <itemizedlist>
       <listitem>
         <para><link
-        xl:href="http://www.javaworld.com/javaworld/jw-01-2009/jw-01-spring-transactions.html">Distributed
+        xl:href="https://www.javaworld.com/javaworld/jw-01-2009/jw-01-spring-transactions.html">Distributed
         transactions in Spring, with and without XA</link> is a JavaWorld
         presentation in which SpringSource's David Syer guides you through
         seven patterns for distributed transactions in Spring applications,
@@ -2531,9 +2531,9 @@ txManager.commit(status);</programlisting>
       </listitem>
 
       <listitem>
-        <para><link xl:href="http://www.infoq.com/minibooks/JTDS">Java
+        <para><link xl:href="https://www.infoq.com/minibooks/JTDS">Java
         Transaction Design Strategies</link> is a book available from <link
-        xl:href="http://www.infoq.com/">InfoQ</link> that provides a well-paced
+        xl:href="https://www.infoq.com/">InfoQ</link> that provides a well-paced
         introduction to transactions in Java. It also includes side-by-side
         examples of how to configure and use transactions with both the Spring
         Framework and EJB3.</para>
diff --git a/src/reference/docbook/validation.xml b/src/reference/docbook/validation.xml
index 2eb98a76b0..22d3636aa6 100644
--- a/src/reference/docbook/validation.xml
+++ b/src/reference/docbook/validation.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>Validation, Data Binding, and Type Conversion</title>
 
   <section xml:id="validation-introduction">
@@ -233,9 +233,9 @@
     <para>More information on the
       <interfacename>MessageCodesResolver</interfacename> and the default
       strategy can be found online with the Javadocs for <link
-      xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/validation/MessageCodesResolver.html"
+      xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/validation/MessageCodesResolver.html"
       >MessageCodesResolver</link> and <link
-      xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/validation/DefaultMessageCodesResolver.html"
+      xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/validation/DefaultMessageCodesResolver.html"
       >DefaultMessageCodesResolver</link> respectively.</para>
   </section>
 
@@ -250,7 +250,7 @@
       would have a setter method <methodname>setBingoMadness(..)</methodname>
       and a getter method <methodname>getBingoMadness()</methodname>. For more
       information about JavaBeans and the specification, please refer to Sun's
-      website ( <link xl:href="http://java.sun.com/products/javabeans/"
+      website ( <link xl:href="https://java.sun.com/products/javabeans/"
       >java.sun.com/products/javabeans</link>).</para>
 
     <para>One quite important class in the beans package is the
@@ -625,7 +625,7 @@ Float salary = (Float) company.getPropertyValue("managingDirector.salary");]]></
       <para>Note that you can also use the standard
         <interfacename>BeanInfo</interfacename> JavaBeans mechanism here as well
         (described <link
-        xl:href="http://docs.oracle.com/javase/tutorial/javabeans/advanced/customization.html"
+        xl:href="https://docs.oracle.com/javase/tutorial/javabeans/advanced/customization.html"
         >in not-amazing-detail here</link>). Find below an example of using the
         <interfacename>BeanInfo</interfacename> mechanism for explicitly
         registering one or more <interfacename>PropertyEditor</interfacename>
@@ -1268,8 +1268,8 @@ public final class DateFormatter implements Formatter<Date> {
 }]]></programlisting>
 
       <para> The Spring team welcomes community-driven Formatter contributions;
-        see <link xl:href="http://jira.springframework.org"
-        >http://jira.springframework.org</link> to contribute. </para>
+        see <link xl:href="https://jira.springframework.org"
+        >https://jira.springframework.org</link> to contribute. </para>
     </section>
 
     <section xml:id="format-CustomFormatAnnotations">
@@ -1456,9 +1456,9 @@ public interface FormatterRegistrar {
     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
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+        https://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <mvc:annotation-driven/>
 
@@ -1480,9 +1480,9 @@ public interface FormatterRegistrar {
     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
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+        https://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <mvc:annotation-driven conversion-service="conversionService"/>
 
@@ -1564,7 +1564,7 @@ public class AppConfig {
     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="conversionService" class="org.springframework.format.support.FormattingConversionServiceFactoryBean">
         <property name="registerDefaultFormatters" value="false" />
@@ -1652,7 +1652,7 @@ public class AppConfig {
         these constraints will be enforced. </para>
 
       <para> For general information on JSR-303, see the <link
-        xl:href="http://jcp.org/en/jsr/detail?id=303">Bean Validation
+        xl:href="https://jcp.org/en/jsr/detail?id=303">Bean Validation
         Specification</link>. For information on the specific capabilities of
         the default reference implementation, see the <link
         xl:href="https://www.hibernate.org/412.html">Hibernate Validator</link>
@@ -1868,9 +1868,9 @@ public class MyController {
     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
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+        https://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <mvc:annotation-driven validator="globalValidator"/>
 
@@ -1910,9 +1910,9 @@ public class MyController {
     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
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+        https://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <!-- JSR-303 support will be detected on classpath and enabled automatically -->
     <mvc:annotation-driven/>
diff --git a/src/reference/docbook/view.xml b/src/reference/docbook/view.xml
index a39942eb46..237c9913ed 100644
--- a/src/reference/docbook/view.xml
+++ b/src/reference/docbook/view.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>View technologies</title>
 
   <section xml:id="view-introduction">
@@ -884,7 +884,7 @@ public String deletePet(@PathVariable int ownerId, @PathVariable int petId) {
       <para>To be able to use Tiles, you have to configure it using files
       containing definitions (for basic information on definitions and other
       Tiles concepts, please have a look at <link
-      xl:href="http://tiles.apache.org" />). In Spring this is done using the
+      xl:href="https://tiles.apache.org" />). In Spring this is done using the
       <classname>TilesConfigurer</classname>. Have a look at the following
       piece of example ApplicationContext configuration:</para>
 
@@ -1012,13 +1012,13 @@ findOwnersForm.url=/WEB-INF/jsp/findOwners.jsp
   <section xml:id="view-velocity">
     <title>Velocity &amp; FreeMarker</title>
 
-    <para><link xl:href="http://velocity.apache.org">Velocity</link> and <link
-    xl:href="http://www.freemarker.org">FreeMarker</link> are two templating
+    <para><link xl:href="https://velocity.apache.org">Velocity</link> and <link
+    xl:href="https://freemarker.apache.org/">FreeMarker</link> are two templating
     languages that can be used as view technologies within Spring MVC
     applications. The languages are quite similar and serve similar needs and
     so are considered together in this section. For semantic and syntactic
     differences between the two languages, see the <link
-    xl:href="http://www.freemarker.org">FreeMarker</link> web site.</para>
+    xl:href="https://freemarker.apache.org/">FreeMarker</link> web site.</para>
 
     <section xml:id="view-velocity-dependencies">
       <title>Dependencies</title>
@@ -1147,7 +1147,7 @@ findOwnersForm.url=/WEB-INF/jsp/findOwners.jsp
 &lt;/bean&gt;</programlisting>
 
         <para>Refer to the <link
-        xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/ui/velocity/VelocityEngineFactory.html">API
+        xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/ui/velocity/VelocityEngineFactory.html">API
         documentation</link> for Spring configuration of Velocity, or the
         Velocity documentation for examples and definitions of the
         <filename>'velocity.properties'</filename> file itself.</para>
@@ -2609,7 +2609,7 @@ simpleReport.reportDataKey=myBeanData</programlisting>
 
     <para>For an example of creating an Atom view please refer to Alef
     Arendsen's SpringSource Team Blog <link
-    xl:href="http://blog.springsource.com/2009/03/16/adding-an-atom-view-to-an-application-using-springs-rest-support/">entry</link>.</para>
+    xl:href="https://spring.io/blog/2009/03/16/adding-an-atom-view-to-an-application-using-springs-rest-support/">entry</link>.</para>
   </section>
 
   <section xml:id="view-xml-marshalling">
diff --git a/src/reference/docbook/web-integration.xml b/src/reference/docbook/web-integration.xml
index eff8255796..77e8955d51 100644
--- a/src/reference/docbook/web-integration.xml
+++ b/src/reference/docbook/web-integration.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>Integrating with other web frameworks</title>
 
   <section xml:id="intro">
@@ -14,10 +14,10 @@
 
     <para>This chapter details Spring's integration with third party web
     frameworks such as <link
-    xl:href="http://java.sun.com/javaee/javaserverfaces/">JSF</link>, <link
-    xl:href="http://struts.apache.org/">Struts</link>, <link
-    xl:href="http://www.opensymphony.com/webwork/">WebWork</link>, and <link
-    xl:href="http://tapestry.apache.org/">Tapestry</link>.</para>
+    xl:href="https://java.sun.com/javaee/javaserverfaces/">JSF</link>, <link
+    xl:href="https://struts.apache.org/">Struts</link>, <link
+    xl:href="https://www.opensymphony.com/webwork/">WebWork</link>, and <link
+    xl:href="https://tapestry.apache.org/">Tapestry</link>.</para>
 
     <!-- insert some content about Spring Web Flow here -->
 
@@ -88,7 +88,7 @@
     contains all of the 'business beans' in one's application.</para>
 
     <para>On to specifics: all that one need do is to declare a <link
-    xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/context/ContextLoaderListener.html"><classname>ContextLoaderListener</classname></link>
+    xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/context/ContextLoaderListener.html"><classname>ContextLoaderListener</classname></link>
     in the standard Java EE servlet <literal>web.xml</literal> file of one's web
     application, and add a <literal>contextConfigLocation</literal>
     &lt;context-param/&gt; section (in the same file) that defines which set
@@ -111,7 +111,7 @@
     context parameter, the <classname>ContextLoaderListener</classname> will
     look for a file called <literal>/WEB-INF/applicationContext.xml</literal>
     to load. Once the context files are loaded, Spring creates a <link
-    xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/context/WebApplicationContext.html"><classname>WebApplicationContext</classname></link>
+    xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/context/WebApplicationContext.html"><classname>WebApplicationContext</classname></link>
     object based on the bean definitions and stores it in the
     <interfacename>ServletContext</interfacename> of the web application.</para>
 
@@ -123,7 +123,7 @@
     <programlisting language="java">WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(servletContext);</programlisting>
 
     <para>The <link
-    xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/context/support/WebApplicationContextUtils.html"><classname>WebApplicationContextUtils</classname></link>
+    xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/context/support/WebApplicationContextUtils.html"><classname>WebApplicationContextUtils</classname></link>
     class is for convenience, so you don't have to remember the name of the
     <interfacename>ServletContext</interfacename> attribute. Its
     <emphasis>getWebApplicationContext()</emphasis> method will return
@@ -155,10 +155,10 @@
     official part of the Java EE umbrella.</para>
 
     <para>For a popular JSF runtime as well as for popular JSF component
-    libraries, check out the <link xl:href="http://myfaces.apache.org/">Apache
+    libraries, check out the <link xl:href="https://myfaces.apache.org/">Apache
     MyFaces project</link>. The MyFaces project also provides common JSF
     extensions such as <link
-    xl:href="http://myfaces.apache.org/orchestra/">MyFaces Orchestra</link>: a
+    xl:href="https://myfaces.apache.org/orchestra/">MyFaces Orchestra</link>: a
     Spring-based JSF extension that provides rich conversation scope
     support.</para>
 
@@ -167,7 +167,7 @@
       established Spring Faces module, both for JSF-centric usage (as
       described in this section) and for Spring-centric usage (using JSF views
       within a Spring MVC dispatcher). Check out the <link
-      xl:href="http://www.springframework.org/webflow">Spring Web Flow
+      xl:href="https://www.springframework.org/webflow">Spring Web Flow
       website</link> for details!</para>
     </note>
 
@@ -181,7 +181,7 @@
 
       <para>The easiest way to integrate one's Spring middle-tier with one's
       JSF web layer is to use the <link
-      xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/jsf/DelegatingVariableResolver.html">
+      xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/jsf/DelegatingVariableResolver.html">
       <classname>DelegatingVariableResolver</classname></link> class. To
       configure this variable resolver in one's application, one will need to
       edit one's <emphasis>faces-context.xml</emphasis> file. After the
@@ -279,7 +279,7 @@
       well when mapping one's properties to beans in
       <emphasis>faces-config.xml</emphasis>, but at times one may need to grab
       a bean explicitly. The <link
-      xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/jsf/FacesContextUtils.html">
+      xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/jsf/FacesContextUtils.html">
       <classname>FacesContextUtils</classname></link> class makes this easy.
       It is similar to <classname>WebApplicationContextUtils</classname>,
       except that it takes a <classname>FacesContext</classname> parameter
@@ -292,7 +292,7 @@
   <section xml:id="struts">
     <title>Apache Struts 1.x and 2.x</title>
 
-    <para><link xl:href="http://struts.apache.org">Struts</link> used to be the
+    <para><link xl:href="https://struts.apache.org">Struts</link> used to be the
     <emphasis>de facto</emphasis> web framework for Java applications, mainly
     because it was one of the first to be released (June 2001). It has now been renamed to <emphasis>Struts 1</emphasis>
     (as opposed to Struts 2). Many applications still use it.
@@ -311,7 +311,7 @@
       <para>Struts 2 is effectively a different product - a successor of
       WebWork 2.2 (as discussed in <xref linkend="webwork" />), carrying the
       Struts brand now. Check out the Struts 2 <link
-      xl:href="http://struts.apache.org/2.x/docs/spring-plugin.html">Spring
+      xl:href="https://struts.apache.org/2.x/docs/spring-plugin.html">Spring
       Plugin</link> for the built-in Spring integration shipped with Struts
       2. In general, Struts 2 is closer to WebWork 2.2 than to Struts 1 in
       terms of its Spring integration implications.</para>
@@ -338,7 +338,7 @@
       <title>ContextLoaderPlugin</title>
 
       <para>The <link
-      xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/ContextLoaderPlugIn.html"><classname>ContextLoaderPlugin</classname></link>
+      xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/ContextLoaderPlugIn.html"><classname>ContextLoaderPlugin</classname></link>
       is a Struts 1.1+ plug-in that loads a Spring context file for the Struts
       <classname>ActionServlet</classname>. This context refers to the root
       <classname>WebApplicationContext</classname> (loaded by the
@@ -368,7 +368,7 @@
       StrutsTestCase's <classname>MockStrutsTestCase</classname> won't
       initialize Listeners on startup so putting all your context files in the
       plugin is a workaround. (A <link
-      xl:href="http://sourceforge.net/tracker/index.php?func=detail&amp;aid=1088866&amp;group_id=39190&amp;atid=424562">
+      xl:href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1088866&amp;group_id=39190&amp;atid=424562">
       bug has been filed</link> for this issue, but has been closed as 'Wont
       Fix').</para>
 
@@ -409,7 +409,7 @@
         <title>DelegatingRequestProcessor</title>
 
         <para>To configure the <link
-        xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/DelegatingRequestProcessor.html">
+        xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/DelegatingRequestProcessor.html">
         <literal>DelegatingRequestProcessor</literal></link> in your
         <emphasis>struts-config.xml</emphasis> file, override the
         "processorClass" property in the &lt;controller&gt; element. These
@@ -437,7 +437,7 @@
         <note>
           <para>If you are using Tiles in your Struts application, you must
           configure your &lt;controller&gt; with the <link
-          xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/DelegatingTilesRequestProcessor.html"><classname>DelegatingTilesRequestProcessor</classname></link>
+          xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/DelegatingTilesRequestProcessor.html"><classname>DelegatingTilesRequestProcessor</classname></link>
           instead.</para>
         </note>
       </section>
@@ -449,7 +449,7 @@
         can't use the <classname>DelegatingRequestProcessor</classname> or
         <classname>DelegatingTilesRequestProcessor</classname> approaches, you
         can use the <link
-        xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/DelegatingActionProxy.html">
+        xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/DelegatingActionProxy.html">
         <classname>DelegatingActionProxy</classname></link> as the type in
         your action-mapping.</para>
 
@@ -487,7 +487,7 @@
       is to extend Spring's <classname>Action</classname> classes for Struts.
       For example, instead of subclassing Struts'
       <classname>Action</classname> class, you can subclass Spring's <link
-      xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/ActionSupport.html">
+      xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/ActionSupport.html">
       <classname>ActionSupport</classname></link> class.</para>
 
       <para>The <classname>ActionSupport</classname> class provides additional
@@ -516,23 +516,23 @@
       to the name: <itemizedlist spacing="compact">
           <listitem>
             <para><link
-            xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/ActionSupport.html"><classname>ActionSupport</classname></link>,</para>
+            xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/ActionSupport.html"><classname>ActionSupport</classname></link>,</para>
           </listitem>
 
           <listitem>
             <para><link
-            xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/DispatchActionSupport.html"><literal>DispatchActionSupport</literal></link>,</para>
+            xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/DispatchActionSupport.html"><literal>DispatchActionSupport</literal></link>,</para>
           </listitem>
 
           <listitem>
             <para><link
-            xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/LookupDispatchActionSupport.html"><literal>LookupDispatchActionSupport</literal></link>
+            xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/LookupDispatchActionSupport.html"><literal>LookupDispatchActionSupport</literal></link>
             and</para>
           </listitem>
 
           <listitem>
             <para><link
-            xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/MappingDispatchActionSupport.html"><literal>MappingDispatchActionSupport</literal></link>.</para>
+            xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/struts/MappingDispatchActionSupport.html"><literal>MappingDispatchActionSupport</literal></link>.</para>
           </listitem>
         </itemizedlist></para>
 
@@ -548,7 +548,7 @@
   <section xml:id="webwork">
     <title>WebWork 2.x</title>
 
-    <para>From the <link xl:href="http://www.opensymphony.com/webwork/">WebWork
+    <para>From the <link xl:href="https://www.opensymphony.com/webwork/">WebWork
     homepage</link>:</para>
 
     <para>
@@ -567,7 +567,7 @@
     nicely decoupled validation.</para>
 
     <para>One of the key enablers in WebWork's technology stack is <link
-    xl:href="http://www.opensymphony.com/webwork/wikidocs/IoC%20Overview.html">an
+    xl:href="https://www.opensymphony.com/webwork/wikidocs/IoC%20Overview.html">an
     IoC container</link> to manage Webwork Actions, handle the "wiring" of
     business objects, etc. Prior to WebWork version 2.2, WebWork used its own
     proprietary IoC container (and provided integration points so that one
@@ -582,9 +582,9 @@
     principle, it would be foolish to document the Spring-WebWork integration
     in light of the fact that the WebWork team have already written such a
     writeup. Please consult the <link
-    xl:href="http://www.opensymphony.com/webwork/wikidocs/Spring.html">Spring-WebWork
+    xl:href="https://www.opensymphony.com/webwork/wikidocs/Spring.html">Spring-WebWork
     integration page</link> on the <link
-    xl:href="http://wiki.opensymphony.com/display/WW/WebWork">WebWork wiki</link>
+    xl:href="https://wiki.opensymphony.com/display/WW/WebWork">WebWork wiki</link>
     for the full lowdown.</para>
 
     <para>Note that the Spring-WebWork integration code was developed (and
@@ -592,14 +592,14 @@
     themselves. So please refer first to the WebWork site and forums if you are
     having issues with the integration. But feel free to
     post comments and queries regarding the Spring-WebWork integration on the
-    <link xl:href="http://forum.springframework.org/forumdisplay.php?f=25">Spring
+    <link xl:href="https://forum.springframework.org/forumdisplay.php?f=25">Spring
     support forums</link>, too.</para>
   </section>
 
   <section xml:id="tapestry">
     <title>Tapestry 3.x and 4.x</title>
 
-    <para>From the <link xl:href="http://tapestry.apache.org/">Tapestry
+    <para>From the <link xl:href="https://tapestry.apache.org/">Tapestry
     homepage</link>:</para>
 
     <para>
@@ -662,8 +662,8 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        <emphasis role="bold">xmlns:jee="http://www.springframework.org/schema/jee"</emphasis>
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-<emphasis role="bold">http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee.xsd"</emphasis>&gt;
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+<emphasis role="bold">http://www.springframework.org/schema/jee https://www.springframework.org/schema/jee/spring-jee.xsd"</emphasis>&gt;
 
 &lt;beans&gt;
     &lt;!-- the DataSource --&gt;
@@ -813,7 +813,7 @@ public class MyEngine extends org.apache.tapestry.engine.BaseEngine {
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;!DOCTYPE application PUBLIC
     "-//Apache Software Foundation//Tapestry Specification 3.0//EN"
-    "http://jakarta.apache.org/tapestry/dtd/Tapestry_3_0.dtd"&gt;
+    "https://jakarta.apache.org/tapestry/dtd/Tapestry_3_0.dtd"&gt;
 &lt;application
     name="Whatever xPortal"
     engine-class="com.whatever.web.xportal.MyEngine"&gt;
@@ -844,7 +844,7 @@ public class MyEngine extends org.apache.tapestry.engine.BaseEngine {
         <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;!DOCTYPE page-specification PUBLIC
     "-//Apache Software Foundation//Tapestry Specification 3.0//EN"
-    "http://jakarta.apache.org/tapestry/dtd/Tapestry_3_0.dtd"&gt;
+    "https://jakarta.apache.org/tapestry/dtd/Tapestry_3_0.dtd"&gt;
 
 &lt;page-specification class="com.whatever.web.xportal.pages.Login"&gt;
 
@@ -1112,23 +1112,23 @@ public abstract class Login extends BasePage implements ErrorProperty, PageRende
     <itemizedlist>
       <listitem>
         <para>The <link
-        xl:href="http://java.sun.com/javaee/javaserverfaces/">JSF</link>
+        xl:href="https://java.sun.com/javaee/javaserverfaces/">JSF</link>
         homepage</para>
       </listitem>
 
       <listitem>
-        <para>The <link xl:href="http://struts.apache.org/">Struts</link>
+        <para>The <link xl:href="https://struts.apache.org/">Struts</link>
         homepage</para>
       </listitem>
 
       <listitem>
         <para>The <link
-        xl:href="http://www.opensymphony.com/webwork/">WebWork</link>
+        xl:href="https://www.opensymphony.com/webwork/">WebWork</link>
         homepage</para>
       </listitem>
 
       <listitem>
-        <para>The <link xl:href="http://tapestry.apache.org/">Tapestry</link>
+        <para>The <link xl:href="https://tapestry.apache.org/">Tapestry</link>
         homepage</para>
       </listitem>
     </itemizedlist>
diff --git a/src/reference/docbook/xml-custom.xml b/src/reference/docbook/xml-custom.xml
index f37b6306b3..02c1091cdf 100644
--- a/src/reference/docbook/xml-custom.xml
+++ b/src/reference/docbook/xml-custom.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>Extensible XML authoring</title>
     <section xml:id="extensible-xml-introduction">
         <title>Introduction</title>
@@ -270,7 +270,7 @@ public class SimpleDateFormatBeanDefinitionParser extends AbstractSingleBeanDefi
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:myns="http://www.mycompany.com/schema/myns"
       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.mycompany.com/schema/myns http://www.mycompany.com/schema/myns/myns.xsd">
 
    ]]><lineannotation>&lt;!-- as a top-level bean --&gt;</lineannotation><![CDATA[
@@ -297,7 +297,7 @@ http://www.mycompany.com/schema/myns http://www.mycompany.com/schema/myns/myns.x
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:foo="http://www.foo.com/schema/component"
       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.foo.com/schema/component http://www.foo.com/schema/component/component.xsd">
 
    ]]><lineannotation><![CDATA[<foo:component id="bionic-family" name="Bionic-1">
@@ -482,7 +482,7 @@ http\://www.foo.com/schema/component/component.xsd=com/foo/component.xsd]]></pro
             to the existing bean definition element.</para>
             <para>By way of another example, let's say that the service class that you are defining a bean
             definition for a service object that will (unknown to it) be accessing a clustered
-            <link xl:href="http://jcp.org/en/jsr/detail?id=107">JCache</link>, and you want to ensure that
+            <link xl:href="https://jcp.org/en/jsr/detail?id=107">JCache</link>, and you want to ensure that
             the named JCache instance is eagerly started within the surrounding cluster:</para>
             <programlisting language="xml"><![CDATA[<bean id="checkingAccountService" class="com.foo.DefaultCheckingAccountService"
       ]]><lineannotation>jcache:cache-name="checking.account"&gt;</lineannotation><![CDATA[
@@ -600,10 +600,10 @@ http\://www.foo.com/schema/jcache/jcache.xsd=com/foo/jcache.xsd]]></programlisti
         described in this chapter.</para>
         <itemizedlist>
             <listitem>
-                <para>The <link xl:href="http://www.w3.org/TR/2004/REC-xmlschema-1-20041028/">XML Schema Part 1: Structures Second Edition</link></para>
+                <para>The <link xl:href="https://www.w3.org/TR/2004/REC-xmlschema-1-20041028/">XML Schema Part 1: Structures Second Edition</link></para>
             </listitem>
             <listitem>
-                <para>The <link xl:href="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/">XML Schema Part 2: Datatypes Second Edition</link></para>
+                <para>The <link xl:href="https://www.w3.org/TR/2004/REC-xmlschema-2-20041028/">XML Schema Part 2: Datatypes Second Edition</link></para>
             </listitem>
         </itemizedlist>
     </section>
diff --git a/src/reference/docbook/xsd-configuration.xml b/src/reference/docbook/xsd-configuration.xml
index a78556a27c..269758f1a3 100644
--- a/src/reference/docbook/xsd-configuration.xml
+++ b/src/reference/docbook/xsd-configuration.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>XML Schema-based configuration</title>
     <section xml:id="xsd-config-introduction">
         <title>Introduction</title>
@@ -59,7 +59,7 @@
             <programlisting language="xml">
 <![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
-    "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+    "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
 
@@ -72,7 +72,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">
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 ]]><lineannotation>&lt;!-- bean definitions here --&gt;</lineannotation><![CDATA[
 
@@ -110,8 +110,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:util="http://www.springframework.org/schema/util"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- bean definitions here --&gt;</lineannotation><![CDATA[
 
@@ -144,7 +144,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
                 <section xml:id="xsd-config-body-schemas-util-frfb">
                     <title>Setting a bean property or constructor arg from a field value</title>
                     <para>
-                        <link xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.html"><classname>FieldRetrievingFactoryBean</classname></link>
+                        <link xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.html"><classname>FieldRetrievingFactoryBean</classname></link>
                         is a <interfacename>FactoryBean</interfacename> which retrieves a
                         <literal>static</literal> or non-static field value. It is typically
                         used for retrieving <literal>public</literal> <literal>static</literal>
@@ -153,7 +153,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
                     </para>
                     <para>
                         Find below an example which shows how a <literal>static</literal> field is exposed, by
-                        using the <link xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.html#setStaticField(java.lang.String)"><literal>staticField</literal></link>
+                        using the <link xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.html#setStaticField(java.lang.String)"><literal>staticField</literal></link>
                         property:
                     </para>
                     <programlisting language="xml"><![CDATA[<bean id="myField"
@@ -180,7 +180,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
                     <para>
                         It is also possible to access a non-static (instance) field of another bean,
                         as described in the API documentation for the
-                        <link xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.html"><classname>FieldRetrievingFactoryBean</classname></link>
+                        <link xl:href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.html"><classname>FieldRetrievingFactoryBean</classname></link>
                         class.
                     </para>
                     <para>
@@ -481,8 +481,8 @@ public class Client {
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:jee="http://www.springframework.org/schema/jee"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/jee https://www.springframework.org/schema/jee/spring-jee.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- bean definitions here --&gt;</lineannotation><![CDATA[
 
@@ -640,8 +640,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:lang="http://www.springframework.org/schema/lang"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/lang https://www.springframework.org/schema/lang/spring-lang.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- bean definitions here --&gt;</lineannotation><![CDATA[
 
@@ -665,8 +665,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:jms="http://www.springframework.org/schema/jms"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/jms https://www.springframework.org/schema/jms/spring-jms.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- bean definitions here --&gt;</lineannotation><![CDATA[
 
@@ -698,9 +698,9 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:aop="http://www.springframework.org/schema/aop"
        ]]><emphasis role="bold">xmlns:tx="http://www.springframework.org/schema/tx"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd</emphasis><![CDATA[
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd</emphasis><![CDATA[
+http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd">
 
 ]]><lineannotation>&lt;!-- bean definitions here --&gt;</lineannotation><![CDATA[
 
@@ -728,8 +728,8 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:aop="http://www.springframework.org/schema/aop"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- bean definitions here --&gt;</lineannotation><![CDATA[
 
@@ -748,8 +748,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:context="http://www.springframework.org/schema/context"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- bean definitions here --&gt;</lineannotation><![CDATA[
 
@@ -833,8 +833,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:jdbc="http://www.springframework.org/schema/jdbc"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- bean definitions here --&gt;</lineannotation><![CDATA[
 
@@ -858,8 +858,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:jdbc="http://www.springframework.org/schema/cache"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/cache http://www.springframework.org/schema/jdbc/spring-cache.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/cache https://www.springframework.org/schema/jdbc/spring-cache.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- bean definitions here --&gt;</lineannotation><![CDATA[
 
@@ -886,7 +886,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
 <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">
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean id="foo" class="x.y.Foo">
         ]]><emphasis role="bold"><![CDATA[<meta key="cacheName" value="foo"/>]]></emphasis><![CDATA[
@@ -906,14 +906,14 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
         popular Java IDEs to effect the easier editing of Spring's XML Schema-based
         configuration files. If your favourite Java IDE or editor is not included in the
         list of documented IDEs, then please do
-        <link xl:href="http://opensource.atlassian.com/projects/spring/secure/Dashboard.jspa">raise an issue</link>
+        <link xl:href="https://opensource.atlassian.com/projects/spring/secure/Dashboard.jspa">raise an issue</link>
         and an example with your favorite IDE/editor <emphasis>may</emphasis> be included
         in the next release.</para>
         <section xml:id="xsd-config-setup-eclipse">
         <title>Setting up Eclipse</title>
         <procedure>
             <para>The following steps illustrate setting up
-            <link xl:href="http://www.eclipse.org/">Eclipse</link> to be XSD-aware.
+            <link xl:href="https://www.eclipse.org/">Eclipse</link> to be XSD-aware.
             The assumption in the following steps is that you already have an Eclipse
             project open (either a brand new project or an already existing one).</para>
             <note>
@@ -931,8 +931,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
 </beans>]]></programlisting>
                 <para>
@@ -969,7 +969,7 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema
                                     <para>The Eclipse Web Tools Platform (WTP)</para>
                                 </entry>
                                 <entry>
-                                    <link xl:href="http://www.eclipse.org/webtools/"/>
+                                    <link xl:href="https://www.eclipse.org/webtools/"/>
                                 </entry>
                             </row>
                             <row>
@@ -977,7 +977,7 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema
                                     <para>A list of Eclipse XML plugins</para>
                                 </entry>
                                 <entry>
-                                    <link xl:href="http://eclipse-plugins.2y.net/eclipse/plugins.jsp?category=XML"/>
+                                    <link xl:href="https://eclipse-plugins.2y.net/eclipse/plugins.jsp?category=XML"/>
                                 </entry>
                             </row>
                         </tbody>
@@ -988,7 +988,7 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema
                     <para>Patches showing how to configure an Eclipse XML editor are
                     welcomed. Any such contributions are best submitted as patches via
                     the Spring Framework
-                    <link xl:href="http://opensource.atlassian.com/projects/spring/secure/Dashboard.jspa">JIRA Issue Tracker</link>
+                    <link xl:href="https://opensource.atlassian.com/projects/spring/secure/Dashboard.jspa">JIRA Issue Tracker</link>
                     and <emphasis>may</emphasis> be featured in the next release.</para>
                 </sidebar>
                 <para>Unfortunately, precisely because there is no standard XML editor for Eclipse,
@@ -1001,11 +1001,11 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema
             <step>
                 <title>Spring IDE</title>
                 <para>There is a dedicated Spring Framework plugin for Eclipse called
-                <link xl:href="http://springide.org/blog/">Spring IDE</link> and it is pretty darn cool. (There's a
+                <link xl:href="https://springide.org/blog/">Spring IDE</link> and it is pretty darn cool. (There's a
                 considered and non-biased opinion for you!) This plugin makes using Spring even easier, and it has more
                 than just support for the core Spring Framework... Spring Web Flow is supported too. Details of how to
                 install Spring IDE can be found on the
-                <link xl:href="http://springide.org/project/wiki/SpringideInstall">Spring IDE installation page</link>.</para>
+                <link xl:href="https://springide.org/project/wiki/SpringideInstall">Spring IDE installation page</link>.</para>
                 <para>
                     <mediaobject>
                         <imageobject role="fo">
@@ -1040,7 +1040,7 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema
         <title>Setting up IntelliJ IDEA</title>
         <procedure>
             <para>The following steps illustrate setting up the
-            <link xl:href="http://www.jetbrains.com/idea/">IntelliJ IDEA</link> IDE to be XSD-aware.
+            <link xl:href="https://www.jetbrains.com/idea/">IntelliJ IDEA</link> IDE to be XSD-aware.
             The assumption in the following steps is that you already have an IDEA project
             open (either a brand new project or an already existing one).</para>
             <step>
@@ -1053,8 +1053,8 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+       http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
 </beans>]]></programlisting>
                 <para>
diff --git a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
index 49e480a664..56d265dc06 100644
--- a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
+++ b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<aop:config>
 		<aop:advisor advice-ref="advice" pointcut="execution(* *..ITestBean.*(..))"/>
diff --git a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
index c5b04a53df..3f2fd1ba6a 100644
--- a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
+++ b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	Common bean definitions for auto proxy creator tests.
diff --git a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
index 59ae0b8b44..cfb1b7befb 100644
--- a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
+++ b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
@@ -4,8 +4,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation=
-		"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
+		"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd 
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"
 	default-autowire="byType">
 
 	<context:component-scan base-package="org.springframework.context.annotation">
diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml
index 45c18434e7..f9da4bfb28 100644
--- a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml
+++ b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.1.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="dev">
 
 	<bean id="devBean" class="java.lang.Object"/>
diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml
index 472a09aed7..b40902fdd0 100644
--- a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml
+++ b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.1.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="prod">
 
 	<bean id="prodBean" class="java.lang.Object"/>
diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context.xml b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context.xml
index 1ebf65c89a..207037343f 100644
--- a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context.xml
+++ b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="envAwareBean" class="org.springframework.core.env.EnvironmentIntegrationTests$EnvironmentAwareBean"/>
 
diff --git a/src/test/resources/com/foo/component-config.xml b/src/test/resources/com/foo/component-config.xml
index 44471ac7e7..d502ade7da 100644
--- a/src/test/resources/com/foo/component-config.xml
+++ b/src/test/resources/com/foo/component-config.xml
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:foo="http://www.foo.com/schema/component"
       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.foo.com/schema/component http://www.foo.com/schema/component/component.xsd">
 
    <foo:component id="bionic-family" name="Bionic-1">
diff --git a/src/test/resources/org/springframework/transaction/annotation/enable-caching.xml b/src/test/resources/org/springframework/transaction/annotation/enable-caching.xml
index efc9ec29f3..195822b291 100644
--- a/src/test/resources/org/springframework/transaction/annotation/enable-caching.xml
+++ b/src/test/resources/org/springframework/transaction/annotation/enable-caching.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:cache="http://www.springframework.org/schema/cache"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd">
 
 	<cache:annotation-driven/>