diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b635ae9ba9e..a18cea9e27b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -160,7 +160,7 @@ public class Spr8954Tests { Use `git rebase --interactive`, `git add --patch` and other tools to "squash" multiple commits into atomic changes. In addition to the man pages for git, there are many resources online to help you understand how these tools work. -Here is one: http://book.git-scm.com/4_interactive_rebasing.html. +Here is one: https://book.git-scm.com/4_interactive_rebasing.html. ## Use real name in git commits @@ -286,10 +286,10 @@ Note that you can always force push (`git push -f`) reworked / rebased commits against the branch used to submit your pull request. i.e. you do not need to issue a new pull request when asked to make changes. -[help documentation]: http://help.github.com/send-pull-requests +[help documentation]: https://help.github.com/send-pull-requests [JIRA issue tracker]: https://jira.springsource.org/browse/SPR [spring-framework-contrib]: https://groups.google.com/forum/#!forum/spring-framework-contrib [SpringSource CLA form]: https://support.springsource.com/spring_committer_signup [fork-and-edit]: https://github.com/blog/844-forking-with-the-edit-button -[commit guidelines section of Pro Git]: http://progit.org/book/ch5-2.html#commit_guidelines +[commit guidelines section of Pro Git]: https://progit.org/book/ch5-2.html#commit_guidelines [building from source]: https://github.com/SpringSource/spring-framework#building-from-source diff --git a/README.md b/README.md index 12cfb271081..0bc1978aaf3 100644 --- a/README.md +++ b/README.md @@ -66,31 +66,31 @@ The Spring Framework is released under version 2.0 of the [Apache License][]. [Spring Integration]: https://github.com/SpringSource/spring-integration [Spring Batch]: https://github.com/SpringSource/spring-batch -[family of projects]: http://springsource.org/projects +[family of projects]: https://springsource.org/projects [SpringSource organization]: https://github.com/SpringSource [.NET]: https://github.com/SpringSource/spring-net [Python]: https://github.com/SpringSource/spring-python [downloading Spring artifacts]: https://github.com/SpringSource/spring-framework/wiki/Downloading-Spring-artifacts [building a distribution with dependencies]: https://github.com/SpringSource/spring-framework/wiki/Building-a-distribution-with-dependencies -[Javadoc]: http://static.springsource.org/spring-framework/docs/current/javadoc-api -[reference docs]: http://static.springsource.org/spring-framework/docs/current/spring-framework-reference -[Spring forums]: http://forum.springsource.org -[spring tag]: http://stackoverflow.com/questions/tagged/spring -[spring-mvc tag]: http://stackoverflow.com/questions/tagged/spring-mvc -[Stack Overflow]: http://stackoverflow.com/faq -[Commercial support]: http://springsource.com/support/springsupport -[Spring Framework JIRA]: http://jira.springsource.org/browse/SPR +[Javadoc]: https://docs.spring.io/spring-framework/docs/current/javadoc-api +[reference docs]: https://docs.spring.io/spring-framework/docs/current/spring-framework-reference +[Spring forums]: https://forum.spring.io/ +[spring tag]: https://stackoverflow.com/questions/tagged/spring +[spring-mvc tag]: https://stackoverflow.com/questions/tagged/spring-mvc +[Stack Overflow]: https://stackoverflow.com/faq +[Commercial support]: https://springsource.com/support/springsupport +[Spring Framework JIRA]: https://jira.springsource.org/browse/SPR [the lifecycle of an issue]: https://github.com/cbeams/spring-framework/wiki/The-Lifecycle-of-an-Issue [spring-framework-issues]: https://github.com/SpringSource/spring-framework-issues#readme [readme]: https://github.com/SpringSource/spring-framework-issues#readme -[Gradle]: http://gradle.org -[`./gradlew`]: http://vimeo.com/34436402 -[Git]: http://help.github.com/set-up-git-redirect +[Gradle]: https://gradle.org +[`./gradlew`]: https://vimeo.com/34436402 +[Git]: https://help.github.com/set-up-git-redirect [Gradle build and release FAQ]: https://github.com/SpringSource/spring-framework/wiki/Gradle-build-and-release-FAQ -[Pull requests]: http://help.github.com/send-pull-requests +[Pull requests]: https://help.github.com/send-pull-requests [contributor guidelines]: https://github.com/SpringSource/spring-framework/blob/master/CONTRIBUTING.md -[@springframework]: http://twitter.com/springframework -[team members]: http://twitter.com/springframework/team/members -[team blog]: http://blog.springsource.org -[news feed]: http://www.springsource.org/news-events +[@springframework]: https://twitter.com/springframework +[team members]: https://twitter.com/springframework/team/members +[team blog]: https://blog.springsource.org +[news feed]: https://www.springsource.org/news-events [Apache License]: https://www.apache.org/licenses/LICENSE-2.0 diff --git a/gradle/jdiff/README.txt b/gradle/jdiff/README.txt index 9f7529e2864..ed49a1b9231 100644 --- a/gradle/jdiff/README.txt +++ b/gradle/jdiff/README.txt @@ -11,7 +11,7 @@ difference between two public Java APIs. The file jdiff.html contains the reference page for JDiff. The latest version of JDiff can be downloaded at: -http://sourceforge.net/projects/javadiff +https://sourceforge.net/projects/javadiff To use the Ant task on your own project, see example.xml. More examples of using JDiff to compare the public APIs of J2SE1.3 and J2SE1.4 can @@ -40,7 +40,7 @@ Acknowledgements JDiff uses Stuart D. Gathman's Java translation of Gene Myers' O(ND) difference algorithm. -JDiff uses Xerces 1.4.2 from http://www.apache.org. +JDiff uses Xerces 1.4.2 from https://www.apache.org. JDiff also includes a script to use the classdoc application from http://classdoc.sourceforge.net or http://www.jensgulden.de, by Jens @@ -56,4 +56,4 @@ much of this work. Footnote: If you are looking for a generalized diff tool for XML, try diffmk from -http://wwws.sun.com/software/xml/developers/diffmk/ +https://wwws.sun.com/software/xml/developers/diffmk/ diff --git a/gradle/jdiff/jdiff.html b/gradle/jdiff/jdiff.html index 5c46f967b9e..d242fb8a495 100644 --- a/gradle/jdiff/jdiff.html +++ b/gradle/jdiff/jdiff.html @@ -7,10 +7,10 @@ - - +
+ JDiff Logo SourceForge Logo SourceForge Logo
@@ -21,7 +21,7 @@ width="88" height="31" border="0" alt="JDiff Logo">
JDiff is a Javadoc doclet which generates an +href="https://java.sun.com/j2se/javadoc">doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared. This is very useful @@ -312,7 +312,7 @@ the HTML output to the given directory. -javadocnew <javadoc files location for the new API>
The location of existing Javadoc files - for the new API, e.g. "http://java.sun.com/j2se/1.5.0/docs/api/" for the + for the new API, e.g. "https://java.sun.com/j2se/1.5.0/docs/api/" for the public documentation for J2SE1.5.0. The default value is "../", which implies that the documentation directory generated by Javadoc is at the same level as the "changes.html" file generated by JDiff. Slashes are always @@ -325,7 +325,7 @@ the HTML output to the given directory.
-javadocold <javadoc files location for the old API>
The location of existing - Javadoc files for the old API, e.g. "http://java.sun.com/j2se/1.5.0/docs/API/" + Javadoc files for the old API, e.g. "https://java.sun.com/j2se/1.5.0/docs/API/" for the public documentation for J2SE1.5.0. The default value is null, which results in no links to Javadoc-generated documentation for the previous release. Slashes are always forward in the argument, since this is an HTML @@ -426,7 +426,7 @@ the HTML output to the given directory. -showallchanges
If this argument is used, JDiff will show changes in - native and synchronized modifiers. See here for why these are not shown by default. + native and synchronized modifiers. See here for why these are not shown by default.
@@ -547,7 +547,7 @@ moved to the end of the file and placed inside XML comments.
The text which is added can be HTML text if necessary, but if the HTML is incorrect, JDiff may fail to read the comments file and exit. Note that - the required HTML is in fact XHTML. Since this HTML is stored in an XML document, single tags without their closing ("slash") element are not permitted. + the required HTML is in fact XHTML. Since this HTML is stored in an XML document, single tags without their closing ("slash") element are not permitted. For example, most browsers permit HTML which looks like "<p>Here is some text.", with no closing tag. XML requires that either a closing tag exists ("</p>"), or that the single tag is closed, e.g. "<p/>Here is some text.". @@ -988,7 +988,7 @@ it can tell you how the content has changed. Nor does it compare what the methods in an API do; if JDiff could tell you what had changed about the way two versions of an API execute, the Halting +href="https://en.wikipedia.org/wiki/Halting_Problem">Halting Problem would be solved, and our lives would be very different.
  • On a P3 450MHz machine, to scan all of the J2SE Java and javax packages and generate XML takes about 2 minutes @@ -1002,14 +1002,14 @@ per version. To generate a report from the XML files takes about 30s
    • diff --git a/import-into-idea.md b/import-into-idea.md index a2f752e7261..14159d743a6 100644 --- a/import-into-idea.md +++ b/import-into-idea.md @@ -13,7 +13,7 @@ _Within your locally cloned spring-framework working directory:_ ## Known issues 1. `spring-aspects` does not compile out of the box due to references to aspect types unknown to IDEA. -See http://youtrack.jetbrains.com/issue/IDEA-64446 for details. In the meantime, the 'spring-aspects' +See https://youtrack.jetbrains.com/issue/IDEA-64446 for details. In the meantime, the 'spring-aspects' module has been excluded from the overall project to avoid compilation errors. 2. While all JUnit tests pass from the command line with Gradle, many will fail when run from IDEA. Resolving this is a work in progress. If attempting to run all JUnit tests from within IDEA, you will @@ -27,6 +27,6 @@ You'll notice these files are already intentionally in .gitignore. The same poli ## FAQ -Q. What about IDEA's own [Gradle support](http://confluence.jetbrains.net/display/IDEADEV/Gradle+integration)? +Q. What about IDEA's own [Gradle support](https://confluence.jetbrains.net/display/IDEADEV/Gradle+integration)? -A. Keep an eye on http://youtrack.jetbrains.com/issue/IDEA-53476 +A. Keep an eye on https://youtrack.jetbrains.com/issue/IDEA-53476 diff --git a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd index 22fd8fc5095..894ebe39954 100644 --- a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd +++ b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd @@ -8,8 +8,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + - - + + - - + + - - + + - - + + } XML. {@link #getPropertyDescriptors()} returns all * existing property descriptors from the wrapped {@code BeanInfo} as well any added for * non-void returning setters. Both standard ("non-indexed") and - * + * * indexed properties are fully supported. * * @author Chris Beams @@ -138,7 +138,7 @@ class ExtendedBeanInfo implements BeanInfo { } // Sort non-void returning write methods to guard against the ill effects of // non-deterministic sorting of methods returned from Class#getDeclaredMethods - // under JDK 7. See http://bugs.sun.com/view_bug.do?bug_id=7023180 + // under JDK 7. See https://bugs.java.com/view_bug.do?bug_id=7023180 Collections.sort(matches, new Comparator() { public int compare(Method m1, Method m2) { return m2.toString().compareTo(m1.toString()); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java index 3fa565e656f..2dc3a0d4b37 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java @@ -110,7 +110,7 @@ import org.springframework.core.io.support.ResourcePatternUtils; * {@code beanRefFactory.xml} definition file: * * 
    <?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>
  *
@@ -140,7 +140,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * Another relatively simple variation of the {@code beanRefFactory.xml} definition file could be:
  *
  * 
    <?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>
  *
@@ -199,7 +199,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * 
    {@code beanRefFactory.xml} file inside jar for util module:
  *
  * 
    <?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 id="com.mycompany.myapp.util" lazy-init="true"
@@ -214,7 +214,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * {@code beanRefFactory.xml} file inside jar for data-access module:
    
  *
  * 
    <?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>
  *   <!-- child of util -->
@@ -233,7 +233,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * {@code beanRefFactory.xml} file inside jar for services module:
  *
  * 
    <?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>
  *   <!-- child of data-access -->
@@ -254,7 +254,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * a name known to this module:
  *
  * 
    <?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>
  *   <!-- define an alias for "com.mycompany.myapp.services" -->
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
index 026604058d4..bc255301b9b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.InitializingBean;
 
 /**
  * Factory bean for
- * commons-logging
+ * commons-logging
  * {@link org.apache.commons.logging.Log} instances.
  *
  * 
    Useful for sharing Log instances among multiple beans instead of using
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
index d4454c46ee6..d81a225d3e5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
@@ -8,7 +8,7 @@
  * Builds on the org.springframework.beans package.
  *
  * 
    This package and related packages are discussed in Chapter 11 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
  * by Rod Johnson (Wrox, 2002).
  *
  */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
index 85002456524..f40371a4fc7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
@@ -1468,7 +1468,7 @@ public class BeanDefinitionParserDelegate {
 			if (handler != null) {
 				return handler.decorate(node, originalDef, new ParserContext(this.readerContext, this, containingBd));
 			}
-			else if (namespaceUri != null && namespaceUri.startsWith("http://www.springframework.org/")) {
+			else if (namespaceUri != null && namespaceUri.startsWith("https://www.springframework.org/")) {
 				error("Unable to locate Spring NamespaceHandler for XML schema namespace [" + namespaceUri + "]", node);
 			}
 			else {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
index 6d46441c8c3..f47cfd5528e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
@@ -34,7 +34,7 @@ import org.springframework.core.io.Resource;
  * 
    Fetches "spring-beans-2.0.dtd" from the class path resource
  * "/org/springframework/beans/factory/xml/spring-beans-2.0.dtd",
  * no matter whether specified as some local URL that includes "spring-beans"
- * in the DTD name or as "http://www.springframework.org/dtd/spring-beans-2.0.dtd".
+ * in the DTD name or as "https://www.springframework.org/dtd/spring-beans-2.0.dtd".
  *
  * @author Juergen Hoeller
  * @author Colin Sampaleanu
diff --git a/spring-beans/src/main/java/org/springframework/beans/package-info.java b/spring-beans/src/main/java/org/springframework/beans/package-info.java
index 11d8730cd96..e27b85f7a89 100644
--- a/spring-beans/src/main/java/org/springframework/beans/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/package-info.java
@@ -8,7 +8,7 @@
  * singly or in bulk.
  *
  * 
    The classes in this package are discussed in Chapter 11 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
  * by Rod Johnson (Wrox, 2002).
  *
  */
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
index edb9aca7b3c..669bd05f43f 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
@@ -34,7 +34,7 @@
 	XML documents that conform to this DTD should declare the following doctype:
 
 	
+			"https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 -->
 
 
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
index fe521abffb5..71a79d692a8 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
@@ -34,7 +34,7 @@
 	XML documents that conform to this DTD should declare the following doctype:
 
 	
+		"https://www.springframework.org/dtd/spring-beans.dtd">
 -->
 
 
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
index 509c0eeaeee..e5be655ccaf 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
index eb04ecff4a5..b76bfe3d799 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
index 287e31ba81c..ad4c9daceed 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd
index 9b5774a46c4..4cf6f846ec8 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd
index f7a754aa6c2..e24d757f64a 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
index d269e5d5d7d..5c7676cd8ca 100644
--- a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
@@ -569,7 +569,7 @@ public class ExtendedBeanInfoTests {
 	 * IntrospectionException regarding a "type mismatch between indexed and non-indexed
 	 * methods" intermittently (approximately one out of every four times) under JDK 7
 	 * due to non-deterministic results from {@link Class#getDeclaredMethods()}.
-	 * See http://bugs.sun.com/view_bug.do?bug_id=7023180
+	 * See https://bugs.java.com/view_bug.do?bug_id=7023180
 	 * @see #cornerSpr9702()
 	 */
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index f877d1ab59c..e75af7c8727 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -1362,7 +1362,7 @@ public class DefaultListableBeanFactoryTests {
 	/**
 	 * Verifies that a dependency on a {@link FactoryBean} can be autowired
 	 * by type, specifically addressing the JIRA issue raised in SPR-4040.
 	 */
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
index 918df5c6656..67abf172426 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
@@ -942,7 +942,7 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 	 * Verifies that a dependency on a {@link FactoryBean} can be autowired via
 	 * {@link Autowired @Autowired}, specifically addressing the JIRA issue
 	 * raised in SPR-4040.
 	 */
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
index 41eeb424d58..73a4ec2d391 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
@@ -550,7 +550,7 @@ public class InjectAnnotationBeanPostProcessorTests {
 	 * Verifies that a dependency on a {@link org.springframework.beans.factory.FactoryBean} can be autowired via
 	 * {@link org.springframework.beans.factory.annotation.Autowired @Inject}, specifically addressing the JIRA issue
 	 * raised in SPR-4040.
 	 */
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
index 935bc270330..a467f6ba627 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
@@ -649,7 +649,7 @@ public class BeanFactoryGenericsTests {
 				new ClassPathResource("genericBeanTests.xml", getClass()));
 		UrlSet us = (UrlSet) bf.getBean("setBean");
 		assertEquals(1, us.size());
-		assertEquals(new URL("http://www.springframework.org"), us.iterator().next());
+		assertEquals(new URL("https://www.springframework.org"), us.iterator().next());
 	}
 
 	/**
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java
index f77eddb4787..d5cdd5d0d09 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java
@@ -51,22 +51,22 @@ public class URIEditorTests {
 
 	@Test
 	public void standardURL() throws Exception {
-		doTestURI("http://www.springframework.org");
+		doTestURI("https://www.springframework.org");
 	}
 
 	@Test
 	public void standardURLWithFragment() throws Exception {
-		doTestURI("http://www.springframework.org#1");
+		doTestURI("https://www.springframework.org#1");
 	}
 
 	@Test
 	public void standardURLWithWhitespace() throws Exception {
 		PropertyEditor uriEditor = new URIEditor();
-		uriEditor.setAsText("  http://www.springframework.org  ");
+		uriEditor.setAsText("  https://www.springframework.org  ");
 		Object value = uriEditor.getValue();
 		assertTrue(value instanceof URI);
 		URI uri = (URI) value;
-		assertEquals("http://www.springframework.org", uri.toString());
+		assertEquals("https://www.springframework.org", uri.toString());
 	}
 
 	@Test
@@ -121,23 +121,23 @@ public class URIEditorTests {
 	@Test
 	public void encodeURI() throws Exception {
 		PropertyEditor uriEditor = new URIEditor();
-		uriEditor.setAsText("http://example.com/spaces and \u20AC");
+		uriEditor.setAsText("https://example.com/spaces and \u20AC");
 		Object value = uriEditor.getValue();
 		assertTrue(value instanceof URI);
 		URI uri = (URI) value;
 		assertEquals(uri.toString(), uriEditor.getAsText());
-		assertEquals("http://example.com/spaces%20and%20%E2%82%AC", uri.toASCIIString());
+		assertEquals("https://example.com/spaces%20and%20%E2%82%AC", uri.toASCIIString());
 	}
 
 	@Test
 	public void encodeAlreadyEncodedURI() throws Exception {
 		PropertyEditor uriEditor = new URIEditor(false);
-		uriEditor.setAsText("http://example.com/spaces%20and%20%E2%82%AC");
+		uriEditor.setAsText("https://example.com/spaces%20and%20%E2%82%AC");
 		Object value = uriEditor.getValue();
 		assertTrue(value instanceof URI);
 		URI uri = (URI) value;
 		assertEquals(uri.toString(), uriEditor.getAsText());
-		assertEquals("http://example.com/spaces%20and%20%E2%82%AC", uri.toASCIIString());
+		assertEquals("https://example.com/spaces%20and%20%E2%82%AC", uri.toASCIIString());
 	}
 
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java
index 303384841ac..58cd58cf99e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java
@@ -43,7 +43,7 @@ public final class URLEditorTests {
 	@Test
 	public void testStandardURL() throws Exception {
 		PropertyEditor urlEditor = new URLEditor();
-		urlEditor.setAsText("http://www.springframework.org");
+		urlEditor.setAsText("https://www.springframework.org");
 		Object value = urlEditor.getValue();
 		assertTrue(value instanceof URL);
 		URL url = (URL) value;
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
index 3263df5a36a..cdd40231dd5 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Support classes for the open source cache
- * EhCache,
+ * EhCache,
  * allowing to set up an EhCache CacheManager and Caches
  * as beans in a Spring context.
  */
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/mime.types b/spring-context-support/src/main/java/org/springframework/mail/javamail/mime.types
index 08b43938d48..1e9ce6776de 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/mime.types
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/mime.types
@@ -47,7 +47,7 @@ video/x-msvideo				avi
 ################################################################################
 #
 # Additional file types adapted from
-# http://www.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html
+# https://www.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html
 # kindly re-licensed to Apache Software License 2.0 by Ian Graham.
 #
 ################################################################################
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
index 3e625f0c791..28d3fcfd6c7 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
@@ -146,7 +146,7 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod
 	 * fashion. The behavior when one does not want concurrent jobs to be
 	 * executed is realized through adding the {@link StatefulJob} interface.
 	 * More information on stateful versus stateless jobs can be found
-	 * here.
+	 * here.
 	 * 
    The default setting is to run jobs concurrently.
 	 */
 	public void setConcurrent(boolean concurrent) {
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java
index 4b8a70a1821..d3df1714af0 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Support classes for the open source scheduler
- * Quartz,
+ * Quartz,
  * allowing to set up Quartz Schedulers, JobDetails and
  * Triggers as beans in a Spring context. Also provides
  * convenience classes for implementing Quartz Jobs.
diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java
index b64940311be..f2ad4f0bfaa 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Support classes for setting up
- * FreeMarker
+ * FreeMarker
  * within a Spring application context.
  *
  */
diff --git a/spring-context-support/src/main/java/org/springframework/ui/velocity/package-info.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/package-info.java
index 5553de94639..4df19fcb7ad 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/velocity/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Support classes for setting up
- * Velocity
+ * Velocity
  * within a Spring application context.
  *
  */
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
index b398dcd8398..b42a94679d3 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
@@ -31,7 +31,7 @@ import org.springframework.aop.support.DefaultPointcutAdvisor;
  * target implements. Exists primarily for third-party framework integration.
  * Users should favor the {@code cache:} XML namespace
  * {@link org.springframework.cache.annotation.Cacheable @Cacheable} annotation.
- * See the declarative annotation-based caching section
+ * See the declarative annotation-based caching section
  * of the Spring reference documentation for more information.
  *
  * @author Costin Leau
diff --git a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
index 9d4556b2c25..469e963875a 100644
--- a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
+++ b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
@@ -36,7 +36,7 @@ import org.springframework.core.NamedThreadLocal;
  *
  * 
    For an implementation of a thread-based {@code Scope} with support for
  * destruction callbacks, refer to the
- * 
+ * 
 *  Spring by Example Custom Thread Scope Module.
  *
  * 
    Thanks to Eugene Kuleshov for submitting the original prototype for a thread scope!
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/package-info.java b/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
index 9615bb81469..74b31e223f0 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
@@ -14,7 +14,7 @@
  * affecting code using business objects.
  *
  * 
    The motivation for the classes in this package are discussed in Chapter 11 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
  * by Rod Johnson (Wrox, 2002).
  *
  * 
    However, the implementation and naming of classes in this package has changed.
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
index 3a4732fe046..a57d3bf4051 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
@@ -34,8 +34,8 @@ import org.springframework.jmx.MBeanServerNotFoundException;
  * This FactoryBean is a direct alternative to {@link MBeanServerFactoryBean},
  * which uses standard JMX 1.2 API to access the platform's MBeanServer.
  *
- * 
    See Javadoc for WebSphere's {@code
- * AdminServiceFactory} and {@code MBeanFactory}.
+ * 
    See Javadoc for WebSphere's {@code
+ * AdminServiceFactory} and {@code MBeanFactory}.
  *
  * @author Juergen Hoeller
  * @author Rob Harrop
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java b/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java
index 8f2465fd9cc..456fd90785a 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java
@@ -28,7 +28,7 @@ import org.springframework.core.env.PropertySource;
  * {@link JndiLocatorDelegate#setResourceRef(boolean) "resourceRef"} property set to
  * {@code true}, meaning that names looked up will automatically be prefixed with
  * "java:comp/env/" in alignment with published
- * JNDI
+ * JNDI
  * naming conventions. To override this setting or to change the prefix, manually
  * configure a {@code JndiLocatorDelegate} and provide it to one of the constructors here
  * that accepts it. The same applies when providing custom JNDI properties. These should
diff --git a/spring-context/src/main/java/org/springframework/jndi/package-info.java b/spring-context/src/main/java/org/springframework/jndi/package-info.java
index eb6ebde08a8..a5efc5a45f2 100644
--- a/spring-context/src/main/java/org/springframework/jndi/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jndi/package-info.java
@@ -6,7 +6,7 @@
  * and provide useful superclasses for JNDI access classes.
  *
  * 
    The classes in this package are discussed in Chapter 11 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
  * by Rod Johnson (Wrox, 2002).
  *
  */
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
index c85ac5a04a3..7c87c090624 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
@@ -221,7 +221,7 @@ public abstract class RmiClientInterceptorUtils {
 	 * connection failure.
 	 * 
    This is relevant on the IBM JVM, in particular for WebSphere EJB clients.
 	 * 
    See the
-	 * IBM website
+	 * IBM website
 	 * for details.
 	 * @param ex the RMI exception to check
 	 */
diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/package-info.java
index 840033ddecf..8498c854faf 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Scheduling convenience classes for the
- * JSR-166 backport
+ * JSR-166 backport
  * Executor mechanism, allowing to set up a ThreadPoolExecutor
  * as a TaskExecutor-compliant bean in a Spring context.
  *
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
index 0f135d63547..cf3141e3079 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.InitializingBean;
  * (ideally on the VM bootstrap classpath).
  *
  * 
    For details on the ForkJoinPool API and its use with RecursiveActions, see the
- * JDK 7 javadoc.
+ * JDK 7 javadoc.
  *
  * 
    {@code jsr166.jar}, containing {@code java.util.concurrent} updates for Java 6, can be obtained
  * from the concurrency interest website.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
index c096ee8fbc6..f7953ae9d8e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
@@ -30,7 +30,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * Date sequence generator for a
- * Crontab pattern,
+ * Crontab pattern,
  * allowing clients to specify a pattern that the sequence matches.
  *
  * 
    The pattern is a list of six single space-separated fields: representing
diff --git a/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java b/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java
index 6cf9cbef985..20eaa6cb624 100644
--- a/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Package providing integration of
- * Groovy
+ * Groovy
  * into Spring's scripting infrastructure.
  *
  */
diff --git a/spring-context/src/main/java/org/springframework/scripting/jruby/package-info.java b/spring-context/src/main/java/org/springframework/scripting/jruby/package-info.java
index 509ff145e0f..525a4c00cbd 100644
--- a/spring-context/src/main/java/org/springframework/scripting/jruby/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scripting/jruby/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Package providing integration of
- * JRuby
+ * JRuby
  * into Spring's scripting infrastructure.
  *
  */
diff --git a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd
index eab936d9ab9..377d6c46524 100644
--- a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd
+++ b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
 
-	
-	
+	
+	
 
 	
 		
 
-	
-	
+	
+	
 
 	
 		
 
 	
+		schemaLocation="https://www.springframework.org/schema/beans/spring-beans-3.0.xsd" />
 	
+		schemaLocation="https://www.springframework.org/schema/tool/spring-tool-3.0.xsd" />
 
 	
 		
 
-	
-	
+	
+	
 
 	
 		
 
-	
-	
+	
+	
 
 	
 		
 
-	
-	
+	
+	
 
 	
 		
 
-	
-	
+	
+	
 
 	
 		
 
-	
-	
+	
+	
 
 	
 		
 
-	
-	
+	
+	
 
 	
 		
 
-	
-	
+	
+	
 
 	
 		
 	
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.1.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.1.xsd
index 56680707c22..b16023038e5 100644
--- a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.1.xsd
+++ b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.1.xsd
@@ -14,8 +14,8 @@
 		]]>
 	
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd
index eb23e55017b..bb1341b648c 100644
--- a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd
+++ b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd
@@ -14,8 +14,8 @@
 		]]>
 	
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd
index 5ec021b695d..efcfa3b4f9f 100644
--- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd
+++ b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd
@@ -16,8 +16,8 @@
 		]]>
 	
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd
index e6288503896..81adeba753b 100644
--- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd
+++ b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd
@@ -16,8 +16,8 @@
 		]]>
 	
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
index 5a34213de74..b3c16e4c1fa 100644
--- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
+++ b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
@@ -16,8 +16,8 @@
 		]]>
 	
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.1.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.1.xsd
index 54ae90e9e12..2be30b9a88d 100644
--- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.1.xsd
+++ b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.1.xsd
@@ -16,8 +16,8 @@
 		]]>
 	
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.2.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.2.xsd
index 5bd66ded436..bffa370efc6 100644
--- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.2.xsd
+++ b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.2.xsd
@@ -16,8 +16,8 @@
 		]]>
 	
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
index 4211126f561..65fdbda9703 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
@@ -151,7 +151,7 @@ public class CustomNamespaceHandlerTests {
 	}
 
 	/**
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2728
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2728
 	 */
 	@Test
 	public void testCustomElementNestedWithinUtilList() throws Exception {
@@ -161,7 +161,7 @@ public class CustomNamespaceHandlerTests {
 	}
 
 	/**
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2728
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2728
 	 */
 	@Test
 	public void testCustomElementNestedWithinUtilSet() throws Exception {
@@ -171,7 +171,7 @@ public class CustomNamespaceHandlerTests {
 	}
 
 	/**
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2728
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2728
 	 */
 	@Test
 	public void testCustomElementNestedWithinUtilMap() throws Exception {
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
index 9a83e6a34be..8d531fee4a6 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
@@ -38,7 +38,7 @@ import org.springframework.util.ObjectUtils;
  * 
    
  * JUnit-3.8-based unit test which verifies expected init and
  * destroy bean lifecycle behavior as requested in SPR-3775.
  * 
    
  * 
    
diff --git a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
index d7f16f87fb2..b2011be0a9a 100644
--- a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
  * run only if {@link TestGroup#JMXMP} is enabled. If you wish to run these tests, follow
  * the instructions in the TestGroup class to enable JMXMP tests. If you run into the
  * "Unsupported protocol: jmxmp" error, you will need to download the
- * 
+ * 
  * JMX Remote API 1.0.1_04 Reference Implementation from Oracle and extract
  * {@code jmxremote_optional.jar} into your classpath, for example in the {@code lib/ext}
  * folder of your JVM.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
index b5abac2c951..df7e33b791e 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
@@ -74,7 +74,7 @@ public class MethodExclusionMBeanInfoAssemblerTests extends AbstractJmxAssembler
 	}
 
 	/*
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2754
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2754
 	 */
 	@Test
 	public void testIsNotIgnoredDoesntIgnoreUnspecifiedBeanMethods() throws Exception {
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
index 5569165c945..9aaa7ed6aeb 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
@@ -315,7 +315,7 @@ public class GroovyScriptFactoryTests {
 	}
 
 	@Ignore
-	// see http://build.springframework.org/browse/SPR-TRUNKQUICK-908
+	// see https://build.springframework.org/browse/SPR-TRUNKQUICK-908
 	@Test
 	public void testResourceScriptFromTag() throws Exception {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java b/spring-context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
index 1110206e149..b9377b3877a 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
@@ -1,7 +1,7 @@
 package org.springframework.scripting.jruby;
 
 /**
- * http://opensource.atlassian.com/projects/spring/browse/SPR-3026
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-3026
  *
  * @author Rick Evans
  */
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
index a7f613bd4be..854d20faff2 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
@@ -19,7 +19,7 @@ package org.springframework.scripting.jruby;
 import java.util.Map;
 
 /**
- * http://opensource.atlassian.com/projects/spring/browse/SPR-3038
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-3038
  *
  * @author Rick Evans
  */
diff --git a/spring-core/src/main/java/org/springframework/asm/package-info.java b/spring-core/src/main/java/org/springframework/asm/package-info.java
index 9ced53eaa37..0ae1905bc5c 100644
--- a/spring-core/src/main/java/org/springframework/asm/package-info.java
+++ b/spring-core/src/main/java/org/springframework/asm/package-info.java
@@ -1,7 +1,7 @@
 
 /**
  * Spring's repackaging of
- * org.objectweb.asm 5.0
+ * org.objectweb.asm 5.0
  * (for internal use only).
  *
  * 
    This repackaging technique avoids any potential conflicts with
@@ -10,7 +10,7 @@
  *
  * 
    As this repackaging happens at the class file level, sources
  * and javadocs are not available here. See the original ObjectWeb
- * ASM 5.0 javadocs
+ * ASM 5.0 javadocs
  * for details when working with these classes.
  *
  * @since 3.2
diff --git a/spring-core/src/main/java/org/springframework/cglib/package-info.java b/spring-core/src/main/java/org/springframework/cglib/package-info.java
index 0d48d06332d..4420ad2bd38 100644
--- a/spring-core/src/main/java/org/springframework/cglib/package-info.java
+++ b/spring-core/src/main/java/org/springframework/cglib/package-info.java
@@ -22,7 +22,7 @@
  * libraries and frameworks.
  * 
    As this repackaging happens at the classfile level, sources and Javadoc
  * are not available here. See the original
- * CGLIB 3 Javadoc
+ * CGLIB 3 Javadoc
  * for details when working with these classes.
  *
  * @since 3.2
diff --git a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
index dbbf21bf44d..ffaf62aa310 100644
--- a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
@@ -39,7 +39,7 @@ import org.springframework.util.ReflectionUtils;
  * When attempting to locate annotations on {@link Method Methods}, it is wise to check
  * for bridge {@link Method Methods} as appropriate and find the bridged {@link Method}.
  *
- * 
    See 
+ * 
    See 
  * The Java Language Specification for more details on the use of bridge methods.
  *
  * @author Rob Harrop
@@ -213,8 +213,8 @@ public abstract class BridgeMethodResolver {
 	/**
 	 * Compare the signatures of the bridge method and the method which it bridges. If
 	 * the parameter and return types are the same, it is a 'visibility' bridge method
-	 * introduced in Java 6 to fix http://bugs.sun.com/view_bug.do?bug_id=6342411.
-	 * See also http://stas-blogspot.blogspot.com/2010/03/java-bridge-methods-explained.html
+	 * introduced in Java 6 to fix https://bugs.java.com/view_bug.do?bug_id=6342411.
+	 * See also https://stas-blogspot.blogspot.com/2010/03/java-bridge-methods-explained.html
 	 * @return whether signatures match as described
 	 */
 	public static boolean isVisibilityBridgeMethodPair(Method bridgeMethod, Method bridgedMethod) {
diff --git a/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java b/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
index c8d145ee3ed..2522e0ef155 100644
--- a/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
+++ b/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  * @since 3.2
- * @see Neal Gafter on Super Type Tokens
+ * @see Neal Gafter on Super Type Tokens
  */
 public abstract class ParameterizedTypeReference {
 
diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
index d9a743c90cc..ede8c6d6d81 100644
--- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
 /**
  * PathMatcher implementation for Ant-style path patterns. Examples are provided below.
  *
- * 
    Part of this mapping code has been kindly borrowed from Apache Ant.
+ * 
    Part of this mapping code has been kindly borrowed from Apache Ant.
  *
  * 
    The mapping matches URLs using the following rules:
     
       
    • ? matches one character
      •  
    • * matches zero
  * or more characters
      •  
    • ** matches zero or more 'directories' in a path
      •  
    
diff --git a/spring-core/src/main/java/org/springframework/util/DigestUtils.java b/spring-core/src/main/java/org/springframework/util/DigestUtils.java
index e26c18f25b4..169bb99837e 100644
--- a/spring-core/src/main/java/org/springframework/util/DigestUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/DigestUtils.java
@@ -22,7 +22,7 @@ import java.security.NoSuchAlgorithmException;
 /**
  * Miscellaneous methods for calculating digests.
  * 
    Mainly for internal use within the framework; consider
- * Apache Commons Codec for a
+ * Apache Commons Codec for a
  * more comprehensive suite of digest utilities.
  *
  * @author Arjen Poutsma
diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index d3d65596354..a12810c90a8 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -34,7 +34,7 @@ import java.util.TreeSet;
  * Miscellaneous {@link String} utility methods.
  *
  * 
    Mainly for internal use within the framework; consider
- * Jakarta's Commons Lang
+ * Jakarta's Commons Lang
  * for a more comprehensive suite of String utilities.
  *
  * 
    This class delivers some simple functionality that should really
diff --git a/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java b/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
index 3904faaac9c..b2bb40edc0d 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
@@ -66,7 +66,7 @@ public abstract class TransformerUtils {
 		transformer.setOutputProperty(OutputKeys.INDENT, "yes");
 		try {
 			// Xalan-specific, but this is the most common XSLT engine in any case
-			transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", String.valueOf(indentAmount));
+			transformer.setOutputProperty("{https://xml.apache.org/xslt}indent-amount", String.valueOf(indentAmount));
 		}
 		catch (IllegalArgumentException ignored) {
 		}
diff --git a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
index 2ec796015d7..56102feaaa0 100644
--- a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
@@ -395,12 +395,12 @@ public class StandardEnvironmentTests {
 		SecurityManager securityManager = new SecurityManager() {
 			@Override
 			public void checkPropertiesAccess() {
-				// see http://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getProperties()
+				// see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getProperties()
 				throw new AccessControlException("Accessing the system properties is disallowed");
 			}
 			@Override
 			public void checkPropertyAccess(String key) {
-				// see http://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getProperty(java.lang.String)
+				// see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getProperty(java.lang.String)
 				if (DISALLOWED_PROPERTY_NAME.equals(key)) {
 					throw new AccessControlException(
 							String.format("Accessing the system property [%s] is disallowed", DISALLOWED_PROPERTY_NAME));
@@ -462,11 +462,11 @@ public class StandardEnvironmentTests {
 		SecurityManager securityManager = new SecurityManager() {
 			@Override
 			public void checkPermission(Permission perm) {
-				//see http://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getenv()
+				//see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getenv()
 				if ("getenv.*".equals(perm.getName())) {
 					throw new AccessControlException("Accessing the system environment is disallowed");
 				}
-				//see http://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getenv(java.lang.String)
+				//see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getenv(java.lang.String)
 				if (("getenv."+DISALLOWED_PROPERTY_NAME).equals(perm.getName())) {
 					throw new AccessControlException(
 							String.format("Accessing the system environment variable [%s] is disallowed", DISALLOWED_PROPERTY_NAME));
diff --git a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
index 62ccb219b17..38d0a0482ab 100644
--- a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
@@ -177,7 +177,7 @@ public class ResourceTests {
 
 	@Ignore @Test // this test is quite slow. TODO: re-enable with JUnit categories
 	public void testNonFileResourceExists() throws Exception {
-		Resource resource = new UrlResource("http://www.springframework.org");
+		Resource resource = new UrlResource("https://www.springframework.org");
 		assertTrue(resource.exists());
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java b/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
index 3ac4ee5ca8b..bebf5c096a5 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
@@ -42,7 +42,7 @@ public class TransformerUtilsTests {
 		String indent = transformer.getOutputProperty(OutputKeys.INDENT);
 		assertNotNull(indent);
 		assertEquals("yes", indent);
-		String indentAmount = transformer.getOutputProperty("{http://xml.apache.org/xslt}indent-amount");
+		String indentAmount = transformer.getOutputProperty("{https://xml.apache.org/xslt}indent-amount");
 		assertNotNull(indentAmount);
 		assertEquals(String.valueOf(TransformerUtils.DEFAULT_INDENT_AMOUNT), indentAmount);
 	}
@@ -55,7 +55,7 @@ public class TransformerUtilsTests {
 		String indent = transformer.getOutputProperty(OutputKeys.INDENT);
 		assertNotNull(indent);
 		assertEquals("yes", indent);
-		String indentAmount = transformer.getOutputProperty("{http://xml.apache.org/xslt}indent-amount");
+		String indentAmount = transformer.getOutputProperty("{https://xml.apache.org/xslt}indent-amount");
 		assertNotNull(indentAmount);
 		assertEquals(indentAmountProperty, indentAmount);
 	}
diff --git a/spring-expression/readme.txt b/spring-expression/readme.txt
index f374935be6c..ea0720e5961 100644
--- a/spring-expression/readme.txt
+++ b/spring-expression/readme.txt
@@ -31,7 +31,7 @@ Syntax
 - Need to agree on a standard date format for 'default' processing of dates.  Currently it is:
   formatter = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss z", Locale.UK);
   // this is something of this format: "Wed, 4 Jul 2001 12:08:56 GMT"
-  // http://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html
+  // https://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html
 - See LiteralTests for Date (4,5,6) - should date take an expression rather than be hardcoded in the grammar
   to take 2 strings only?
 - when doing arithmetic, eg. 8.4 / 4  and the user asks for an Integer return type - do we silently coerce or
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
index df994a70328..e70c7b45a09 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
@@ -25,7 +25,7 @@ import org.springframework.expression.spel.ExpressionState;
  * Implements the {@code multiply} operator.
  *
  * 
    Conversions and promotions are handled as defined in
- * Section 5.6.2
+ * Section 5.6.2
  * of the Java Language Specification:
  *
  * 
    If any of the operands is of a reference type, unboxing conversion (Section 5.1.8) is performed. Then:
    
diff --git a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
index 4f341ea3081..ad7799b4a9b 100644
--- a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
+++ b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
@@ -30,8 +30,8 @@ import org.springframework.instrument.classloading.WeavingTransformer;
  * to loaded classes without the need to use a VM-wide agent.
  *
  * 
    To be registered using a
- * {@code Loader} tag
- * in Tomcat's {@code Context}
+ * {@code Loader} tag
+ * in Tomcat's {@code Context}
  * definition in the {@code server.xml} file, with the Spring-provided "spring-instrument-tomcat.jar"
  * file deployed into Tomcat's "server/lib" (for Tomcat 5.x) or "lib" (for Tomcat 6.x) directory.
  * The required configuration tag looks as follows:
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
index e7f28f1ae8a..9d538e7baaa 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
@@ -53,8 +53,8 @@ import org.springframework.util.ClassUtils;
  * bean definition to a local DataSource (which is simpler and thus recommended).
  *
  * 
    If you need a "real" connection pool outside of a J2EE container, consider
- * Apache's Jakarta Commons DBCP
- * or C3P0.
+ * Apache's Jakarta Commons DBCP
+ * or C3P0.
  * Commons DBCP's BasicDataSource and C3P0's ComboPooledDataSource are full
  * connection pool beans, supporting the same basic properties as this class
  * plus specific settings (such as minimal/maximal pool size etc).
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
index 342066926cc..325acbd90e9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
@@ -40,8 +40,8 @@ import org.springframework.util.Assert;
  * for seamless switching to and from a local DataSource bean like this class.
  *
  * 
    If you need a "real" connection pool outside of a J2EE container, consider
- * Apache's Jakarta Commons DBCP
- * or C3P0.
+ * Apache's Jakarta Commons DBCP
+ * or C3P0.
  * Commons DBCP's BasicDataSource and C3P0's ComboPooledDataSource are full
  * connection pool beans, supporting the same basic properties as this class
  * plus specific settings (such as minimal/maximal pool size etc).
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
index ad004789587..4a031eef0f2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
@@ -35,7 +35,7 @@ import org.springframework.util.StringUtils;
  *
  * 
    Uses IBM-specific API to get a JDBC Connection with a specific isolation
  * level (and read-only flag) from a WebSphere DataSource
- * (IBM code example).
+ * (IBM code example).
  * Supports the transaction-specific isolation level exposed by
  * {@link org.springframework.transaction.support.TransactionSynchronizationManager#getCurrentTransactionIsolationLevel()}.
  * It's also possible to specify a default isolation level, to be applied when the
@@ -147,8 +147,8 @@ public class WebSphereDataSourceAdapter extends IsolationLevelDataSourceAdapter
 	 * Create a WebSphere {@code JDBCConnectionSpec} object for the given charateristics.
 	 * 
    The default implementation uses reflection to apply the given settings.
 	 * Can be overridden in subclasses to customize the JDBCConnectionSpec object
-	 * (JDBCConnectionSpec javadoc;
-	 * IBM developerWorks article).
+	 * (JDBCConnectionSpec javadoc;
+	 * IBM developerWorks article).
 	 * @param isolationLevel the isolation level to apply (or {@code null} if none)
 	 * @param readOnlyFlag the read-only flag to apply (or {@code null} if none)
 	 * @param username the username to apply ({@code null} or empty indicates the default)
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
index 1dfc47c03d4..81f2b6984c6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
@@ -28,10 +28,10 @@ public enum EmbeddedDatabaseType {
 	/** The Hypersonic Embedded Java SQL Database (http://hsqldb.org) */
 	HSQL,
 
-	/** The H2 Embedded Java SQL Database Engine (http://h2database.com) */
+	/** The H2 Embedded Java SQL Database Engine (https://h2database.com) */
 	H2,
 
-	/** The Apache Derby Embedded SQL Database (http://db.apache.org/derby) */
+	/** The Apache Derby Embedded SQL Database (https://db.apache.org/derby) */
 	DERBY
 
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
index 267a785b4d8..2a3f709e05a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
@@ -12,7 +12,7 @@
  * RDBMS-specific error handling.
  *
  * 
    This package and related packages are discussed in Chapter 9 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
  * by Rod Johnson (Wrox, 2002).
  *
  */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java
index a58744a9fab..7f8f6caebd6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java
@@ -16,7 +16,7 @@
  * 
  *
  * 
    This package and related packages are discussed in Chapter 9 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
  * by Rod Johnson (Wrox, 2002).
  *
  */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
index 42862a61d83..c848c30852b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
@@ -134,7 +134,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 	 * 
    A common choice is {@code SimpleNativeJdbcExtractor}, whose Connection unwrapping
 	 * (which is what OracleLobHandler needs) will work with many connection pools.
 	 * See {@code SimpleNativeJdbcExtractor} and
-	 * 
+	 * 
 	 * oracle.jdbc.OracleConnection javadoc for details.
 	 * @see org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor#getNativeConnectionFromStatement
 	 * @see org.springframework.jdbc.support.nativejdbc.SimpleNativeJdbcExtractor
@@ -150,8 +150,8 @@ public class OracleLobHandler extends AbstractLobHandler {
 	 * 
    Default is {@code true}.
 	 * 
    See Also:
 	 * 
    
 	 */
 	public void setCache(boolean cache) {
@@ -168,12 +168,12 @@ public class OracleLobHandler extends AbstractLobHandler {
 	 * 
    Default is {@code false}.
 	 * 
    See Also:
 	 * 
    
 	 */
 	public void setReleaseResourcesAfterRead(boolean releaseResources) {
@@ -187,12 +187,12 @@ public class OracleLobHandler extends AbstractLobHandler {
 	 * DURATION_SESSION, MODE_READWRITE and MODE_READONLY constants defined there.
 	 * 
    See Also:
 	 * 
    
 	 * @param con the Oracle Connection, for using the exact same class loader
 	 * that the Oracle driver was loaded with
diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
index 72c896051f9..723502643ed 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
@@ -6,9 +6,9 @@
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	
+		schemaLocation="https://www.springframework.org/schema/beans/spring-beans-3.0.xsd" />
 	
+		schemaLocation="https://www.springframework.org/schema/tool/spring-tool-3.0.xsd" />
 
 	
 		
diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd
index cc1fb608d8d..5cad35946e4 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd
@@ -6,9 +6,9 @@
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	
+		schemaLocation="https://www.springframework.org/schema/beans/spring-beans-3.1.xsd" />
 	
+		schemaLocation="https://www.springframework.org/schema/tool/spring-tool-3.1.xsd" />
 
 	
 		
diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd
index d88ac708161..b50c81db1b4 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd
@@ -6,9 +6,9 @@
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	
+		schemaLocation="https://www.springframework.org/schema/beans/spring-beans-3.2.xsd" />
 	
+		schemaLocation="https://www.springframework.org/schema/tool/spring-tool-3.2.xsd" />
 
 	
 		
diff --git a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
index 7d50cd199b8..8c3094b3d94 100644
--- a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
+++ b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
@@ -8,7 +8,7 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	
+	
 
 	
 		
 
-	
+	
 
 	
 		
 
-	
+	
 
 	
 		
 
-	
+	
 
 	
 		Hibernate 4.x
+ * Hibernate 4.x
  * with Spring concepts.
  *
  * 
    Contains an implementation of Spring's transaction SPI for local Hibernate transactions.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
index 306abce3488..a622a5dac8f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
@@ -1,7 +1,7 @@
 /**
  *
  * Package providing integration of
- * Hibernate 3.x
+ * Hibernate 3.x
  * with Spring concepts.
  *
  * 
    Contains SessionFactory helper classes, a template plus callback
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
index f3aedcd4400..e0abdef7676 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
@@ -31,7 +31,7 @@ import com.ibatis.sqlmap.client.SqlMapExecutor;
  * @see SqlMapClientTemplate
  * @see org.springframework.jdbc.datasource.DataSourceTransactionManager
  * @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
  */
 @Deprecated
 public interface SqlMapClientCallback {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
index 8cbc23bb12f..5a1a833f559 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
@@ -67,7 +67,7 @@ import org.springframework.util.ObjectUtils;
  * @see SqlMapClientTemplate#setSqlMapClient
  * @see SqlMapClientTemplate#setDataSource
  * @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
  */
 @Deprecated
 public class SqlMapClientFactoryBean implements FactoryBean, InitializingBean {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
index f70cab545ac..63d530dd62a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
@@ -39,7 +39,7 @@ import org.springframework.dao.DataAccessException;
  * @see com.ibatis.sqlmap.client.SqlMapClient
  * @see com.ibatis.sqlmap.client.SqlMapExecutor
  * @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
  */
 @Deprecated
 public interface SqlMapClientOperations {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
index 2dfbad5dc09..a391813f9bc 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
@@ -81,7 +81,7 @@ import org.springframework.util.Assert;
  * @see com.ibatis.sqlmap.client.SqlMapClient#getDataSource
  * @see com.ibatis.sqlmap.client.SqlMapExecutor
  * @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
  */
 @Deprecated
 public class SqlMapClientTemplate extends JdbcAccessor implements SqlMapClientOperations {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
index b76167a271c..ac5d0ff0497 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Package providing integration of
- * iBATIS Database Layer
+ * iBATIS Database Layer
  * with Spring concepts.
  *
  * 
    Contains resource helper classes and template classes for
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
index 5096d1a2f7d..174bb8909c5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
@@ -47,7 +47,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @see org.springframework.jdbc.support.lob.LobCreator
  * @see org.springframework.orm.ibatis.SqlMapClientFactoryBean#setLobHandler
  * @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
  */
 @Deprecated
 public abstract class AbstractLobTypeHandler extends BaseTypeHandler {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
index d272797f5f3..2c5e9825e1c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
@@ -36,7 +36,7 @@ import org.springframework.jdbc.support.lob.LobHandler;
  * @since 1.1.5
  * @see org.springframework.orm.ibatis.SqlMapClientFactoryBean#setLobHandler
  * @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
  */
 @Deprecated
 public class BlobByteArrayTypeHandler extends AbstractLobTypeHandler {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
index ee696fcadbb..9763c749caf 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
@@ -41,7 +41,7 @@ import org.springframework.jdbc.support.lob.LobHandler;
  * @since 1.1.5
  * @see org.springframework.orm.ibatis.SqlMapClientFactoryBean#setLobHandler
  * @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
  */
 @Deprecated
 public class BlobSerializableTypeHandler extends AbstractLobTypeHandler {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
index 74ef0dc3730..697d4dc35a5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
@@ -39,7 +39,7 @@ import org.springframework.jdbc.support.lob.LobHandler;
  * @since 1.1.5
  * @see org.springframework.orm.ibatis.SqlMapClientFactoryBean#setLobHandler
  * @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
  */
 @Deprecated
 public class ClobStringTypeHandler extends AbstractLobTypeHandler {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java
index 8cc665eeda0..7d7a73ecbc7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java
@@ -41,7 +41,7 @@ import org.springframework.util.Assert;
  * @see org.springframework.orm.ibatis.SqlMapClientTemplate
  * @see org.springframework.orm.ibatis.SqlMapClientTemplate#setExceptionTranslator
  * @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
  */
 @Deprecated
 public abstract class SqlMapClientDaoSupport extends DaoSupport {
diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
index d258e390b48..241603a1c53 100644
--- a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -60,7 +60,7 @@ import org.springframework.util.StringUtils;
  *
  * 
    When using Xerces, make sure a post 2.0.2 version is available on the classpath
  * to avoid a critical
- * bug
+ * bug
  * that leads to StackOverflow. Maven users are likely to encounter this problem since
  * 2.0.2 is used by default.
  *
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java
index 1f1167ab09e..70bcc8049a4 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java
@@ -1,7 +1,7 @@
 
 /**
  *
- * Package providing integration of Castor within Springs O/X Mapping
+ * Package providing integration of Castor within Springs O/X Mapping
  * support
  *
  */
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
index 691156710f2..f34ef2bc342 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
@@ -590,7 +590,7 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi
 				}
 				else if (JdkVersion.getMajorJavaVersion() <= JdkVersion.JAVA_16 &&
 						typeArgument instanceof GenericArrayType) {
-					// see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5041784
+					// see https://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5041784
 					GenericArrayType arrayType = (GenericArrayType) typeArgument;
 					return arrayType.getGenericComponentType().equals(Byte.TYPE);
 				}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
index 1b3f9b3baec..181e42d2363 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
@@ -1,7 +1,7 @@
 
 /**
  *
- * Package providing integration of JAXB with Springs O/X Mapping
+ * Package providing integration of JAXB with Springs O/X Mapping
  * support
  *
  */
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
index 730341079f2..1fd20186ee5 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
@@ -24,23 +24,23 @@ import javax.activation.DataHandler;
  *
  * @author Arjen Poutsma
  * @since 3.0
- * @see XML-binary Optimized Packaging
+ * @see XML-binary Optimized Packaging
  */
 public interface MimeContainer {
 
 	/**
 	 * Indicate whether this container is a XOP package.
 	 * @return {@code true} when the constraints specified in
-	 * Identifying XOP Documents
+	 * Identifying XOP Documents
 	 * are met
-	 * @see XOP Packages
+	 * @see XOP Packages
 	 */
 	boolean isXopPackage();
 
 	/**
 	 * Turn this message into a XOP package.
 	 * @return {@code true} when the message actually is a XOP package
-	 * @see XOP Packages
+	 * @see XOP Packages
 	 */
 	boolean convertToXopPackage();
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
index 48569c583bb..ab730071ed0 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
@@ -28,8 +28,8 @@ import org.springframework.oxm.XmlMappingException;
  *
  * @author Arjen Poutsma
  * @since 3.0
- * @see SOAP Message Transmission Optimization Mechanism
- * @see XML-binary Optimized Packaging
+ * @see SOAP Message Transmission Optimization Mechanism
+ * @see XML-binary Optimized Packaging
  */
 public interface MimeMarshaller extends Marshaller {
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
index 331b78b2c42..96d527ac5fb 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
@@ -28,8 +28,8 @@ import org.springframework.oxm.XmlMappingException;
  *
  * @author Arjen Poutsma
  * @since 3.0
- * @see SOAP Message Transmission Optimization Mechanism
- * @see XML-binary Optimized Packaging
+ * @see SOAP Message Transmission Optimization Mechanism
+ * @see XML-binary Optimized Packaging
  */
 public interface MimeUnmarshaller extends Unmarshaller {
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java
index 38de2465cad..93f95911887 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java
@@ -1,7 +1,7 @@
 
 /**
  *
- * Package providing integration of XMLBeans with Springs O/X Mapping support
+ * Package providing integration of XMLBeans with Springs O/X Mapping support
  *
  */
 package org.springframework.oxm.xmlbeans;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
index 9ddd6e25a9c..5afdcbd22fb 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
@@ -1,7 +1,7 @@
 
 /**
  *
- * Package providing integration of XStream with Springs O/X Mapping support
+ * Package providing integration of XStream with Springs O/X Mapping support
  *
  */
 package org.springframework.oxm.xstream;
diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
index c8442c5a0b4..aa9862862fb 100644
--- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
@@ -5,8 +5,8 @@
 			targetNamespace="http://www.springframework.org/schema/oxm" elementFormDefault="qualified"
 			attributeFormDefault="unqualified">
 
- 	
-	
+ 	
+	
 
     
         
diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd
index b3807913ceb..2c9b7e02ecb 100644
--- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd
@@ -5,8 +5,8 @@
 			targetNamespace="http://www.springframework.org/schema/oxm" elementFormDefault="qualified"
 			attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd
index 74eaedead88..b9c3197bab2 100644
--- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd
@@ -5,8 +5,8 @@
 			targetNamespace="http://www.springframework.org/schema/oxm" elementFormDefault="qualified"
 			attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
index 904080ab4fe..dac51837633 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
@@ -74,7 +74,7 @@ public abstract class AbstractMarshallerTests {
 		marshaller.marshal(flights, domResult);
 		Document expected = builder.newDocument();
 		Element flightsElement = expected.createElementNS("http://samples.springframework.org/flight", "tns:flights");
-		Attr namespace = expected.createAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:tns");
+		Attr namespace = expected.createAttributeNS("https://www.w3.org/2000/xmlns/", "xmlns:tns");
 		namespace.setNodeValue("http://samples.springframework.org/flight");
 		flightsElement.setAttributeNode(namespace);
 		expected.appendChild(flightsElement);
@@ -98,7 +98,7 @@ public abstract class AbstractMarshallerTests {
 		Document result = (Document) domResult.getNode();
 		Document expected = builder.newDocument();
 		Element flightsElement = expected.createElementNS("http://samples.springframework.org/flight", "tns:flights");
-		Attr namespace = expected.createAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:tns");
+		Attr namespace = expected.createAttributeNS("https://www.w3.org/2000/xmlns/", "xmlns:tns");
 		namespace.setNodeValue("http://samples.springframework.org/flight");
 		flightsElement.setAttributeNode(namespace);
 		expected.appendChild(flightsElement);
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
index a66615ec753..ced9a0de8dd 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
@@ -79,7 +79,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 	 */
 	private static final String XSI_EXPECTED_STRING = "" +
 			"" +
 			"test8";
 
@@ -94,7 +94,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 	 */
 	private static final String ROOT_WITH_XSI_EXPECTED_STRING = "" +
 			"" +
 			"" +
 			"test8";
@@ -104,7 +104,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 	 */
 	private static final String ROOT_WITHOUT_XSI_EXPECTED_STRING = "" +
 			"" +
 			"test8";
 
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
index b89c119a609..718efd031e4 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
@@ -187,7 +187,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
 				marshaller.supports(method.getGenericReturnType()));
 
 		marshaller.setSupportJaxbElementClass(true);
-		JAXBElement flightTypeJAXBElement = new JAXBElement(new QName("http://springframework.org", "flight"), FlightType.class,
+		JAXBElement flightTypeJAXBElement = new JAXBElement(new QName("https://springframework.org", "flight"), FlightType.class,
 				new FlightType());
 		assertTrue("Jaxb2Marshaller does not support JAXBElement", marshaller.supports(flightTypeJAXBElement.getClass()));
 
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
index 05e8f9bd161..01d7a03b2a6 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
@@ -77,9 +77,9 @@ public class Jaxb2UnmarshallerTests extends AbstractUnmarshallerTests {
 		given(mimeContainer.getAttachment("<99bd1592-0521-41a2-9688-a8bfb40192fb@http://springframework.org/spring-ws>")).willReturn(dataHandler);
 		given(mimeContainer.getAttachment("696cfb9a-4d2d-402f-bb5c-59fa69e7f0b3@spring-ws.png")).willReturn(dataHandler);
 		String content = "" + "" +
-				"" +
+				"" +
 				"" + "" +
-				"" +
+				"" +
 				"" +
 				"696cfb9a-4d2d-402f-bb5c-59fa69e7f0b3@spring-ws.png" +
 				"";
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
index 455c00637a1..974d4dcfd77 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  */
 public class Primitives {
 
-	private static final QName NAME = new QName("http://springframework.org/oxm-test", "primitives");
+	private static final QName NAME = new QName("https://springframework.org/oxm-test", "primitives");
 
 	// following methods are used to test support for primitives
 	public JAXBElement primitiveBoolean() {
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
index 039b8e1c08e..8ce0062ec55 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
@@ -43,7 +43,7 @@ import javax.xml.namespace.QName;
  */
 public class StandardClasses {
 
-	private static final QName NAME = new QName("http://springframework.org/oxm-test", "standard-classes");
+	private static final QName NAME = new QName("https://springframework.org/oxm-test", "standard-classes");
 
 	private DatatypeFactory factory;
 
@@ -90,7 +90,7 @@ public class StandardClasses {
 	}
 
 	public JAXBElement standardClassURI() {
-		return new JAXBElement(NAME, URI.class, URI.create("http://springframework.org"));
+		return new JAXBElement(NAME, URI.class, URI.create("https://springframework.org"));
 	}
 
 	public JAXBElement standardClassXMLGregorianCalendar() throws DatatypeConfigurationException {
diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/order.xsd b/spring-oxm/src/test/resources/org/springframework/oxm/order.xsd
index 92eee80e41a..bf8d3718eb6 100644
--- a/spring-oxm/src/test/resources/org/springframework/oxm/order.xsd
+++ b/spring-oxm/src/test/resources/org/springframework/oxm/order.xsd
@@ -1,7 +1,7 @@
 
 
+        targetNamespace="https://samples.springframework.org/order"
+        xmlns:tns="https://samples.springframework.org/order">
     
         
             
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
index 4facc6aa0ac..7e244b323cc 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
@@ -28,7 +28,7 @@ import org.springframework.web.context.support.WebApplicationObjectSupport;
 
 /**
  * Helper class to configure Tiles 1.x for the Spring Framework. See
- * http://struts.apache.org
+ * https://struts.apache.org
  * for more information about Struts Tiles, which basically is a templating
  * mechanism for JSP-based web applications.
  *
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java
index d49ed27ea60..f3cff3c538f 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Support classes for the integration of
- * Tiles
+ * Tiles
  * (included in Struts) as Spring web view technology.
  * Contains a View implementation for Tiles definitions.
  */
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
index d00b32575a0..d733c108c63 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
@@ -82,7 +82,7 @@ import org.springframework.web.context.support.XmlWebApplicationContext;
  * Struts module, specifying appropriate "contextConfigLocation" parameters.
  *
  * 
    Note: The idea of delegating to Spring-managed Struts Actions originated in
- * Don Brown's Spring Struts Plugin.
+ * Don Brown's Spring Struts Plugin.
  * ContextLoaderPlugIn and DelegatingActionProxy constitute a clean-room
  * implementation of the same idea, essentially superseding the original plugin.
  * Many thanks to Don Brown and Matt Raible for the original work and for the
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
index dffb21bc3ff..f65d060262a 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
@@ -81,7 +81,7 @@ import org.springframework.web.context.WebApplicationContext;
  * {@link DelegatingTilesRequestProcessor}.
  *
  * 
    Note: The idea of delegating to Spring-managed Struts Actions originated in
- * Don Brown's Spring Struts Plugin.
+ * Don Brown's Spring Struts Plugin.
  * {@code ContextLoaderPlugIn} and {@code DelegatingActionProxy}
  * constitute a clean-room implementation of the same idea, essentially
  * superseding the original plugin. Many thanks to Don Brown and Matt Raible
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java b/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
index 2334e424fc6..3515ffd1853 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
@@ -58,7 +58,7 @@ public class XmlExpectationsHelper {
 
 	/**
 	 * Parse the content as {@link DOMSource} and apply a {@link Matcher}.
-	 * @see xml-matchers
+	 * @see xml-matchers
 	 */
 	public void assertSource(String content, Matcher matcher) throws Exception {
 		Document document = parseXmlString(content);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
index 9cb991f65f3..b7d9edfebd0 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
@@ -163,7 +163,7 @@ public class ContentRequestMatchers {
 
 	/**
 	 * Parse the request content as {@link DOMSource} and apply the given {@link Matcher}.
-	 * @see http://code.google.com/p/xml-matchers/
+	 * @see https://code.google.com/p/xml-matchers/
 	 */
 	public RequestMatcher source(final Matcher matcher) {
 		return new AbstractXmlRequestMatcher() {
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
index 1939523544f..5ce8cb3907a 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
@@ -28,7 +28,7 @@ import org.springframework.test.web.client.RequestMatcher;
 
 /**
  * Factory methods for request content {@code RequestMatcher}'s using a
- * JSONPath expression.
+ * JSONPath expression.
  * An instance of this class is typically accessed via
  * {@code RequestMatchers.jsonPath(..)}.
  *
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
index bcafc3d4ced..2889833fea5 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
@@ -158,7 +158,7 @@ public abstract class MockRestRequestMatchers {
 
 	/**
 	 * Access to request body matchers using a
-	 * JSONPath expression to
+	 * JSONPath expression to
 	 * inspect a specific subset of the body. The JSON path expression can be a
 	 * parameterized string using formatting specifiers as defined in
 	 * {@link String#format(String, Object...)}.
@@ -171,7 +171,7 @@ public abstract class MockRestRequestMatchers {
 
 	/**
 	 * Access to request body matchers using a
-	 * JSONPath expression to
+	 * JSONPath expression to
 	 * inspect a specific subset of the body and a Hamcrest match for asserting
 	 * the value found at the JSON path.
 	 * @param expression the JSON path expression
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
index a4d62d27a9d..614f76d3c81 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
@@ -320,7 +320,7 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable
 	 * the requestURI. This is because most applications don't actually depend
 	 * on the name under which they're deployed. If specified here, the context
 	 * path must start with a "/" and must not end with a "/".
-	 * @see HttpServletRequest.getContextPath()
+	 * @see HttpServletRequest.getContextPath()
 	 */
 	public MockHttpServletRequestBuilder contextPath(String contextPath) {
 		if (StringUtils.hasText(contextPath)) {
@@ -342,7 +342,7 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable
 	 * {@code "/accounts/1"} as opposed to {@code "/main/accounts/1"}.
 	 * If specified here, the servletPath must start with a "/" and must not
 	 * end with a "/".
-	 * @see HttpServletRequest.getServletPath()
+	 * @see HttpServletRequest.getServletPath()
 	 */
 	public MockHttpServletRequestBuilder servletPath(String servletPath) {
 		if (StringUtils.hasText(servletPath)) {
@@ -360,7 +360,7 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable
 	 * requestURI and using any remaining part. If specified here, the pathInfo
 	 * must start with a "/".
 	 * 
    If specified, the pathInfo will be used as is.
-	 * @see HttpServletRequest.getServletPath()
+	 * @see HttpServletRequest.getServletPath()
 	 */
 	public MockHttpServletRequestBuilder pathInfo(String pathInfo) {
 		if (StringUtils.hasText(pathInfo)) {
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
index e04c32b8f3f..1cbdf4bedbc 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
@@ -190,7 +190,7 @@ public class ContentResultMatchers {
 	 * Parse the response content as {@link DOMSource} and apply the given
 	 * Hamcrest {@link Matcher}.
 	 *
-	 * @see xml-matchers
+	 * @see xml-matchers
 	 */
 	public ResultMatcher source(final Matcher matcher) {
 		return new ResultMatcher() {
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
index a89bc87a859..7aaed4bcd93 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
@@ -23,7 +23,7 @@ import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Factory for assertions on the response content using JSONPath expressions.
+ * href="https://goessner.net/articles/JsonPath/">JSONPath expressions.
  * An instance of this class is typically accessed via
  * {@link MockMvcResultMatchers#jsonPath}.
  *
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
index 2657b638423..c1e9d755acb 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
@@ -121,7 +121,7 @@ public abstract class MockMvcResultMatchers {
 
 	/**
 	 * Access to response body assertions using a JSONPath expression to
+	 * href="https://goessner.net/articles/JsonPath/">JSONPath expression to
 	 * inspect a specific subset of the body. The JSON path expression can be a
 	 * parameterized string using formatting specifiers as defined in
 	 * {@link String#format(String, Object...)}.
@@ -135,7 +135,7 @@ public abstract class MockMvcResultMatchers {
 
 	/**
 	 * Access to response body assertions using a JSONPath expression to
+	 * href="https://goessner.net/articles/JsonPath/">JSONPath expression to
 	 * inspect a specific subset of the body and a Hamcrest match for asserting
 	 * the value found at the JSON path.
 	 *
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
index fa5d55474c6..a83cebf8f6b 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
@@ -43,21 +43,21 @@ public class RequestMatchersTests {
 
 	@Test
 	public void requestTo() throws Exception {
-		this.request.setURI(new URI("http://foo.com/bar"));
+		this.request.setURI(new URI("http://www.foo.com/bar"));
 
-		MockRestRequestMatchers.requestTo("http://foo.com/bar").match(this.request);
+		MockRestRequestMatchers.requestTo("http://www.foo.com/bar").match(this.request);
 	}
 
 	@Test(expected=AssertionError.class)
 	public void requestToNoMatch() throws Exception {
-		this.request.setURI(new URI("http://foo.com/bar"));
+		this.request.setURI(new URI("http://www.foo.com/bar"));
 
-		MockRestRequestMatchers.requestTo("http://foo.com/wrong").match(this.request);
+		MockRestRequestMatchers.requestTo("http://www.foo.com/wrong").match(this.request);
 	}
 
 	@Test
 	public void requestToContains() throws Exception {
-		this.request.setURI(new URI("http://foo.com/bar"));
+		this.request.setURI(new URI("http://www.foo.com/bar"));
 
 		MockRestRequestMatchers.requestTo(containsString("bar")).match(this.request);
 	}
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
index 0f561b08837..aacfc192125 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
@@ -42,7 +42,7 @@ import org.springframework.web.client.RestTemplate;
 
 /**
  * Examples of defining expectations on JSON request content with
- * JSONPath expressions.
+ * JSONPath expressions.
  *
  * @author Rossen Stoyanchev
  */
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
index 9819e51cfea..8967ce08b3b 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
@@ -56,7 +56,7 @@ import org.springframework.web.client.RestTemplate;
 public class XpathRequestMatcherTests {
 
 	private static final Map NS =
-			Collections.singletonMap("ns", "http://example.org/music/people");
+			Collections.singletonMap("ns", "https://example.org/music/people");
 
 	private MockRestServiceServer mockServer;
 
@@ -200,7 +200,7 @@ public class XpathRequestMatcherTests {
 
 
 	@SuppressWarnings("unused")
-	@XmlRootElement(name="people", namespace="http://example.org/music/people")
+	@XmlRootElement(name="people", namespace="https://example.org/music/people")
 	@XmlAccessorType(XmlAccessType.FIELD)
 	private static class PeopleWrapper {
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
index b5a9e7015d8..6ac31c4226d 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
@@ -64,10 +64,10 @@ public class FlashAttributeAssertionTests {
 		this.mockMvc.perform(post("/persons"))
 			.andExpect(flash().attribute("one", "1"))
 			.andExpect(flash().attribute("two", 2.222))
-			.andExpect(flash().attribute("three", new URL("http://example.com")))
+			.andExpect(flash().attribute("three", new URL("https://example.com")))
 			.andExpect(flash().attribute("one", equalTo("1")))	// Hamcrest...
 			.andExpect(flash().attribute("two", equalTo(2.222)))
-			.andExpect(flash().attribute("three", equalTo(new URL("http://example.com"))));
+			.andExpect(flash().attribute("three", equalTo(new URL("https://example.com"))));
 	}
 
 	@Test
@@ -86,7 +86,7 @@ public class FlashAttributeAssertionTests {
 		public String save(RedirectAttributes redirectAttrs) throws Exception {
 			redirectAttrs.addFlashAttribute("one", "1");
 			redirectAttrs.addFlashAttribute("two", 2.222);
-			redirectAttrs.addFlashAttribute("three", new URL("http://example.com"));
+			redirectAttrs.addFlashAttribute("three", new URL("https://example.com"));
 			return "redirect:/person/1";
 		}
 	}
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
index a83999fe91d..a28688c33d9 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
@@ -42,7 +42,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * Examples of defining expectations on JSON response content with
- * JSONPath expressions.
+ * JSONPath expressions.
  *
  * @author Rossen Stoyanchev
  *
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
index 552d7ae8b28..b33ded3e071 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
@@ -58,7 +58,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 public class XpathAssertionTests {
 
 	private static final Map NS =
-		Collections.singletonMap("ns", "http://example.org/music/people");
+		Collections.singletonMap("ns", "https://example.org/music/people");
 
 	private MockMvc mockMvc;
 
@@ -174,7 +174,7 @@ public class XpathAssertionTests {
 	}
 
 	@SuppressWarnings("unused")
-	@XmlRootElement(name="people", namespace="http://example.org/music/people")
+	@XmlRootElement(name="people", namespace="https://example.org/music/people")
 	@XmlAccessorType(XmlAccessType.FIELD)
 	private static class PeopleWrapper {
 
diff --git a/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp b/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp
index dc3f6216ae0..51499dabc98 100644
--- a/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp
+++ b/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp
@@ -1,6 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-
+
 
 
 
diff --git a/spring-test-mvc/src/test/webapp/WEB-INF/layouts/main.jsp b/spring-test-mvc/src/test/webapp/WEB-INF/layouts/main.jsp
index 408d8fc932a..a3f3f6584ae 100644
--- a/spring-test-mvc/src/test/webapp/WEB-INF/layouts/main.jsp
+++ b/spring-test-mvc/src/test/webapp/WEB-INF/layouts/main.jsp
@@ -1,6 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
-
+
 
 
 
diff --git a/spring-test/src/main/java/org/springframework/mock/web/package-info.java b/spring-test/src/main/java/org/springframework/mock/web/package-info.java
index be8cb8601c8..bb7c5ac77f1 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/package-info.java
@@ -6,7 +6,7 @@
  * Useful for testing web contexts and controllers.
  *
  * 
    More convenient to use than dynamic mock objects
- * (EasyMock) or
+ * (EasyMock) or
  * existing Servlet API mock objects
  * (MockObjects).
  *
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java
index 3c28fee42b4..275f1f19540 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java
@@ -6,7 +6,7 @@
  * Useful for testing web contexts and controllers.
  *
  * 
    More convenient to use than dynamic mock objects
- * (EasyMock) or
+ * (EasyMock) or
  * existing Portlet API mock objects.
  *
  */
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
index 240ebccf3bf..b6f94c7d16e 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -60,7 +60,7 @@ import org.springframework.util.StringUtils;
  *
  * 
    When using Xerces, make sure a post 2.0.2 version is available on the classpath
  * to avoid a critical
- * bug
+ * bug
  * that leads to StackOverflow. Maven users are likely to encounter this problem since
  * 2.0.2 is used by default.
  *
diff --git a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
index 4933c8b194c..8c906690afd 100644
--- a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
@@ -22,7 +22,7 @@ import org.springframework.context.ApplicationContext;
 
 /**
  * Abstract JUnit 3.8 based unit test which verifies new functionality requested
- * in SPR-3350.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
index 1f7b131fabd..7631485ea4f 100644
--- a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
@@ -18,7 +18,7 @@ package org.springframework.test;
 
 /**
  * JUnit 3.8 based unit test which verifies new functionality requested in SPR-3264.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
index a06397426ea..697c1bae011 100644
--- a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
@@ -18,7 +18,7 @@ package org.springframework.test;
 
 /**
  * JUnit 3.8 based unit test which verifies new functionality requested in SPR-3264.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java b/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
index 00a519a5bf6..b66a6193224 100644
--- a/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
@@ -30,7 +30,7 @@ import org.springframework.test.context.support.AbstractTestExecutionListener;
  * 
  • Proper registering of {@link TestExecutionListener listeners} in
  * conjunction with a {@link TestContextManager}
    • 
  * 
  • Inherited functionality proposed in SPR-3896
    • 
  * 
  *
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
index a57619d6da4..308ce66b949 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
@@ -44,7 +44,7 @@ import org.springframework.test.context.transaction.BeforeTransaction;
  * {@link BeforeTransaction @BeforeTransaction} and
  * {@link AfterTransaction @AfterTransaction} methods can fail a test in a JUnit
  * 3.8 environment, as requested in SPR-3960.
  * 
    
  *
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
index 7bddfecab78..f2a45552c07 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
@@ -42,7 +42,7 @@ import org.springframework.test.context.transaction.BeforeTransaction;
  * {@link BeforeTransaction @BeforeTransaction} and
  * {@link AfterTransaction @AfterTransaction} methods can fail a test in a
  * JUnit 4.4 environment, as requested in SPR-3960.
  * 
    
  * 
    
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
index b2f7401f054..d5902aec2d8 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
@@ -149,7 +149,7 @@ public class RepeatedSpringRunnerTests {
 
 	/**
 	 * Unit tests for claims raised in SPR-6011.
 	 */
 	@Ignore("TestCase classes are run manually by the enclosing test class")
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
index 93a4ee3de06..4f6d5247524 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
  * JUnit 4 based integration test for verifying support for the
  * {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
  * {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
index fc25f0b0db5..1df3d9d894f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
  * JUnit 4 based integration test for verifying support for the
  * {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
  * {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
index 34a0c47fd18..05d8e920d50 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
@@ -30,7 +30,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * JUnit 4 based integration test for verifying support for the
  * {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
  * {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
index c8b97e91c2c..6ee211418f1 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
@@ -28,7 +28,7 @@ import org.springframework.test.context.ContextConfiguration;
  * JUnit 4 based integration test for verifying support for the
  * {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
  * {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
index 401d66924e7..ac40f263734 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
@@ -30,7 +30,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * JUnit 4 based integration test for verifying support for the
  * {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
  * {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
index cdd2d47b9a5..54f60cbcb83 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
@@ -28,7 +28,7 @@ import org.springframework.test.context.ContextConfiguration;
  * JUnit 4 based integration test for verifying support for the
  * {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
  * {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
index 9c59b53fa20..2e9b6e9cbb2 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
@@ -22,7 +22,7 @@ import org.junit.runners.Suite.SuiteClasses;
 
 /**
  * JUnit 4 based test suite for functionality proposed in SPR-3896.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
index 157da6ec7c0..9739812fbfb 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
@@ -28,7 +28,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * Integration tests to verify claims made in SPR-6128.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
index 0b5b0428ef6..304828f7c16 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
@@ -28,7 +28,7 @@ import org.springframework.context.support.GenericApplicationContext;
  * {@link AbstractGenericContextLoader} are able to customize the
  * newly created {@code ApplicationContext}. Specifically, this test
  * addresses the issues raised in SPR-4008: Supply an opportunity to customize context
  * before calling refresh in ContextLoaders.
  *
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
index 7dd753421cf..2b407e4a9dd 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
@@ -38,7 +38,7 @@ import org.springframework.util.ObjectUtils;
  * {@code resource locations} by a {@link GenericXmlContextLoader}
  * configured via {@link ContextConfiguration @ContextConfiguration}.
  * Specifically, this test addresses the issues raised in SPR-3949:
  * ContextConfiguration annotation should accept not only classpath resources.
  *
@@ -81,12 +81,12 @@ public class GenericXmlContextLoaderResourceLocationsTests {
 		class ExplicitFileLocationsTestCase {
 		}
 
-		@ContextConfiguration("http://example.com/context.xml")
+		@ContextConfiguration("https://example.com/context.xml")
 		class ExplicitUrlLocationsTestCase {
 		}
 
 		@ContextConfiguration({ "context1.xml", "classpath:context2.xml", "/context3.xml",
-			"file:/testing/directory/context.xml", "http://example.com/context.xml" })
+			"file:/testing/directory/context.xml", "https://example.com/context.xml" })
 		class ExplicitMixedPathTypesLocationsTestCase {
 		}
 
@@ -107,13 +107,13 @@ public class GenericXmlContextLoaderResourceLocationsTests {
 
 			{ ExplicitFileLocationsTestCase.class, new String[] { "file:/testing/directory/context.xml" } },
 
-			{ ExplicitUrlLocationsTestCase.class, new String[] { "http://example.com/context.xml" } },
+			{ ExplicitUrlLocationsTestCase.class, new String[] { "https://example.com/context.xml" } },
 
 			{
 				ExplicitMixedPathTypesLocationsTestCase.class,
 				new String[] { "classpath:/org/springframework/test/context/support/context1.xml",
 					"classpath:context2.xml", "classpath:/context3.xml", "file:/testing/directory/context.xml",
-					"http://example.com/context.xml" } }
+					"https://example.com/context.xml" } }
 
 		});
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
index a668c8c1c6a..be05abe4a9d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
@@ -30,7 +30,7 @@ import org.testng.annotations.Test;
 /**
  * 
    
  * TestNG based integration test to assess the claim in SPR-3880 that a "context marked dirty using
  * {@link DirtiesContext @DirtiesContext} in [a] TestNG based test is not
  * reloaded in subsequent tests".
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
index 39d0f64f628..6f0b6fbb8d5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
@@ -44,7 +44,7 @@ import org.testng.TestNG;
  * {@link BeforeTransaction @BeforeTransaction} and
  * {@link AfterTransaction @AfterTransaction} methods can fail a test in a
  * TestNG environment, as requested in SPR-3960.
  * 
    
  * 
    
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
index 53f4bd0a604..15b932c63e3 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
 /**
  * Timed integration tests for
  * {@link AbstractTransactionalTestNGSpringContextTests}; used to verify claim
- * raised in SPR-6124.
  *
  * @author Sam Brannen
diff --git a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
index f0aa02bd438..93d3eec5385 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
@@ -20,7 +20,7 @@ import org.springframework.core.NestedRuntimeException;
 
 /**
  * Root of the hierarchy of data access exceptions discussed in
- * Expert One-On-One J2EE Design and Development.
+ * Expert One-On-One J2EE Design and Development.
  * Please see Chapter 9 of this book for detailed discussion of the
  * motivation for this package.
  *
diff --git a/spring-tx/src/main/java/org/springframework/dao/package-info.java b/spring-tx/src/main/java/org/springframework/dao/package-info.java
index dd36227a357..fe5c99a6803 100644
--- a/spring-tx/src/main/java/org/springframework/dao/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/dao/package-info.java
@@ -12,7 +12,7 @@
  * leave them uncaught and treat all data access exceptions as fatal.
  *
  * 
    The classes in this package are discussed in Chapter 9 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
  * by Rod Johnson (Wrox, 2002).
  *
  */
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
index c784930cdcf..c779c18172c 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
@@ -70,7 +70,7 @@ import org.springframework.util.StringUtils;
  * <?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/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
index dc1bb258513..1411291a603 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
@@ -38,7 +38,7 @@ import org.springframework.transaction.PlatformTransactionManager;
  * target object with a transactional proxy, proxying all the interfaces that the target
  * implements. However, in Spring versions 2.0 and beyond, the functionality provided here
  * is superseded by the more convenient {@code tx:} XML namespace. See the declarative transaction management section of the
+ * href="https://bit.ly/qUwvwz">declarative transaction management section of the
  * Spring reference documentation to understand the modern options for managing
  * transactions in Spring applications. For these reasons, users should favor of
  * the {@code tx:} XML namespace as well as
diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd
index 2d3837e7961..ad6e3ce4a07 100644
--- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd
+++ b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
 
-	
-	
+	
+	
 	
 	
 		
 
-	
-	
+	
+	
 
 	
 		
 
-	
-	
+	
+	
 
 	
 		
 
-	
-	
+	
+	
 
 	
 		this forum post.
+	 * See this forum post.
 	 */
 	@Test
 	public void testConflictingRulesToDetermineExactContract() {
diff --git a/spring-web/src/main/java/org/springframework/http/HttpEntity.java b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
index 761c69aaf4d..4d0fb58fd84 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
@@ -27,11 +27,11 @@ import org.springframework.util.ObjectUtils;
  * HttpHeaders headers = new HttpHeaders();
  * headers.setContentType(MediaType.TEXT_PLAIN);
  * HttpEntity<String> entity = new HttpEntity<String>(helloWorld, headers);
- * URI location = template.postForLocation("http://example.com", entity);
+ * URI location = template.postForLocation("https://example.com", entity);
  * 
    
  * or
  * 
    - * HttpEntity<String> entity = template.getForEntity("http://example.com", String.class);
+ * HttpEntity<String> entity = template.getForEntity("https://example.com", String.class);
  * String body = entity.getBody();
  * MediaType contentType = entity.getHeaders().getContentType();
  * 
    
diff --git a/spring-web/src/main/java/org/springframework/http/HttpStatus.java b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
index fe09b212740..6dd739d6146 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpStatus.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
@@ -24,8 +24,8 @@ package org.springframework.http;
  * @author Arjen Poutsma
  * @since 3.0
  * @see HttpStatus.Series
- * @see HTTP Status Code Registry
- * @see List of HTTP status codes - Wikipedia
+ * @see HTTP Status Code Registry
+ * @see List of HTTP status codes - Wikipedia
  */
 public enum HttpStatus {
 
@@ -33,22 +33,22 @@ public enum HttpStatus {
 
 	/**
 	 * {@code 100 Continue}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	CONTINUE(100, "Continue"),
 	/**
 	 * {@code 101 Switching Protocols}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	SWITCHING_PROTOCOLS(101, "Switching Protocols"),
 	/**
 	 * {@code 102 Processing}.
-	 * @see WebDAV
+	 * @see WebDAV
 	 */
 	PROCESSING(102, "Processing"),
 	/**
 	 * {@code 103 Checkpoint}.
-	 * @see A proposal for supporting
+	 * @see A proposal for supporting
 	 * resumable POST/PUT HTTP requests in HTTP/1.0
 	 */
 	CHECKPOINT(103, "Checkpoint"),
@@ -57,52 +57,52 @@ public enum HttpStatus {
 
 	/**
 	 * {@code 200 OK}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	OK(200, "OK"),
 	/**
 	 * {@code 201 Created}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	CREATED(201, "Created"),
 	/**
 	 * {@code 202 Accepted}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	ACCEPTED(202, "Accepted"),
 	/**
 	 * {@code 203 Non-Authoritative Information}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	NON_AUTHORITATIVE_INFORMATION(203, "Non-Authoritative Information"),
 	/**
 	 * {@code 204 No Content}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	NO_CONTENT(204, "No Content"),
 	/**
 	 * {@code 205 Reset Content}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	RESET_CONTENT(205, "Reset Content"),
 	/**
 	 * {@code 206 Partial Content}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	PARTIAL_CONTENT(206, "Partial Content"),
 	/**
 	 * {@code 207 Multi-Status}.
-	 * @see WebDAV
+	 * @see WebDAV
 	 */
 	MULTI_STATUS(207, "Multi-Status"),
 	/**
 	 * {@code 208 Already Reported}.
-	 * @see WebDAV Binding Extensions
+	 * @see WebDAV Binding Extensions
 	 */
 	ALREADY_REPORTED(208, "Already Reported"),
 	/**
 	 * {@code 226 IM Used}.
-	 * @see Delta encoding in HTTP
+	 * @see Delta encoding in HTTP
 	 */
 	IM_USED(226, "IM Used"),
 
@@ -110,49 +110,49 @@ public enum HttpStatus {
 
 	/**
 	 * {@code 300 Multiple Choices}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	MULTIPLE_CHOICES(300, "Multiple Choices"),
 	/**
 	 * {@code 301 Moved Permanently}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	MOVED_PERMANENTLY(301, "Moved Permanently"),
 	/**
 	 * {@code 302 Found}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	FOUND(302, "Found"),
 	/**
 	 * {@code 302 Moved Temporarily}.
-	 * @see HTTP/1.0
+	 * @see HTTP/1.0
 	 * @deprecated In favor of {@link #FOUND} which will be returned from {@code HttpStatus.valueOf(302)}
 	 */
 	@Deprecated
 	MOVED_TEMPORARILY(302, "Moved Temporarily"),
 	/**
 	 * {@code 303 See Other}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	SEE_OTHER(303, "See Other"),
 	/**
 	 * {@code 304 Not Modified}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	NOT_MODIFIED(304, "Not Modified"),
 	/**
 	 * {@code 305 Use Proxy}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	USE_PROXY(305, "Use Proxy"),
 	/**
 	 * {@code 307 Temporary Redirect}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	TEMPORARY_REDIRECT(307, "Temporary Redirect"),
 	/**
 	 * {@code 308 Resume Incomplete}.
-	 * @see A proposal for supporting
+	 * @see A proposal for supporting
 	 * resumable POST/PUT HTTP requests in HTTP/1.0
 	 */
 	RESUME_INCOMPLETE(308, "Resume Incomplete"),
@@ -161,144 +161,144 @@ public enum HttpStatus {
 
 	/**
 	 * {@code 400 Bad Request}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	BAD_REQUEST(400, "Bad Request"),
 	/**
 	 * {@code 401 Unauthorized}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	UNAUTHORIZED(401, "Unauthorized"),
 	/**
 	 * {@code 402 Payment Required}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	PAYMENT_REQUIRED(402, "Payment Required"),
 	/**
 	 * {@code 403 Forbidden}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	FORBIDDEN(403, "Forbidden"),
 	/**
 	 * {@code 404 Not Found}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	NOT_FOUND(404, "Not Found"),
 	/**
 	 * {@code 405 Method Not Allowed}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	METHOD_NOT_ALLOWED(405, "Method Not Allowed"),
 	/**
 	 * {@code 406 Not Acceptable}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	NOT_ACCEPTABLE(406, "Not Acceptable"),
 	/**
 	 * {@code 407 Proxy Authentication Required}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"),
 	/**
 	 * {@code 408 Request Timeout}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	REQUEST_TIMEOUT(408, "Request Timeout"),
 	/**
 	 * {@code 409 Conflict}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	CONFLICT(409, "Conflict"),
 	/**
 	 * {@code 410 Gone}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	GONE(410, "Gone"),
 	/**
 	 * {@code 411 Length Required}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	LENGTH_REQUIRED(411, "Length Required"),
 	/**
 	 * {@code 412 Precondition failed}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	PRECONDITION_FAILED(412, "Precondition Failed"),
 	/**
 	 * {@code 413 Request Entity Too Large}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"),
 	/**
 	 * {@code 414 Request-URI Too Long}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"),
 	/**
 	 * {@code 415 Unsupported Media Type}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"),
 	/**
 	 * {@code 416 Requested Range Not Satisfiable}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested range not satisfiable"),
 	/**
 	 * {@code 417 Expectation Failed}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	EXPECTATION_FAILED(417, "Expectation Failed"),
 	/**
 	 * {@code 418 I'm a teapot}.
-	 * @see HTCPCP/1.0
+	 * @see HTCPCP/1.0
 	 */
 	I_AM_A_TEAPOT(418, "I'm a teapot"),
 	/**
-	 * @deprecated See WebDAV Draft Changes
+	 * @deprecated See WebDAV Draft Changes
 	 */
 	@Deprecated INSUFFICIENT_SPACE_ON_RESOURCE(419, "Insufficient Space On Resource"),
 	/**
-	 * @deprecated See WebDAV Draft Changes
+	 * @deprecated See WebDAV Draft Changes
 	 */
 	@Deprecated METHOD_FAILURE(420, "Method Failure"),
 	/**
-	 * @deprecated See WebDAV Draft Changes
+	 * @deprecated See WebDAV Draft Changes
 	 */
 	@Deprecated DESTINATION_LOCKED(421, "Destination Locked"),
 	/**
 	 * {@code 422 Unprocessable Entity}.
-	 * @see WebDAV
+	 * @see WebDAV
 	 */
 	UNPROCESSABLE_ENTITY(422, "Unprocessable Entity"),
 	/**
 	 * {@code 423 Locked}.
-	 * @see WebDAV
+	 * @see WebDAV
 	 */
 	LOCKED(423, "Locked"),
 	/**
 	 * {@code 424 Failed Dependency}.
-	 * @see WebDAV
+	 * @see WebDAV
 	 */
 	FAILED_DEPENDENCY(424, "Failed Dependency"),
 	/**
 	 * {@code 426 Upgrade Required}.
-	 * @see Upgrading to TLS Within HTTP/1.1
+	 * @see Upgrading to TLS Within HTTP/1.1
 	 */
 	UPGRADE_REQUIRED(426, "Upgrade Required"),
 	/**
 	 * {@code 428 Precondition Required}.
-	 * @see Additional HTTP Status Codes
+	 * @see Additional HTTP Status Codes
 	 */
 	PRECONDITION_REQUIRED(428, "Precondition Required"),
 	/**
 	 * {@code 429 Too Many Requests}.
-	 * @see Additional HTTP Status Codes
+	 * @see Additional HTTP Status Codes
 	 */
 	TOO_MANY_REQUESTS(429, "Too Many Requests"),
 	/**
 	 * {@code 431 Request Header Fields Too Large}.
-	 * @see Additional HTTP Status Codes
+	 * @see Additional HTTP Status Codes
 	 */
 	REQUEST_HEADER_FIELDS_TOO_LARGE(431, "Request Header Fields Too Large"),
 
@@ -306,47 +306,47 @@ public enum HttpStatus {
 
 	/**
 	 * {@code 500 Internal Server Error}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	INTERNAL_SERVER_ERROR(500, "Internal Server Error"),
 	/**
 	 * {@code 501 Not Implemented}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	NOT_IMPLEMENTED(501, "Not Implemented"),
 	/**
 	 * {@code 502 Bad Gateway}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	BAD_GATEWAY(502, "Bad Gateway"),
 	/**
 	 * {@code 503 Service Unavailable}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	SERVICE_UNAVAILABLE(503, "Service Unavailable"),
 	/**
 	 * {@code 504 Gateway Timeout}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	GATEWAY_TIMEOUT(504, "Gateway Timeout"),
 	/**
 	 * {@code 505 HTTP Version Not Supported}.
-	 * @see HTTP/1.1
+	 * @see HTTP/1.1
 	 */
 	HTTP_VERSION_NOT_SUPPORTED(505, "HTTP Version not supported"),
 	/**
 	 * {@code 506 Variant Also Negotiates}
-	 * @see Transparent Content Negotiation
+	 * @see Transparent Content Negotiation
 	 */
 	VARIANT_ALSO_NEGOTIATES(506, "Variant Also Negotiates"),
 	/**
 	 * {@code 507 Insufficient Storage}
-	 * @see WebDAV
+	 * @see WebDAV
 	 */
 	INSUFFICIENT_STORAGE(507, "Insufficient Storage"),
 	/**
 	 * {@code 508 Loop Detected}
-	 * @see WebDAV Binding Extensions
+	 * @see WebDAV Binding Extensions
  	 */
 	LOOP_DETECTED(508, "Loop Detected"),
 	/**
@@ -355,12 +355,12 @@ public enum HttpStatus {
 	BANDWIDTH_LIMIT_EXCEEDED(509, "Bandwidth Limit Exceeded"),
 	/**
 	 * {@code 510 Not Extended}
-	 * @see HTTP Extension Framework
+	 * @see HTTP Extension Framework
 	 */
 	NOT_EXTENDED(510, "Not Extended"),
 	/**
 	 * {@code 511 Network Authentication Required}.
-	 * @see Additional HTTP Status Codes
+	 * @see Additional HTTP Status Codes
 	 */
 	NETWORK_AUTHENTICATION_REQUIRED(511, "Network Authentication Required");
 
diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
index 4d674e3e600..d2389a8e45f 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -47,7 +47,7 @@ import org.springframework.util.comparator.CompoundComparator;
  * @author Juergen Hoeller
  * @author Rossen Stoyanchev
  * @since 3.0
- * @see HTTP 1.1, section 3.7
+ * @see HTTP 1.1, section 3.7
  */
 public class MediaType implements Comparable {
 
@@ -345,7 +345,7 @@ public class MediaType implements Comparable {
 	/**
 	 * Checks the given token string for illegal characters, as defined in RFC 2616, section 2.2.
 	 * @throws IllegalArgumentException in case of illegal characters
-	 * @see HTTP 1.1, section 2.2
+	 * @see HTTP 1.1, section 2.2
 	 */
 	private void checkToken(String token) {
 		for (int i=0; i < token.length(); i++ ) {
@@ -793,7 +793,7 @@ public class MediaType implements Comparable {
 	 * 
    audio/basic == text/html
    
 	 * 
    audio/basic == audio/wave
    
 	 * @param mediaTypes the list of media types to be sorted
-	 * @see HTTP 1.1, section 14.1
+	 * @see HTTP 1.1, section 14.1
 	 */
 	public static void sortBySpecificity(List mediaTypes) {
 		Assert.notNull(mediaTypes, "'mediaTypes' must not be null");
diff --git a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
index 839e7ccd0ac..eac463e1def 100644
--- a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
@@ -27,7 +27,7 @@ import org.springframework.util.ObjectUtils;
  * {@link org.springframework.web.client.RestTemplate#getForEntity getForEntity()} and
  * {@link org.springframework.web.client.RestTemplate#exchange exchange()}:
  * 
    - * ResponseEntity<String> entity = template.getForEntity("http://example.com", String.class);
+ * ResponseEntity<String> entity = template.getForEntity("https://example.com", String.class);
  * String body = entity.getBody();
  * MediaType contentType = entity.getHeaders().getContentType();
  * HttpStatus statusCode = entity.getStatusCode();
diff --git a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
index f3b6ae799cc..168239b4bf1 100644
--- a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
 
 /**
  * {@link org.springframework.http.client.ClientHttpRequestFactory} implementation that uses
- * Jakarta Commons HttpClient to create requests.
+ * Jakarta Commons HttpClient to create requests.
  *
  * 
    Allows to use a pre-configured {@link HttpClient} instance -
  * potentially with authentication, HTTP connection pooling, etc.
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
index e607b0f2990..3c7227aed54 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
@@ -44,7 +44,7 @@ import org.springframework.util.Assert;
 
 /**
  * {@link org.springframework.http.client.ClientHttpRequestFactory} implementation that
- * uses Apache HttpComponents
+ * uses Apache HttpComponents
  * HttpClient to create requests.
  *
  * 
    Allows to use a pre-configured {@link HttpClient} instance -
diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
index ffd9ef33e99..dece8ccc5b6 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
@@ -58,10 +58,10 @@ import org.springframework.util.StringUtils;
  * 
    For example, the following snippet shows how to submit an HTML form: 
     RestTemplate template =
  * new RestTemplate(); // FormHttpMessageConverter is configured by default MultiValueMap<String, String> form =
  * new LinkedMultiValueMap<String, String>(); form.add("field 1", "value 1"); form.add("field 2", "value 2");
- * form.add("field 2", "value 3"); template.postForLocation("http://example.com/myForm", form); 
     
    The following
+ * form.add("field 2", "value 3"); template.postForLocation("https://example.com/myForm", form); 
     
    The following
  * snippet shows how to do a file upload: 
     MultiValueMap<String, Object> parts = new
  * LinkedMultiValueMap<String, Object>(); parts.add("field 1", "value 1"); parts.add("file", new
- * ClassPathResource("myFile.jpg")); template.postForLocation("http://example.com/myFileUpload", parts); 
    
+ * ClassPathResource("myFile.jpg")); template.postForLocation("https://example.com/myFileUpload", parts); 
    
  *
  * 
    Some methods in this class were inspired by {@link org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity}.
  *
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
index a0a2e8884e5..66e560a097a 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
@@ -40,7 +40,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 
 /**
  * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter}
- * that can read and write JSON using Jackson 2's {@link ObjectMapper}.
+ * that can read and write JSON using Jackson 2's {@link ObjectMapper}.
  *
  * 
    This converter can be used to bind to typed beans, or untyped {@link java.util.HashMap HashMap} instances.
  *
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
index 16cdf2097f0..aab52f905b0 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
 
 /**
  * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter} that
- * can read and write JSON using Jackson 1.x's {@link ObjectMapper}.
+ * can read and write JSON using Jackson 1.x's {@link ObjectMapper}.
  *
  * 
    This converter can be used to bind to typed beans, or untyped {@link java.util.HashMap HashMap} instances.
  *
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
index 45f4a095b63..44751d781a6 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
  *
  * 
    Burlap is a slim, XML-based RPC protocol.
  * For information on Burlap, see the
- * Burlap website
+ * Burlap website
  *
  * 
    Note: There is no requirement for services accessed with this proxy factory
  * to have been exported using Spring's {@link BurlapServiceExporter}, as there is
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
index 9e9237cf06b..b30a33707f3 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
  *
  * 
    Burlap is a slim, XML-based RPC protocol.
  * For information on Burlap, see the
- * Burlap website.
+ * Burlap website.
  * This exporter requires Burlap 3.x.
  *
  * @author Juergen Hoeller
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
index e83eca06881..93331bf9c05 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.FactoryBean;
  *
  * 
    Burlap is a slim, XML-based RPC protocol.
  * For information on Burlap, see the
- * Burlap website
+ * Burlap website
  *
  * 
    The service URL must be an HTTP URL exposing a Burlap service.
  * For details, see the {@link BurlapClientInterceptor} javadoc.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
index 8950257d4e7..e46de027c12 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
@@ -35,7 +35,7 @@ import org.springframework.web.util.NestedServletException;
  *
  * 
    Burlap is a slim, XML-based RPC protocol.
  * For information on Burlap, see the
- * Burlap website.
+ * Burlap website.
  * This exporter requires Burlap 3.x.
  *
  * 
    Note: Burlap services exported with this class can be accessed by
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
index 31d14d24407..2dfa00ccab3 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
@@ -43,7 +43,7 @@ import org.springframework.util.Assert;
  *
  * 
    Hessian is a slim, binary RPC protocol.
  * For information on Hessian, see the
- * Hessian website
+ * Hessian website
  *
  * 
    Note: There is no requirement for services accessed with this proxy factory
  * to have been exported using Spring's {@link HessianServiceExporter}, as there is
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
index d6b0ab7e7d1..60496af1c99 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
@@ -44,7 +44,7 @@ import org.springframework.util.CommonsLogWriter;
  *
  * 
    Hessian is a slim, binary RPC protocol.
  * For information on Hessian, see the
- * Hessian website.
+ * Hessian website.
  * Note: As of Spring 3.0, this exporter requires Hessian 3.2 or above.
  *
  * @author Juergen Hoeller
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
index 4b40bb6a0e4..501aeb891f7 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.FactoryBean;
  *
  * 
    Hessian is a slim, binary RPC protocol.
  * For information on Hessian, see the
- * Hessian website
+ * Hessian website
  *
  * 
    The service URL must be an HTTP URL exposing a Hessian service.
  * For details, see the {@link HessianClientInterceptor} javadoc.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
index dddbb3f4a9c..96cda77bec4 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
@@ -34,7 +34,7 @@ import org.springframework.web.util.NestedServletException;
  *
  * 
    Hessian is a slim, binary RPC protocol.
  * For information on Hessian, see the
- * Hessian website.
+ * Hessian website.
  * Note: As of Spring 3.0, this exporter requires Hessian 3.2 or above.
  *
  * 
    Hessian services exported with this class can be accessed by
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
index bff3d645db2..15f336d9438 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
@@ -32,7 +32,7 @@ import org.springframework.util.FileCopyUtils;
  *
  * 
    Burlap is a slim, XML-based RPC protocol.
  * For information on Burlap, see the
- * Burlap website.
+ * Burlap website.
  * This exporter requires Burlap 3.x.
  *
  * 
    Note: Burlap services exported with this class can be accessed by
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
index 125ebeb8257..8f1e29bb9e8 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
@@ -32,7 +32,7 @@ import org.springframework.util.FileCopyUtils;
  *
  * 
    Hessian is a slim, binary RPC protocol.
  * For information on Hessian, see the
- * Hessian website.
+ * Hessian website.
  * Note: As of Spring 3.0, this exporter requires Hessian 3.2 or above.
  *
  * 
    Hessian services exported with this class can be accessed by
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java b/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
index 68e2b0ee5bf..2c560b39fe3 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
@@ -7,11 +7,11 @@
  *
  * 
    Hessian is a slim, binary RPC protocol over HTTP.
  * For information on Hessian, see the
- * Hessian website
+ * Hessian website
  *
  * 
    Burlap is a slim, XML-based RPC protocol over HTTP.
  * For information on Burlap, see the
- * Burlap website
+ * Burlap website
  *
  */
 package org.springframework.remoting.caucho;
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java
index 8ec9fcfe12c..4fe50eeda82 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java
@@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * {@link HttpInvokerRequestExecutor} implementation that uses
- * Jakarta Commons HttpClient
+ * Jakarta Commons HttpClient
  * to execute POST requests. Requires Commons HttpClient 3.0 or higher.
  *
  * 
    Allows to use a pre-configured {@link org.apache.commons.httpclient.HttpClient}
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
index 58c27eb92b0..0e3ed9e36df 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
@@ -44,7 +44,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * {@link org.springframework.remoting.httpinvoker.HttpInvokerRequestExecutor} implementation that uses
- * Apache HttpComponents HttpClient
+ * Apache HttpComponents HttpClient
  * to execute POST requests.
  *
  * 
    Allows to use a pre-configured {@link org.apache.http.client.HttpClient}
diff --git a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
index 801e065076b..112be0677c4 100644
--- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
@@ -41,7 +41,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
  * the JAR Services API {@link ServiceLoader#load(Class)} method detecting the
  * {@code spring-web} module's {@code META-INF/services/javax.servlet.ServletContainerInitializer}
  * service provider configuration file. See the
- * 
+ * 
  * JAR Services API documentation as well as section 8.2.4 of the Servlet 3.0
  * Final Draft specification for complete details.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestOperations.java b/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
index a60de73c154..ef8db606b84 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
@@ -409,7 +409,7 @@ public interface RestOperations {
 	 * The given {@link ParameterizedTypeReference} is used to pass generic type information:
 	 * 
     	 * ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
-	 * ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
+	 * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean);
 	 * 
    
 	 * @param url the URL
 	 * @param method the HTTP method (GET, POST, etc)
@@ -429,7 +429,7 @@ public interface RestOperations {
 	 * The given {@link ParameterizedTypeReference} is used to pass generic type information:
 	 * 
     	 * ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
-	 * ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
+	 * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean);
 	 * 
    
 	 * @param url the URL
 	 * @param method the HTTP method (GET, POST, etc)
@@ -448,7 +448,7 @@ public interface RestOperations {
 	 * The given {@link ParameterizedTypeReference} is used to pass generic type information:
 	 * 
     	 * ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
-	 * ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
+	 * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean);
 	 * 
    
 	 * @param url the URL
 	 * @param method the HTTP method (GET, POST, etc)
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
index 4601722eb22..bb331f14d2a 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -81,27 +81,27 @@ import org.springframework.web.util.UriTemplate;
  * in that URL using either a {@code String} variable arguments array, or a {@code Map}.
  * The string varargs variant expands the given template variables in order, so that
  * 
    - * String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/bookings/{booking}", String.class, "42",
+ * String result = restTemplate.getForObject("https://example.com/hotels/{hotel}/bookings/{booking}", String.class, "42",
  * "21");
  * 
    
- * will perform a GET on {@code http://example.com/hotels/42/bookings/21}. The map variant expands the template based
+ * will perform a GET on {@code https://example.com/hotels/42/bookings/21}. The map variant expands the template based
  * on variable name, and is therefore more useful when using many variables, or when a single variable is used multiple
  * times. For example:
  * 
      * Map<String, String> vars = Collections.singletonMap("hotel", "42");
- * String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/rooms/{hotel}", String.class, vars);
+ * String result = restTemplate.getForObject("https://example.com/hotels/{hotel}/rooms/{hotel}", String.class, vars);
  * 
    
- * will perform a GET on {@code http://example.com/hotels/42/rooms/42}. Alternatively, there are {@link URI} variant
+ * will perform a GET on {@code https://example.com/hotels/42/rooms/42}. Alternatively, there are {@link URI} variant
  * methods ({@link #getForObject(URI, Class)}), which do not allow for URI templates, but allow you to reuse a single,
  * expanded URI multiple times.
  *
  * 
    Furthermore, the {@code String}-argument methods assume that the URL String is unencoded. This means that
  * 
    - * restTemplate.getForObject("http://example.com/hotel list");
+ * restTemplate.getForObject("https://example.com/hotel list");
  * 
    
- * will perform a GET on {@code http://example.com/hotel%20list}. As a result, any URL passed that is already encoded
- * will be encoded twice (i.e. {@code http://example.com/hotel%20list} will become {@code
- * http://example.com/hotel%2520list}). If this behavior is undesirable, use the {@code URI}-argument methods, which
+ * will perform a GET on {@code https://example.com/hotel%20list}. As a result, any URL passed that is already encoded
+ * will be encoded twice (i.e. {@code https://example.com/hotel%20list} will become {@code
+ * https://example.com/hotel%2520list}). If this behavior is undesirable, use the {@code URI}-argument methods, which
  * will not perform any URL encoding.
  *
  * 
    Objects passed to and returned from these methods are converted to and from HTTP messages by
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
index aeb0542b3fa..c8d7b642391 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest;
 
 /**
  * A strategy interface for multipart file upload resolution in accordance
- * with RFC 1867.
+ * with RFC 1867.
  * Implementations are typically usable both within an application context
  * and standalone.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
index 9cf21593605..722708b6d7d 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
@@ -38,7 +38,7 @@ import org.springframework.web.util.WebUtils;
 
 /**
  * Servlet-based {@link MultipartResolver} implementation for
- * Apache Commons FileUpload
+ * Apache Commons FileUpload
  * 1.2 or above.
  *
  * 
    Provides "maxUploadSize", "maxInMemorySize" and "defaultEncoding" settings as
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
index 001283a1fe9..fbc333b974f 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
@@ -1,5 +1,5 @@
 /**
  * MultipartResolver implementation for
- * Apache Commons FileUpload.
+ * Apache Commons FileUpload.
  */
 package org.springframework.web.multipart.commons;
diff --git a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
index 8e34931b489..cec39b3f220 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
  * @author Arjen Poutsma
  * @author Phillip Webb
  * @since 3.1.3
- * @see Hierarchical URIs
+ * @see Hierarchical URIs
  */
 @SuppressWarnings("serial")
 final class HierarchicalUriComponents extends UriComponents {
@@ -441,7 +441,7 @@ final class HierarchicalUriComponents extends UriComponents {
 	/**
 	 * Enumeration used to identify the parts of a URI.
 	 * 
    Contains methods to indicate whether a given character is valid in a specific URI component.
-	 * @see RFC 3986
+	 * @see RFC 3986
 	 */
 	static enum Type {
 
@@ -519,7 +519,7 @@ final class HierarchicalUriComponents extends UriComponents {
 
 		/**
 		 * Indicates whether the given character is in the {@code ALPHA} set.
-		 * @see RFC 3986, appendix A
+		 * @see RFC 3986, appendix A
 		 */
 		protected boolean isAlpha(int c) {
 			return c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z';
@@ -527,7 +527,7 @@ final class HierarchicalUriComponents extends UriComponents {
 
 		/**
 		 * Indicates whether the given character is in the {@code DIGIT} set.
-		 * @see RFC 3986, appendix A
+		 * @see RFC 3986, appendix A
 		 */
 		protected boolean isDigit(int c) {
 			return c >= '0' && c <= '9';
@@ -535,7 +535,7 @@ final class HierarchicalUriComponents extends UriComponents {
 
 		/**
 		 * Indicates whether the given character is in the {@code gen-delims} set.
-		 * @see RFC 3986, appendix A
+		 * @see RFC 3986, appendix A
 		 */
 		protected boolean isGenericDelimiter(int c) {
 			return ':' == c || '/' == c || '?' == c || '#' == c || '[' == c || ']' == c || '@' == c;
@@ -543,7 +543,7 @@ final class HierarchicalUriComponents extends UriComponents {
 
 		/**
 		 * Indicates whether the given character is in the {@code sub-delims} set.
-		 * @see RFC 3986, appendix A
+		 * @see RFC 3986, appendix A
 		 */
 		protected boolean isSubDelimiter(int c) {
 			return '!' == c || '$' == c || '&' == c || '\'' == c || '(' == c || ')' == c || '*' == c || '+' == c ||
@@ -552,7 +552,7 @@ final class HierarchicalUriComponents extends UriComponents {
 
 		/**
 		 * Indicates whether the given character is in the {@code reserved} set.
-		 * @see RFC 3986, appendix A
+		 * @see RFC 3986, appendix A
 		 */
 		protected boolean isReserved(char c) {
 			return isGenericDelimiter(c) || isReserved(c);
@@ -560,7 +560,7 @@ final class HierarchicalUriComponents extends UriComponents {
 
 		/**
 		 * Indicates whether the given character is in the {@code unreserved} set.
-		 * @see RFC 3986, appendix A
+		 * @see RFC 3986, appendix A
 		 */
 		protected boolean isUnreserved(int c) {
 			return isAlpha(c) || isDigit(c) || '-' == c || '.' == c || '_' == c || '~' == c;
@@ -568,7 +568,7 @@ final class HierarchicalUriComponents extends UriComponents {
 
 		/**
 		 * Indicates whether the given character is in the {@code pchar} set.
-		 * @see RFC 3986, appendix A
+		 * @see RFC 3986, appendix A
 		 */
 		protected boolean isPchar(int c) {
 			return isUnreserved(c) || isSubDelimiter(c) || ':' == c || '@' == c;
diff --git a/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
index bce4655edac..43486813ea8 100644
--- a/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
@@ -32,7 +32,7 @@ import org.springframework.util.ObjectUtils;
  * @author Arjen Poutsma
  * @author Phillip Webb
  * @since 3.2
- * @see Hierarchical vs Opaque URIs
+ * @see Hierarchical vs Opaque URIs
  */
 @SuppressWarnings("serial")
 final class OpaqueUriComponents extends UriComponents {
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
index 565ba94c3fb..e2b0a03514d 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
  * @author Arjen Poutsma
  * @author Juergen Hoeller
  * @since 3.0
- * @see URI Templates
+ * @see URI Templates
  */
 @SuppressWarnings("serial")
 public class UriTemplate implements Serializable {
@@ -85,13 +85,13 @@ public class UriTemplate implements Serializable {
 	 * the Map values variable values. The order of variables is not significant.
 	 * 
    Example:
 	 * 
    -	 * UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+	 * UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
 	 * Map<String, String> uriVariables = new HashMap<String, String>();
 	 * uriVariables.put("booking", "42");
 	 * uriVariables.put("hotel", "Rest & Relax");
 	 * System.out.println(template.expand(uriVariables));
 	 * 
    
-	 * will print: 
    {@code http://example.com/hotels/Rest%20%26%20Relax/bookings/42}
    
+	 * will print: 
    {@code https://example.com/hotels/Rest%20%26%20Relax/bookings/42}
    
 	 * @param uriVariables the map of URI variables
 	 * @return the expanded URI
 	 * @throws IllegalArgumentException if {@code uriVariables} is {@code null};
@@ -108,10 +108,10 @@ public class UriTemplate implements Serializable {
      * The order of variables is significant.
      * 
    Example:
      * 
    -     * UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+     * UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
      * System.out.println(template.expand("Rest & Relax", "42));
      * 
    
-     * will print: 
    {@code http://example.com/hotels/Rest%20%26%20Relax/bookings/42}
    
+     * will print: 
    {@code https://example.com/hotels/Rest%20%26%20Relax/bookings/42}
    
      * @param uriVariableValues the array of URI variables
      * @return the expanded URI
      * @throws IllegalArgumentException if {@code uriVariables} is {@code null}
@@ -141,8 +141,8 @@ public class UriTemplate implements Serializable {
 	 * values are variable values, as occurred in the given URI.
 	 * 
    Example:
 	 * 
    -	 * UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
-	 * System.out.println(template.match("http://example.com/hotels/1/bookings/42"));
+	 * UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
+	 * System.out.println(template.match("https://example.com/hotels/1/bookings/42"));
 	 * 
    
 	 * will print: 
    {@code {hotel=1, booking=42}}
    
 	 * @param uri the URI to match to
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
index 0f1f6222a58..ade6b47f84d 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
  *
  * @author Arjen Poutsma
  * @since 3.0
- * @see RFC 3986
+ * @see RFC 3986
  */
 public abstract class UriUtils {
 
diff --git a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
index 21d8c2bd675..5061c14eb10 100644
--- a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
+++ b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
@@ -115,10 +115,10 @@ public class HttpHeadersTests {
 
 	@Test
 	public void location() throws URISyntaxException {
-		URI location = new URI("http://www.example.com/hotels");
+		URI location = new URI("https://www.example.com/hotels");
 		headers.setLocation(location);
 		assertEquals("Invalid Location header", location, headers.getLocation());
-		assertEquals("Invalid Location header", "http://www.example.com/hotels", headers.getFirst("Location"));
+		assertEquals("Invalid Location header", "https://www.example.com/hotels", headers.getFirst("Location"));
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
index 48c6052d625..3e49573703e 100644
--- a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
@@ -65,7 +65,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 		interceptors.add(new NoOpInterceptor());
 		requestFactory = new InterceptingClientHttpRequestFactory(requestFactoryMock, interceptors);
 
-		ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+		ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
 		ClientHttpResponse response = request.execute();
 
 		assertTrue(((NoOpInterceptor) interceptors.get(0)).invoked);
@@ -89,7 +89,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 		interceptors.add(new NoOpInterceptor());
 		requestFactory = new InterceptingClientHttpRequestFactory(requestFactoryMock, interceptors);
 
-		ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+		ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
 		ClientHttpResponse response = request.execute();
 
 		assertFalse(((NoOpInterceptor) interceptors.get(1)).invoked);
@@ -128,13 +128,13 @@ public class InterceptingClientHttpRequestFactoryTests {
 		requestFactory =
 				new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
 
-		ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+		ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
 		request.execute();
 	}
 
 	@Test
 	public void changeURI() throws Exception {
-		final URI changedUri = new URI("http://example.com/2");
+		final URI changedUri = new URI("https://example.com/2");
 		ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() {
 			@Override
 			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
@@ -161,7 +161,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 		requestFactory =
 				new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
 
-		ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+		ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
 		request.execute();
 	}
 
@@ -194,7 +194,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 		requestFactory =
 				new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
 
-		ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+		ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
 		request.execute();
 	}
 
@@ -213,7 +213,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 		requestFactory =
 				new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
 
-		ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+		ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
 		request.execute();
 		assertTrue(Arrays.equals(changedBody, requestMock.body.toByteArray()));
 	}
diff --git a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
index c24c1fda9bc..df0c0c51df8 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
@@ -89,7 +89,7 @@ public class RssChannelHttpMessageConverterTests {
 	public void write() throws IOException, SAXException {
 		Channel channel = new Channel("rss_2.0");
 		channel.setTitle("title");
-		channel.setLink("http://example.com");
+		channel.setLink("https://example.com");
 		channel.setDescription("description");
 
 		Item item1 = new Item();
@@ -109,7 +109,7 @@ public class RssChannelHttpMessageConverterTests {
 		assertEquals("Invalid content-type", new MediaType("application", "rss+xml", utf8),
 				outputMessage.getHeaders().getContentType());
 		String expected = "" +
-				"titlehttp://example.comdescription" +
+				"titlehttps://example.comdescription" +
 				"title1" +
 				"title2" +
 				"";
@@ -120,7 +120,7 @@ public class RssChannelHttpMessageConverterTests {
 	public void writeOtherCharset() throws IOException, SAXException {
 		Channel channel = new Channel("rss_2.0");
 		channel.setTitle("title");
-		channel.setLink("http://example.com");
+		channel.setLink("https://example.com");
 		channel.setDescription("description");
 
 		String encoding = "ISO-8859-1";
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
index 1f95148c80d..3a715e7e086 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
@@ -112,7 +112,7 @@ public class Jaxb2RootElementHttpMessageConverterTests {
 	@Test
 	public void readXmlRootElementExternalEntityDisabled() throws Exception {
 		Resource external = new ClassPathResource("external.txt", getClass());
-		String content =  "\n" +
 				"  ]>" +
 				"  &ext;";
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
index 2abb91ea734..96dd63df525 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
@@ -70,7 +70,7 @@ public class SourceHttpMessageConverterTests {
 	public void setUp() throws IOException {
 		converter = new SourceHttpMessageConverter();
 		Resource external = new ClassPathResource("external.txt", getClass());
-		bodyExternal = "\n" +
 				"  ]>&ext;";
 	}
diff --git a/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
index a5220ff90f3..05bce08de80 100644
--- a/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
@@ -56,7 +56,7 @@ public class ServletServerHttpRequestTests {
 
 	@Test
 	public void getURI() throws Exception {
-		URI uri = new URI("http://example.com/path?query");
+		URI uri = new URI("https://example.com/path?query");
 		mockRequest.setServerName(uri.getHost());
 		mockRequest.setServerPort(uri.getPort());
 		mockRequest.setRequestURI(uri.getPath());
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
index 9fafa1d30ea..2fd22c6aa13 100644
--- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
@@ -75,7 +75,7 @@ public class RestTemplateTests {
 
 	@Test
 	public void varArgsTemplateVariables() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com/hotels/42/bookings/21"), HttpMethod.GET))
+		given(requestFactory.createRequest(new URI("https://example.com/hotels/42/bookings/21"), HttpMethod.GET))
 				.willReturn(request);
 		given(request.execute()).willReturn(response);
 		given(errorHandler.hasError(response)).willReturn(false);
@@ -83,7 +83,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		template.execute("http://example.com/hotels/{hotel}/bookings/{booking}", HttpMethod.GET, null, null, "42",
+		template.execute("https://example.com/hotels/{hotel}/bookings/{booking}", HttpMethod.GET, null, null, "42",
 				"21");
 
 		verify(response).close();
@@ -91,7 +91,7 @@ public class RestTemplateTests {
 
 	@Test
 	public void varArgsNullTemplateVariable() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com/-foo"), HttpMethod.GET))
+		given(requestFactory.createRequest(new URI("https://example.com/-foo"), HttpMethod.GET))
 				.willReturn(request);
 		given(request.execute()).willReturn(response);
 		given(errorHandler.hasError(response)).willReturn(false);
@@ -99,14 +99,14 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		template.execute("http://example.com/{first}-{last}", HttpMethod.GET, null, null, null, "foo");
+		template.execute("https://example.com/{first}-{last}", HttpMethod.GET, null, null, null, "foo");
 
 		verify(response).close();
 	}
 
 	@Test
 	public void mapTemplateVariables() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com/hotels/42/bookings/42"), HttpMethod.GET))
+		given(requestFactory.createRequest(new URI("https://example.com/hotels/42/bookings/42"), HttpMethod.GET))
 				.willReturn(request);
 		given(request.execute()).willReturn(response);
 		given(errorHandler.hasError(response)).willReturn(false);
@@ -115,14 +115,14 @@ public class RestTemplateTests {
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
 		Map vars = Collections.singletonMap("hotel", "42");
-		template.execute("http://example.com/hotels/{hotel}/bookings/{hotel}", HttpMethod.GET, null, null, vars);
+		template.execute("https://example.com/hotels/{hotel}/bookings/{hotel}", HttpMethod.GET, null, null, vars);
 
 		verify(response).close();
 	}
 
 	@Test
 	public void mapNullTemplateVariable() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com/-foo"), HttpMethod.GET))
+		given(requestFactory.createRequest(new URI("https://example.com/-foo"), HttpMethod.GET))
 				.willReturn(request);
 		given(request.execute()).willReturn(response);
 		given(errorHandler.hasError(response)).willReturn(false);
@@ -133,14 +133,14 @@ public class RestTemplateTests {
 		Map vars = new HashMap(2);
 		vars.put("first", null);
 		vars.put("last", "foo");
-		template.execute("http://example.com/{first}-{last}", HttpMethod.GET, null, null, vars);
+		template.execute("https://example.com/{first}-{last}", HttpMethod.GET, null, null, vars);
 
 		verify(response).close();
 	}
 
 	@Test
 	public void errorHandling() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET)).willReturn(request);
 		given(request.execute()).willReturn(response);
 		given(errorHandler.hasError(response)).willReturn(true);
 		given(response.getStatusCode()).willReturn(HttpStatus.INTERNAL_SERVER_ERROR);
@@ -148,7 +148,7 @@ public class RestTemplateTests {
 		willThrow(new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR)).given(errorHandler).handleError(response);
 
 		try {
-			template.execute("http://example.com", HttpMethod.GET, null, null);
+			template.execute("https://example.com", HttpMethod.GET, null, null);
 			fail("HttpServerErrorException expected");
 		}
 		catch (HttpServerErrorException ex) {
@@ -163,7 +163,7 @@ public class RestTemplateTests {
 		given(converter.canRead(String.class, null)).willReturn(true);
 		MediaType textPlain = new MediaType("text", "plain");
 		given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET)).willReturn(request);
 		HttpHeaders requestHeaders = new HttpHeaders();
 		given(request.getHeaders()).willReturn(requestHeaders);
 		given(request.execute()).willReturn(response);
@@ -180,7 +180,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		String result = template.getForObject("http://example.com", String.class);
+		String result = template.getForObject("https://example.com", String.class);
 		assertEquals("Invalid GET result", expected, result);
 		assertEquals("Invalid Accept header", textPlain.toString(), requestHeaders.getFirst("Accept"));
 
@@ -192,7 +192,7 @@ public class RestTemplateTests {
 		given(converter.canRead(String.class, null)).willReturn(true);
 		MediaType supportedMediaType = new MediaType("foo", "bar");
 		given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(supportedMediaType));
-		given(requestFactory.createRequest(new URI("http://example.com/resource"), HttpMethod.GET)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com/resource"), HttpMethod.GET)).willReturn(request);
 		HttpHeaders requestHeaders = new HttpHeaders();
 		given(request.getHeaders()).willReturn(requestHeaders);
 		given(request.execute()).willReturn(response);
@@ -209,7 +209,7 @@ public class RestTemplateTests {
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
 		try {
-			template.getForObject("http://example.com/{p}", String.class, "resource");
+			template.getForObject("https://example.com/{p}", String.class, "resource");
 			fail("UnsupportedMediaTypeException expected");
 		}
 		catch (RestClientException ex) {
@@ -225,7 +225,7 @@ public class RestTemplateTests {
 		given(converter.canRead(String.class, null)).willReturn(true);
 		MediaType textPlain = new MediaType("text", "plain");
 		given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET)).willReturn(request);
 		HttpHeaders requestHeaders = new HttpHeaders();
 		given(request.getHeaders()).willReturn(requestHeaders);
 		given(request.execute()).willReturn(response);
@@ -243,7 +243,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		ResponseEntity result = template.getForEntity("http://example.com", String.class);
+		ResponseEntity result = template.getForEntity("https://example.com", String.class);
 		assertEquals("Invalid GET result", expected, result.getBody());
 		assertEquals("Invalid Accept header", textPlain.toString(), requestHeaders.getFirst("Accept"));
 		assertEquals("Invalid Content-Type header", textPlain, result.getHeaders().getContentType());
@@ -255,7 +255,7 @@ public class RestTemplateTests {
 
 	@Test
 	public void headForHeaders() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.HEAD)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.HEAD)).willReturn(request);
 		given(request.execute()).willReturn(response);
 		given(errorHandler.hasError(response)).willReturn(false);
 		HttpHeaders responseHeaders = new HttpHeaders();
@@ -264,7 +264,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		HttpHeaders result = template.headForHeaders("http://example.com");
+		HttpHeaders result = template.headForHeaders("https://example.com");
 
 		assertSame("Invalid headers returned", responseHeaders, result);
 
@@ -273,21 +273,21 @@ public class RestTemplateTests {
 
 	@Test
 	public void postForLocation() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
 		String helloWorld = "Hello World";
 		given(converter.canWrite(String.class, null)).willReturn(true);
 		converter.write(helloWorld, null, request);
 		given(request.execute()).willReturn(response);
 		given(errorHandler.hasError(response)).willReturn(false);
 		HttpHeaders responseHeaders = new HttpHeaders();
-		URI expected = new URI("http://example.com/hotels");
+		URI expected = new URI("https://example.com/hotels");
 		responseHeaders.setLocation(expected);
 		given(response.getHeaders()).willReturn(responseHeaders);
 		HttpStatus status = HttpStatus.OK;
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		URI result = template.postForLocation("http://example.com", helloWorld);
+		URI result = template.postForLocation("https://example.com", helloWorld);
 		assertEquals("Invalid POST result", expected, result);
 
 		verify(response).close();
@@ -295,7 +295,7 @@ public class RestTemplateTests {
 
 	@Test
 	public void postForLocationEntityContentType() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
 		String helloWorld = "Hello World";
 		MediaType contentType = MediaType.TEXT_PLAIN;
 		given(converter.canWrite(String.class, contentType)).willReturn(true);
@@ -305,7 +305,7 @@ public class RestTemplateTests {
 		given(request.execute()).willReturn(response);
 		given(errorHandler.hasError(response)).willReturn(false);
 		HttpHeaders responseHeaders = new HttpHeaders();
-		URI expected = new URI("http://example.com/hotels");
+		URI expected = new URI("https://example.com/hotels");
 		responseHeaders.setLocation(expected);
 		given(response.getHeaders()).willReturn(responseHeaders);
 		HttpStatus status = HttpStatus.OK;
@@ -316,7 +316,7 @@ public class RestTemplateTests {
 		entityHeaders.setContentType(contentType);
 		HttpEntity entity = new HttpEntity(helloWorld, entityHeaders);
 
-		URI result = template.postForLocation("http://example.com", entity);
+		URI result = template.postForLocation("https://example.com", entity);
 		assertEquals("Invalid POST result", expected, result);
 
 		verify(response).close();
@@ -324,7 +324,7 @@ public class RestTemplateTests {
 
 	@Test
 	public void postForLocationEntityCustomHeader() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
 		String helloWorld = "Hello World";
 		given(converter.canWrite(String.class, null)).willReturn(true);
 		HttpHeaders requestHeaders = new HttpHeaders();
@@ -333,7 +333,7 @@ public class RestTemplateTests {
 		given(request.execute()).willReturn(response);
 		given(errorHandler.hasError(response)).willReturn(false);
 		HttpHeaders responseHeaders = new HttpHeaders();
-		URI expected = new URI("http://example.com/hotels");
+		URI expected = new URI("https://example.com/hotels");
 		responseHeaders.setLocation(expected);
 		given(response.getHeaders()).willReturn(responseHeaders);
 		HttpStatus status = HttpStatus.OK;
@@ -344,7 +344,7 @@ public class RestTemplateTests {
 		entityHeaders.set("MyHeader", "MyValue");
 		HttpEntity entity = new HttpEntity(helloWorld, entityHeaders);
 
-		URI result = template.postForLocation("http://example.com", entity);
+		URI result = template.postForLocation("https://example.com", entity);
 		assertEquals("Invalid POST result", expected, result);
 		assertEquals("No custom header set", "MyValue", requestHeaders.getFirst("MyHeader"));
 
@@ -353,7 +353,7 @@ public class RestTemplateTests {
 
 	@Test
 	public void postForLocationNoLocation() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
 		String helloWorld = "Hello World";
 		given(converter.canWrite(String.class, null)).willReturn(true);
 		converter.write(helloWorld, null, request);
@@ -365,7 +365,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		URI result = template.postForLocation("http://example.com", helloWorld);
+		URI result = template.postForLocation("https://example.com", helloWorld);
 		assertNull("Invalid POST result", result);
 
 		verify(response).close();
@@ -373,7 +373,7 @@ public class RestTemplateTests {
 
 	@Test
 	public void postForLocationNull() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
 		HttpHeaders requestHeaders = new HttpHeaders();
 		given(request.getHeaders()).willReturn(requestHeaders);
 		given(request.execute()).willReturn(response);
@@ -384,7 +384,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		template.postForLocation("http://example.com", null);
+		template.postForLocation("https://example.com", null);
 		assertEquals("Invalid content length", 0, requestHeaders.getContentLength());
 
 		verify(response).close();
@@ -395,7 +395,7 @@ public class RestTemplateTests {
 		MediaType textPlain = new MediaType("text", "plain");
 		given(converter.canRead(Integer.class, null)).willReturn(true);
 		given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(this.request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(this.request);
 		HttpHeaders requestHeaders = new HttpHeaders();
 		given(this.request.getHeaders()).willReturn(requestHeaders);
 		String request = "Hello World";
@@ -415,7 +415,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		Integer result = template.postForObject("http://example.com", request, Integer.class);
+		Integer result = template.postForObject("https://example.com", request, Integer.class);
 		assertEquals("Invalid POST result", expected, result);
 		assertEquals("Invalid Accept header", textPlain.toString(), requestHeaders.getFirst("Accept"));
 
@@ -427,7 +427,7 @@ public class RestTemplateTests {
 		MediaType textPlain = new MediaType("text", "plain");
 		given(converter.canRead(Integer.class, null)).willReturn(true);
 		given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(this.request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(this.request);
 		HttpHeaders requestHeaders = new HttpHeaders();
 		given(this.request.getHeaders()).willReturn(requestHeaders);
 		String request = "Hello World";
@@ -448,7 +448,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		ResponseEntity result = template.postForEntity("http://example.com", request, Integer.class);
+		ResponseEntity result = template.postForEntity("https://example.com", request, Integer.class);
 		assertEquals("Invalid POST result", expected, result.getBody());
 		assertEquals("Invalid Content-Type", textPlain, result.getHeaders().getContentType());
 		assertEquals("Invalid Accept header", textPlain.toString(), requestHeaders.getFirst("Accept"));
@@ -462,7 +462,7 @@ public class RestTemplateTests {
 		MediaType textPlain = new MediaType("text", "plain");
 		given(converter.canRead(Integer.class, null)).willReturn(true);
 		given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
 		HttpHeaders requestHeaders = new HttpHeaders();
 		given(request.getHeaders()).willReturn(requestHeaders);
 		given(request.execute()).willReturn(response);
@@ -478,7 +478,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		Integer result = template.postForObject("http://example.com", null, Integer.class);
+		Integer result = template.postForObject("https://example.com", null, Integer.class);
 		assertNull("Invalid POST result", result);
 		assertEquals("Invalid content length", 0, requestHeaders.getContentLength());
 
@@ -490,7 +490,7 @@ public class RestTemplateTests {
 		MediaType textPlain = new MediaType("text", "plain");
 		given(converter.canRead(Integer.class, null)).willReturn(true);
 		given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
 		HttpHeaders requestHeaders = new HttpHeaders();
 		given(request.getHeaders()).willReturn(requestHeaders);
 		given(request.execute()).willReturn(response);
@@ -507,7 +507,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		ResponseEntity result = template.postForEntity("http://example.com", null, Integer.class);
+		ResponseEntity result = template.postForEntity("https://example.com", null, Integer.class);
 		assertFalse("Invalid POST result", result.hasBody());
 		assertEquals("Invalid Content-Type", textPlain, result.getHeaders().getContentType());
 		assertEquals("Invalid content length", 0, requestHeaders.getContentLength());
@@ -519,7 +519,7 @@ public class RestTemplateTests {
 	@Test
 	public void put() throws Exception {
 		given(converter.canWrite(String.class, null)).willReturn(true);
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.PUT)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.PUT)).willReturn(request);
 		String helloWorld = "Hello World";
 		converter.write(helloWorld, null, request);
 		given(request.execute()).willReturn(response);
@@ -528,14 +528,14 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		template.put("http://example.com", helloWorld);
+		template.put("https://example.com", helloWorld);
 
 		verify(response).close();
 	}
 
 	@Test
 	public void putNull() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.PUT)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.PUT)).willReturn(request);
 		HttpHeaders requestHeaders = new HttpHeaders();
 		given(request.getHeaders()).willReturn(requestHeaders);
 		given(request.execute()).willReturn(response);
@@ -544,7 +544,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		template.put("http://example.com", null);
+		template.put("https://example.com", null);
 		assertEquals("Invalid content length", 0, requestHeaders.getContentLength());
 
 		verify(response).close();
@@ -552,21 +552,21 @@ public class RestTemplateTests {
 
 	@Test
 	public void delete() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.DELETE)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.DELETE)).willReturn(request);
 		given(request.execute()).willReturn(response);
 		given(errorHandler.hasError(response)).willReturn(false);
 		HttpStatus status = HttpStatus.OK;
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		template.delete("http://example.com");
+		template.delete("https://example.com");
 
 		verify(response).close();
 	}
 
 	@Test
 	public void optionsForAllow() throws Exception {
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.OPTIONS)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.OPTIONS)).willReturn(request);
 		given(request.execute()).willReturn(response);
 		given(errorHandler.hasError(response)).willReturn(false);
 		HttpHeaders responseHeaders = new HttpHeaders();
@@ -577,7 +577,7 @@ public class RestTemplateTests {
 		given(response.getStatusCode()).willReturn(status);
 		given(response.getStatusText()).willReturn(status.getReasonPhrase());
 
-		Set result = template.optionsForAllow("http://example.com");
+		Set result = template.optionsForAllow("https://example.com");
 		assertEquals("Invalid OPTIONS result", expected, result);
 
 		verify(response).close();
@@ -588,12 +588,12 @@ public class RestTemplateTests {
 		given(converter.canRead(String.class, null)).willReturn(true);
 		MediaType mediaType = new MediaType("foo", "bar");
 		given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(mediaType));
-		given(requestFactory.createRequest(new URI("http://example.com/resource"), HttpMethod.GET)).willReturn(request);
+		given(requestFactory.createRequest(new URI("https://example.com/resource"), HttpMethod.GET)).willReturn(request);
 		given(request.getHeaders()).willReturn(new HttpHeaders());
 		given(request.execute()).willThrow(new IOException());
 
 		try {
-			template.getForObject("http://example.com/resource", String.class);
+			template.getForObject("https://example.com/resource", String.class);
 			fail("RestClientException expected");
 		}
 		catch (ResourceAccessException ex) {
@@ -605,7 +605,7 @@ public class RestTemplateTests {
 	public void exchange() throws Exception {
 		given(converter.canRead(Integer.class, null)).willReturn(true);
 		given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN));
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(this.request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(this.request);
 		HttpHeaders requestHeaders = new HttpHeaders();
 		given(this.request.getHeaders()).willReturn(requestHeaders);
 		given(converter.canWrite(String.class, null)).willReturn(true);
@@ -629,7 +629,7 @@ public class RestTemplateTests {
 		HttpHeaders entityHeaders = new HttpHeaders();
 		entityHeaders.set("MyHeader", "MyValue");
 		HttpEntity requestEntity = new HttpEntity(body, entityHeaders);
-		ResponseEntity result = template.exchange("http://example.com", HttpMethod.POST, requestEntity, Integer.class);
+		ResponseEntity result = template.exchange("https://example.com", HttpMethod.POST, requestEntity, Integer.class);
 		assertEquals("Invalid POST result", expected, result.getBody());
 		assertEquals("Invalid Content-Type", MediaType.TEXT_PLAIN, result.getHeaders().getContentType());
 		assertEquals("Invalid Accept header", MediaType.TEXT_PLAIN_VALUE, requestHeaders.getFirst("Accept"));
@@ -647,7 +647,7 @@ public class RestTemplateTests {
 		ParameterizedTypeReference> intList = new ParameterizedTypeReference>() {};
 		given(converter.canRead(intList.getType(), null, null)).willReturn(true);
 		given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN));
-		given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(this.request);
+		given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(this.request);
 		HttpHeaders requestHeaders = new HttpHeaders();
 		given(this.request.getHeaders()).willReturn(requestHeaders);
 		given(converter.canWrite(String.class, null)).willReturn(true);
@@ -671,7 +671,7 @@ public class RestTemplateTests {
 		HttpHeaders entityHeaders = new HttpHeaders();
 		entityHeaders.set("MyHeader", "MyValue");
 		HttpEntity requestEntity = new HttpEntity(requestBody, entityHeaders);
-		ResponseEntity> result = template.exchange("http://example.com", HttpMethod.POST, requestEntity, intList);
+		ResponseEntity> result = template.exchange("https://example.com", HttpMethod.POST, requestEntity, intList);
 		assertEquals("Invalid POST result", expected, result.getBody());
 		assertEquals("Invalid Content-Type", MediaType.TEXT_PLAIN, result.getHeaders().getContentType());
 		assertEquals("Invalid Accept header", MediaType.TEXT_PLAIN_VALUE, requestHeaders.getFirst("Accept"));
diff --git a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
index a409f3194cf..a48110a7d49 100644
--- a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
@@ -57,7 +57,7 @@ public class RequestPartServletServerHttpRequestTests {
 
 	@Test
 	public void getURI() throws Exception {
-		URI uri = new URI("http://example.com/path?query");
+		URI uri = new URI("https://example.com/path?query");
 		mockRequest.setServerName(uri.getHost());
 		mockRequest.setServerPort(uri.getPort());
 		mockRequest.setRequestURI(uri.getPath());
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
index 97e7d6900d3..905ac079802 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
@@ -48,7 +48,7 @@ public class UriComponentsBuilderTests {
 		assertEquals("bar", result.getQuery());
 		assertEquals("baz", result.getFragment());
 
-		URI expected = new URI("http://example.com/foo?bar#baz");
+		URI expected = new URI("https://example.com/foo?bar#baz");
 		assertEquals("Invalid result URI", expected, result.toUri());
 	}
 
@@ -62,7 +62,7 @@ public class UriComponentsBuilderTests {
 		assertEquals("http", result1.getScheme());
 		assertEquals("example.com", result1.getHost());
 		assertEquals("/foo", result1.getPath());
-		URI expected = new URI("http://example.com/foo");
+		URI expected = new URI("https://example.com/foo");
 		assertEquals("Invalid result URI", expected, result1.toUri());
 
 		assertEquals("http", result2.getScheme());
@@ -70,7 +70,7 @@ public class UriComponentsBuilderTests {
 		assertEquals("/foo/foo2", result2.getPath());
 		assertEquals("bar", result2.getQuery());
 		assertEquals("baz", result2.getFragment());
-		expected = new URI("http://example.com/foo/foo2?bar#baz");
+		expected = new URI("https://example.com/foo/foo2?bar#baz");
 		assertEquals("Invalid result URI", expected, result2.toUri());
 	}
 
@@ -95,7 +95,7 @@ public class UriComponentsBuilderTests {
 
 	@Test
 	public void fromHierarchicalUri() throws URISyntaxException {
-		URI uri = new URI("http://example.com/foo?bar#baz");
+		URI uri = new URI("https://example.com/foo?bar#baz");
 		UriComponents result = UriComponentsBuilder.fromUri(uri).build();
 		assertEquals("http", result.getScheme());
 		assertEquals("example.com", result.getHost());
@@ -121,7 +121,7 @@ public class UriComponentsBuilderTests {
 
 	@Test
 	public void fromUriEncodedQuery() throws URISyntaxException {
-		URI uri = new URI("http://www.example.org/?param=aGVsbG9Xb3JsZA%3D%3D");
+		URI uri = new URI("https://www.example.org/?param=aGVsbG9Xb3JsZA%3D%3D");
 		String fromUri = UriComponentsBuilder.fromUri(uri).build().getQueryParams().get("param").get(0);
 		String fromUriString = UriComponentsBuilder.fromUriString(uri.toString()).build().getQueryParams().get("param").get(0);
 
@@ -130,7 +130,7 @@ public class UriComponentsBuilderTests {
 
 	@Test
 	public void fromUriString() {
-		UriComponents result = UriComponentsBuilder.fromUriString("http://www.ietf.org/rfc/rfc3986.txt").build();
+		UriComponents result = UriComponentsBuilder.fromUriString("https://www.ietf.org/rfc/rfc3986.txt").build();
 		assertEquals("http", result.getScheme());
 		assertNull(result.getUserInfo());
 		assertEquals("www.ietf.org", result.getHost());
@@ -141,7 +141,7 @@ public class UriComponentsBuilderTests {
 		assertNull(result.getFragment());
 
 		result = UriComponentsBuilder.fromUriString(
-				"http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)")
+				"https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)")
 				.build();
 		assertEquals("http", result.getScheme());
 		assertEquals("arjen:foobar", result.getUserInfo());
@@ -178,7 +178,7 @@ public class UriComponentsBuilderTests {
 
 	@Test
 	public void fromUriStringQueryParamWithReservedCharInValue() throws URISyntaxException {
-		String uri = "http://www.google.com/ig/calculator?q=1USD=?EUR";
+		String uri = "https://www.google.com/ig/calculator?q=1USD=?EUR";
 		UriComponents result = UriComponentsBuilder.fromUriString(uri).build();
 
 		assertEquals("q=1USD=?EUR", result.getQuery());
@@ -197,7 +197,7 @@ public class UriComponentsBuilderTests {
 
 	@Test
 	public void fromUriStringNoPathWithReservedCharInQuery() {
-		UriComponents result = UriComponentsBuilder.fromUriString("http://example.com?foo=bar@baz").build();
+		UriComponents result = UriComponentsBuilder.fromUriString("https://example.com?foo=bar@baz").build();
 		assertTrue(StringUtils.isEmpty(result.getUserInfo()));
 		assertEquals("example.com", result.getHost());
 		assertTrue(result.getQueryParams().containsKey("foo"));
@@ -269,32 +269,32 @@ public class UriComponentsBuilderTests {
 
 	@Test
 	public void replacePath() {
-		UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("http://www.ietf.org/rfc/rfc2396.txt");
+		UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("https://www.ietf.org/rfc/rfc2396.txt");
 		builder.replacePath("/rfc/rfc3986.txt");
 		UriComponents result = builder.build();
 
-		assertEquals("http://www.ietf.org/rfc/rfc3986.txt", result.toUriString());
+		assertEquals("https://www.ietf.org/rfc/rfc3986.txt", result.toUriString());
 
-		builder = UriComponentsBuilder.fromUriString("http://www.ietf.org/rfc/rfc2396.txt");
+		builder = UriComponentsBuilder.fromUriString("https://www.ietf.org/rfc/rfc2396.txt");
 		builder.replacePath(null);
 		result = builder.build();
 
-		assertEquals("http://www.ietf.org", result.toUriString());
+		assertEquals("https://www.ietf.org", result.toUriString());
 	}
 
 	@Test
 	public void replaceQuery() {
-		UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("http://example.com/foo?foo=bar&baz=qux");
+		UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("https://example.com/foo?foo=bar&baz=qux");
 		builder.replaceQuery("baz=42");
 		UriComponents result = builder.build();
 
-		assertEquals("http://example.com/foo?baz=42", result.toUriString());
+		assertEquals("https://example.com/foo?baz=42", result.toUriString());
 
-		builder = UriComponentsBuilder.fromUriString("http://example.com/foo?foo=bar&baz=qux");
+		builder = UriComponentsBuilder.fromUriString("https://example.com/foo?foo=bar&baz=qux");
 		builder.replaceQuery(null);
 		result = builder.build();
 
-		assertEquals("http://example.com/foo", result.toUriString());
+		assertEquals("https://example.com/foo", result.toUriString());
 	}
 
 	@Test
@@ -361,41 +361,41 @@ public class UriComponentsBuilderTests {
 
 	@Test
 	public void queryParamWithValueWithEquals() throws Exception {
-		UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/foo?bar=baz").build();
-		assertThat(uriComponents.toUriString(), equalTo("http://example.com/foo?bar=baz"));
+		UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar=baz").build();
+		assertThat(uriComponents.toUriString(), equalTo("https://example.com/foo?bar=baz"));
 	}
 
 	@Test
 	public void queryParamWithoutValueWithEquals() throws Exception {
-		UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/foo?bar=").build();
-		assertThat(uriComponents.toUriString(), equalTo("http://example.com/foo?bar="));
+		UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar=").build();
+		assertThat(uriComponents.toUriString(), equalTo("https://example.com/foo?bar="));
 	}
 
 	@Test
 	public void queryParamWithoutValueWithoutEquals() throws Exception {
-		UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/foo?bar").build();
-		assertThat(uriComponents.toUriString(), equalTo("http://example.com/foo?bar"));
+		UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar").build();
+		assertThat(uriComponents.toUriString(), equalTo("https://example.com/foo?bar"));
 	}
 
 	@Test
 	public void relativeUrls() throws Exception {
-		assertThat(UriComponentsBuilder.fromUriString("http://example.com/foo/../bar").build().toString(), equalTo("http://example.com/foo/../bar"));
-		assertThat(UriComponentsBuilder.fromUriString("http://example.com/foo/../bar").build().toUriString(), equalTo("http://example.com/foo/../bar"));
-		assertThat(UriComponentsBuilder.fromUriString("http://example.com/foo/../bar").build().toUri().getPath(), equalTo("/foo/../bar"));
+		assertThat(UriComponentsBuilder.fromUriString("https://example.com/foo/../bar").build().toString(), equalTo("https://example.com/foo/../bar"));
+		assertThat(UriComponentsBuilder.fromUriString("https://example.com/foo/../bar").build().toUriString(), equalTo("https://example.com/foo/../bar"));
+		assertThat(UriComponentsBuilder.fromUriString("https://example.com/foo/../bar").build().toUri().getPath(), equalTo("/foo/../bar"));
 		assertThat(UriComponentsBuilder.fromUriString("../../").build().toString(), equalTo("../../"));
 		assertThat(UriComponentsBuilder.fromUriString("../../").build().toUriString(), equalTo("../../"));
 		assertThat(UriComponentsBuilder.fromUriString("../../").build().toUri().getPath(), equalTo("../../"));
-		assertThat(UriComponentsBuilder.fromUriString("http://example.com").path("foo/../bar").build().toString(), equalTo("http://example.com/foo/../bar"));
-		assertThat(UriComponentsBuilder.fromUriString("http://example.com").path("foo/../bar").build().toUriString(), equalTo("http://example.com/foo/../bar"));
-		assertThat(UriComponentsBuilder.fromUriString("http://example.com").path("foo/../bar").build().toUri().getPath(), equalTo("/foo/../bar"));
+		assertThat(UriComponentsBuilder.fromUriString("https://example.com").path("foo/../bar").build().toString(), equalTo("https://example.com/foo/../bar"));
+		assertThat(UriComponentsBuilder.fromUriString("https://example.com").path("foo/../bar").build().toUriString(), equalTo("https://example.com/foo/../bar"));
+		assertThat(UriComponentsBuilder.fromUriString("https://example.com").path("foo/../bar").build().toUri().getPath(), equalTo("/foo/../bar"));
 	}
 
 	@Test
 	public void emptySegments() throws Exception {
-		assertThat(UriComponentsBuilder.fromUriString("http://example.com/abc/").path("/x/y/z").build().toString(), equalTo("http://example.com/abc/x/y/z"));
-	    assertThat(UriComponentsBuilder.fromUriString("http://example.com/abc/").pathSegment("x", "y", "z").build().toString(), equalTo("http://example.com/abc/x/y/z"));
-		assertThat(UriComponentsBuilder.fromUriString("http://example.com/abc/").path("/x/").path("/y/z").build().toString(), equalTo("http://example.com/abc/x/y/z"));
-		assertThat(UriComponentsBuilder.fromUriString("http://example.com/abc/").pathSegment("x").path("y").build().toString(), equalTo("http://example.com/abc/x/y"));
+		assertThat(UriComponentsBuilder.fromUriString("https://example.com/abc/").path("/x/y/z").build().toString(), equalTo("https://example.com/abc/x/y/z"));
+	    assertThat(UriComponentsBuilder.fromUriString("https://example.com/abc/").pathSegment("x", "y", "z").build().toString(), equalTo("https://example.com/abc/x/y/z"));
+		assertThat(UriComponentsBuilder.fromUriString("https://example.com/abc/").path("/x/").path("/y/z").build().toString(), equalTo("https://example.com/abc/x/y/z"));
+		assertThat(UriComponentsBuilder.fromUriString("https://example.com/abc/").pathSegment("x").path("y").build().toString(), equalTo("https://example.com/abc/x/y"));
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
index 5fc269208a1..a5d75571b19 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
@@ -45,23 +45,23 @@ public class UriComponentsTests {
 
 	@Test
 	public void toUriEncoded() throws URISyntaxException {
-		UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build();
+		UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/hotel list/Z\u00fcrich").build();
 		UriComponents encoded = uriComponents.encode();
-		assertEquals(new URI("http://example.com/hotel%20list/Z%C3%BCrich"), encoded.toUri());
+		assertEquals(new URI("https://example.com/hotel%20list/Z%C3%BCrich"), encoded.toUri());
 	}
 
 	@Test
 	public void toUriNotEncoded() throws URISyntaxException {
-		UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build();
-		assertEquals(new URI("http://example.com/hotel%20list/Z\u00fcrich"), uriComponents.toUri());
+		UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/hotel list/Z\u00fcrich").build();
+		assertEquals(new URI("https://example.com/hotel%20list/Z\u00fcrich"), uriComponents.toUri());
 	}
 
 	@Test
 	public void expand() {
-		UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com").path("/{foo} {bar}").build();
+		UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com").path("/{foo} {bar}").build();
 		uriComponents = uriComponents.expand("1 2", "3 4");
 		assertEquals("/1 2 3 4", uriComponents.getPath());
-		assertEquals("http://example.com/1 2 3 4", uriComponents.toUriString());
+		assertEquals("https://example.com/1 2 3 4", uriComponents.toUriString());
 	}
 
 	@Test(expected = IllegalStateException.class)
@@ -81,14 +81,14 @@ public class UriComponentsTests {
 
 	@Test
 	public void normalize() {
-		UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/foo/../bar").build();
-		assertEquals("http://example.com/bar", uriComponents.normalize().toString());
+		UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo/../bar").build();
+		assertEquals("https://example.com/bar", uriComponents.normalize().toString());
 	}
 
 	@Test
 	public void serializable() throws Exception {
 		UriComponents uriComponents = UriComponentsBuilder.fromUriString(
-				"http://example.com").path("/{foo}").query("bar={baz}").build();
+				"https://example.com").path("/{foo}").query("bar={baz}").build();
 		ByteArrayOutputStream bos = new ByteArrayOutputStream();
 		ObjectOutputStream oos = new ObjectOutputStream(bos);
 		oos.writeObject(uriComponents);
@@ -99,9 +99,9 @@ public class UriComponentsTests {
 
 	@Test
 	public void equalsHierarchicalUriComponents() throws Exception {
-		UriComponents uriComponents1 = UriComponentsBuilder.fromUriString("http://example.com").path("/{foo}").query("bar={baz}").build();
-		UriComponents uriComponents2 = UriComponentsBuilder.fromUriString("http://example.com").path("/{foo}").query("bar={baz}").build();
-		UriComponents uriComponents3 = UriComponentsBuilder.fromUriString("http://example.com").path("/{foo}").query("bin={baz}").build();
+		UriComponents uriComponents1 = UriComponentsBuilder.fromUriString("https://example.com").path("/{foo}").query("bar={baz}").build();
+		UriComponents uriComponents2 = UriComponentsBuilder.fromUriString("https://example.com").path("/{foo}").query("bar={baz}").build();
+		UriComponents uriComponents3 = UriComponentsBuilder.fromUriString("https://example.com").path("/{foo}").query("bin={baz}").build();
 		assertThat(uriComponents1, instanceOf(HierarchicalUriComponents.class));
 		assertThat(uriComponents1, equalTo(uriComponents1));
 		assertThat(uriComponents1, equalTo(uriComponents2));
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
index e23b82a5151..82211d7bcd0 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
@@ -35,21 +35,21 @@ public class UriTemplateTests {
 
 	@Test
 	public void getVariableNames() throws Exception {
-		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+		UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
 		List variableNames = template.getVariableNames();
 		assertEquals("Invalid variable names", Arrays.asList("hotel", "booking"), variableNames);
 	}
 
 	@Test
 	public void expandVarArgs() throws Exception {
-		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+		UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
 		URI result = template.expand("1", "42");
-		assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
+		assertEquals("Invalid expanded template", new URI("https://example.com/hotels/1/bookings/42"), result);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void expandVarArgsNotEnoughVariables() throws Exception {
-		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+		UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
 		template.expand("1");
 	}
 
@@ -58,9 +58,9 @@ public class UriTemplateTests {
 		Map uriVariables = new HashMap(2);
 		uriVariables.put("booking", "42");
 		uriVariables.put("hotel", "1");
-		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+		UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
 		URI result = template.expand(uriVariables);
-		assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
+		assertEquals("Invalid expanded template", new URI("https://example.com/hotels/1/bookings/42"), result);
 	}
 
 	@Test
@@ -76,17 +76,17 @@ public class UriTemplateTests {
 		Map uriVariables = new HashMap(2);
 		uriVariables.put("booking", 42);
 		uriVariables.put("hotel", 1);
-		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+		UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
 		URI result = template.expand(uriVariables);
-		assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
+		assertEquals("Invalid expanded template", new URI("https://example.com/hotels/1/bookings/42"), result);
 	}
 
 	@Test
 	public void expandMapEncoded() throws Exception {
 		Map uriVariables = Collections.singletonMap("hotel", "Z\u00fcrich");
-		UriTemplate template = new UriTemplate("http://example.com/hotel list/{hotel}");
+		UriTemplate template = new UriTemplate("https://example.com/hotel list/{hotel}");
 		URI result = template.expand(uriVariables);
-		assertEquals("Invalid expanded template", new URI("http://example.com/hotel%20list/Z%C3%BCrich"), result);
+		assertEquals("Invalid expanded template", new URI("https://example.com/hotel%20list/Z%C3%BCrich"), result);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
@@ -94,31 +94,31 @@ public class UriTemplateTests {
 		Map uriVariables = new HashMap(2);
 		uriVariables.put("booking", "42");
 		uriVariables.put("bar", "1");
-		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+		UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
 		template.expand(uriVariables);
 	}
 
 	@Test
 	public void expandEncoded() throws Exception {
-		UriTemplate template = new UriTemplate("http://example.com/hotel list/{hotel}");
+		UriTemplate template = new UriTemplate("https://example.com/hotel list/{hotel}");
 		URI result = template.expand("Z\u00fcrich");
-		assertEquals("Invalid expanded template", new URI("http://example.com/hotel%20list/Z%C3%BCrich"), result);
+		assertEquals("Invalid expanded template", new URI("https://example.com/hotel%20list/Z%C3%BCrich"), result);
 	}
 
 	@Test
 	public void matches() throws Exception {
-		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
-		assertTrue("UriTemplate does not match", template.matches("http://example.com/hotels/1/bookings/42"));
-		assertFalse("UriTemplate matches", template.matches("http://example.com/hotels/bookings"));
+		UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
+		assertTrue("UriTemplate does not match", template.matches("https://example.com/hotels/1/bookings/42"));
+		assertFalse("UriTemplate matches", template.matches("https://example.com/hotels/bookings"));
 		assertFalse("UriTemplate matches", template.matches(""));
 		assertFalse("UriTemplate matches", template.matches(null));
 	}
 
 	@Test
 	public void matchesCustomRegex() throws Exception {
-		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel:\\d+}");
-		assertTrue("UriTemplate does not match", template.matches("http://example.com/hotels/42"));
-		assertFalse("UriTemplate matches", template.matches("http://example.com/hotels/foo"));
+		UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel:\\d+}");
+		assertTrue("UriTemplate does not match", template.matches("https://example.com/hotels/42"));
+		assertFalse("UriTemplate matches", template.matches("https://example.com/hotels/foo"));
 	}
 
 	@Test
@@ -127,8 +127,8 @@ public class UriTemplateTests {
 		expected.put("booking", "42");
 		expected.put("hotel", "1");
 
-		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
-		Map result = template.match("http://example.com/hotels/1/bookings/42");
+		UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
+		Map result = template.match("https://example.com/hotels/1/bookings/42");
 		assertEquals("Invalid match", expected, result);
 	}
 
@@ -138,8 +138,8 @@ public class UriTemplateTests {
 		expected.put("booking", "42");
 		expected.put("hotel", "1");
 
-		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel:\\d}/bookings/{booking:\\d+}");
-		Map result = template.match("http://example.com/hotels/1/bookings/42");
+		UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel:\\d}/bookings/{booking:\\d+}");
+		Map result = template.match("https://example.com/hotels/1/bookings/42");
 		assertEquals("Invalid match", expected, result);
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
index 368cf386ab9..5a795d847b2 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
@@ -108,53 +108,53 @@ public class UriUtilsTests {
 	@Test
 	@Deprecated
 	public void encodeUri() throws UnsupportedEncodingException {
-		assertEquals("Invalid encoded URI", "http://www.ietf.org/rfc/rfc3986.txt",
-				UriUtils.encodeUri("http://www.ietf.org/rfc/rfc3986.txt", ENC));
 		assertEquals("Invalid encoded URI", "https://www.ietf.org/rfc/rfc3986.txt",
 				UriUtils.encodeUri("https://www.ietf.org/rfc/rfc3986.txt", ENC));
-		assertEquals("Invalid encoded URI", "http://www.google.com/?q=Z%C3%BCrich",
-				UriUtils.encodeUri("http://www.google.com/?q=Z\u00fcrich", ENC));
+		assertEquals("Invalid encoded URI", "https://www.ietf.org/rfc/rfc3986.txt",
+				UriUtils.encodeUri("https://www.ietf.org/rfc/rfc3986.txt", ENC));
+		assertEquals("Invalid encoded URI", "https://www.google.com/?q=Z%C3%BCrich",
+				UriUtils.encodeUri("https://www.google.com/?q=Z\u00fcrich", ENC));
 		assertEquals("Invalid encoded URI",
-				"http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)",
+				"https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)",
 				UriUtils.encodeUri(
-						"http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)",
+						"https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)",
 						ENC));
-		assertEquals("Invalid encoded URI", "http://java.sun.com/j2se/1.3/",
-				UriUtils.encodeUri("http://java.sun.com/j2se/1.3/", ENC));
+		assertEquals("Invalid encoded URI", "https://java.sun.com/j2se/1.3/",
+				UriUtils.encodeUri("https://java.sun.com/j2se/1.3/", ENC));
 		assertEquals("Invalid encoded URI", "docs/guide/collections/designfaq.html#28",
 				UriUtils.encodeUri("docs/guide/collections/designfaq.html#28", ENC));
 		assertEquals("Invalid encoded URI", "../../../demo/jfc/SwingSet2/src/SwingSet2.java",
 				UriUtils.encodeUri("../../../demo/jfc/SwingSet2/src/SwingSet2.java", ENC));
 		assertEquals("Invalid encoded URI", "file:///~/calendar", UriUtils.encodeUri("file:///~/calendar", ENC));
-		assertEquals("Invalid encoded URI", "http://example.com/query=foo@bar",
-				UriUtils.encodeUri("http://example.com/query=foo@bar", ENC));
+		assertEquals("Invalid encoded URI", "https://example.com/query=foo@bar",
+				UriUtils.encodeUri("https://example.com/query=foo@bar", ENC));
 
 		// SPR-8974
-		assertEquals("http://example.org?format=json&url=http://another.com?foo=bar",
-				UriUtils.encodeUri("http://example.org?format=json&url=http://another.com?foo=bar", ENC));
+		assertEquals("https://example.org?format=json&url=http://another.com?foo=bar",
+				UriUtils.encodeUri("https://example.org?format=json&url=http://another.com?foo=bar", ENC));
 	}
 
 	@Test
 	@Deprecated
 	public void encodeHttpUrl() throws UnsupportedEncodingException {
-		assertEquals("Invalid encoded HTTP URL", "http://www.ietf.org/rfc/rfc3986.txt",
-				UriUtils.encodeHttpUrl("http://www.ietf.org/rfc/rfc3986.txt", ENC));
+		assertEquals("Invalid encoded HTTP URL", "https://www.ietf.org/rfc/rfc3986.txt",
+				UriUtils.encodeHttpUrl("https://www.ietf.org/rfc/rfc3986.txt", ENC));
 		assertEquals("Invalid encoded URI", "https://www.ietf.org/rfc/rfc3986.txt",
 				UriUtils.encodeHttpUrl("https://www.ietf.org/rfc/rfc3986.txt", ENC));
-		assertEquals("Invalid encoded HTTP URL", "http://www.google.com/?q=Z%C3%BCrich",
-				UriUtils.encodeHttpUrl("http://www.google.com/?q=Z\u00fcrich", ENC));
-		assertEquals("Invalid encoded HTTP URL", "http://ws.geonames.org/searchJSON?q=T%C5%8Dky%C5%8D&style=FULL&maxRows=300",
-				UriUtils.encodeHttpUrl("http://ws.geonames.org/searchJSON?q=T\u014dky\u014d&style=FULL&maxRows=300", ENC));
+		assertEquals("Invalid encoded HTTP URL", "https://www.google.com/?q=Z%C3%BCrich",
+				UriUtils.encodeHttpUrl("https://www.google.com/?q=Z\u00fcrich", ENC));
+		assertEquals("Invalid encoded HTTP URL", "https://ws.geonames.org/searchJSON?q=T%C5%8Dky%C5%8D&style=FULL&maxRows=300",
+				UriUtils.encodeHttpUrl("https://ws.geonames.org/searchJSON?q=T\u014dky\u014d&style=FULL&maxRows=300", ENC));
 		assertEquals("Invalid encoded HTTP URL",
-				"http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar",
+				"https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar",
 				UriUtils.encodeHttpUrl(
-						"http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar", ENC));
-		assertEquals("Invalid encoded HTTP URL", "http://search.twitter.com/search.atom?q=%23avatar",
-				UriUtils.encodeHttpUrl("http://search.twitter.com/search.atom?q=#avatar", ENC));
-		assertEquals("Invalid encoded HTTP URL", "http://java.sun.com/j2se/1.3/",
-				UriUtils.encodeHttpUrl("http://java.sun.com/j2se/1.3/", ENC));
-		assertEquals("Invalid encoded HTTP URL", "http://example.com/query=foo@bar",
-				UriUtils.encodeHttpUrl("http://example.com/query=foo@bar", ENC));
+						"https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar", ENC));
+		assertEquals("Invalid encoded HTTP URL", "https://search.twitter.com/search.atom?q=%23avatar",
+				UriUtils.encodeHttpUrl("https://search.twitter.com/search.atom?q=#avatar", ENC));
+		assertEquals("Invalid encoded HTTP URL", "https://java.sun.com/j2se/1.3/",
+				UriUtils.encodeHttpUrl("https://java.sun.com/j2se/1.3/", ENC));
+		assertEquals("Invalid encoded HTTP URL", "https://example.com/query=foo@bar",
+				UriUtils.encodeHttpUrl("https://example.com/query=foo@bar", ENC));
 	}
 
 	@Test(expected = IllegalArgumentException.class)
diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 1f80c610312..4dfcbffe904 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -155,7 +155,7 @@ public class UrlPathHelperTests {
 
 	//
 	// Suite of tests root requests for default servlets (SRV 11.2) on WebSphere vs Tomcat and other containers
-	// See: http://jira.springframework.org/browse/SPR-7064
+	// See: https://jira.springframework.org/browse/SPR-7064
 	//
 
 	//
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
index 761ca9439fa..a8255bc452c 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
@@ -36,7 +36,7 @@ import org.springframework.web.portlet.util.PortletUtils;
 
 /**
  * {@link PortletMultipartResolver} implementation for
- * Jakarta Commons FileUpload
+ * Jakarta Commons FileUpload
  * 1.2 or above.
  *
  * 
    Provides "maxUploadSize", "maxInMemorySize" and "defaultEncoding" settings as
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
index 8d7b70c2fff..45e655bd465 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
@@ -22,7 +22,7 @@ import org.springframework.web.multipart.MultipartException;
 
 /**
  * Portlet version of Spring's multipart resolution strategy for file uploads
- * as defined in RFC 1867.
+ * as defined in RFC 1867.
  *
  * 
    Implementations are typically usable both within any application context
  * and standalone.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/package-info.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/package-info.java
index 1b260618f15..44aa19f29fb 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/package-info.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/package-info.java
@@ -4,7 +4,7 @@
  * Useful for testing web contexts and controllers.
  *
  * 
    More convenient to use than dynamic mock objects
- * (EasyMock) or
+ * (EasyMock) or
  * existing Portlet API mock objects.
  */
 
diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
index ba8e54a1213..900972c7815 100644
--- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
+++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
@@ -69,7 +69,7 @@ import org.springframework.web.context.ServletContextAware;
 
 /**
  * Helper class to configure Tiles 3.x for the Spring Framework. See
- * http://tiles.apache.org
+ * https://tiles.apache.org
  * for more information about Tiles, which basically is a templating mechanism
  * for web applications using JSPs and other template engines.
  *
diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
index 52c94c61fa2..aa6216c071c 100644
--- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
+++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Support classes for the integration of
- * Tiles3
+ * Tiles3
  * (the standalone version of Tiles) as Spring web view technology.
  * Contains a View implementation for Tiles definitions.
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
index ebadd490d6a..4ad8c4d9542 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
@@ -28,7 +28,7 @@ import org.springframework.http.MediaType;
  * content, and exposing the model. A single view exposes multiple model attributes.
  *
  * 
    This class and the MVC approach associated with it is discussed in Chapter 12 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
  * by Rod Johnson (Wrox, 2002).
  *
  * 
    View implementations may differ widely. An obvious implementation would be
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
index bbcb35e1934..c66569cf138 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
@@ -213,7 +213,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 
 	/**
 	 * Prevents the response from being cached, through setting corresponding
-	 * HTTP headers. See {@code http://www.mnot.net/cache_docs}.
+	 * HTTP headers. See {@code https://www.mnot.net/cache_docs}.
 	 * @param response current HTTP response
 	 */
 	protected void preventCaching(HttpServletResponse response) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
index 0b49383d8e3..bf61196b3f0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
@@ -228,7 +228,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * submitted.
 	 * 
    If you need to have per-form, per-session state management (that is,
 	 * stateful web conversations), the recommendation is to use
-	 * Spring WebFlow,
+	 * Spring WebFlow,
 	 * which has full support for conversations and has a much more flexible
 	 * usage model overall.
 	 * @param sessionForm {@code true} if session form mode is to be activated
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
index 117cbb726ed..217c1fd7635 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
@@ -6,7 +6,7 @@
  * Spring web MVC framework.
  *
  * 
    This package and related packages are discussed in Chapters 12 and 13 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
  * by Rod Johnson (Wrox, 2002).
  *
  */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
index 759820dd539..e5823bc75b3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
@@ -287,7 +287,7 @@ public abstract class WebContentGenerator extends WebApplicationObjectSupport {
 
 	/**
 	 * Prevent the response from being cached.
-	 * See {@code http://www.mnot.net/cache_docs}.
+	 * See {@code https://www.mnot.net/cache_docs}.
 	 */
 	protected final void preventCaching(HttpServletResponse response) {
 		response.setHeader(HEADER_PRAGMA, "no-cache");
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
index 711f77b35fa..549e02f8f28 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
@@ -51,7 +51,7 @@ import org.springframework.web.servlet.view.AbstractView;
  * 
  *
  * 
    For working with the workbook in the subclass, see
- * Apache's POI site
+ * Apache's POI site
  *
  * 
    As an example, you can try this snippet:
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
index 073d4bbb197..c21394cc6ce 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
@@ -31,7 +31,7 @@ import org.springframework.web.servlet.view.AbstractView;
 
 /**
  * Abstract superclass for PDF views, using Bruno Lowagie's
- * iText package.
+ * iText package.
  * Application-specific view classes will extend this class.
  * The view will be held in the subclass itself, not in a template.
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
index e552711f82c..944d888cd4f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
@@ -39,7 +39,7 @@ import com.sun.syndication.feed.atom.Feed;
  * @since 3.0
  * @see #buildFeedMetadata
  * @see #buildFeedEntries
- * @see Atom Syndication Format
+ * @see Atom Syndication Format
  */
 public abstract class AbstractAtomFeedView extends AbstractFeedView {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
index 900b137ad85..5f064248d9c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Support classes for the integration of
- * FreeMarker
+ * FreeMarker
  * as Spring web view technology.
  * Contains a View implementation for FreeMarker templates.
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
index 1242e3c1394..d6c32f678d3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
@@ -39,7 +39,7 @@ import org.springframework.web.servlet.view.AbstractView;
 
 /**
  * Spring MVC {@link View} that renders JSON content by serializing the model for the current request
- * using Jackson 2's {@link ObjectMapper}.
+ * using Jackson 2's {@link ObjectMapper}.
  *
  * 
    By default, the entire contents of the model map (with the exception of framework-specific classes)
  * will be encoded as JSON. If the model contains only one key, you can have it extracted encoded as JSON
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
index 16a20415466..ad47c73d684 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
@@ -39,7 +39,7 @@ import org.springframework.web.servlet.view.AbstractView;
 
 /**
  * Spring MVC {@link View} that renders JSON content by serializing the model for the current request
- * using Jackson 1.x's {@link ObjectMapper}.
+ * using Jackson 1.x's {@link ObjectMapper}.
  *
  * 
    By default, the entire contents of the model map (with the exception of framework-specific classes)
  * will be encoded as JSON. If the model contains only one key, you can have it extracted encoded as JSON
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
index 7b6e0834333..c993387ecbe 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
@@ -74,7 +74,7 @@ import org.springframework.web.context.ServletContextAware;
 
 /**
  * Helper class to configure Tiles 2.x for the Spring Framework. See
- * http://tiles.apache.org
+ * https://tiles.apache.org
  * for more information about Tiles, which basically is a templating
  * mechanism for JSP-based web applications.
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java
index eb695f01c49..f73832f5b89 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Support classes for the integration of
- * Tiles2
+ * Tiles2
  * (the standalone version of Tiles) as Spring web view technology.
  * Contains a View implementation for Tiles definitions.
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java
index 8541cb13bb3..fbcdca97b73 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Support classes for the integration of
- * Velocity
+ * Velocity
  * as Spring web view technology.
  * Contains a View implementation for Velocity templates.
  *
diff --git a/spring-webmvc/src/main/resources/META-INF/spring-form.tld b/spring-webmvc/src/main/resources/META-INF/spring-form.tld
index e5ad6eb0be2..3ca37f22715 100644
--- a/spring-webmvc/src/main/resources/META-INF/spring-form.tld
+++ b/spring-webmvc/src/main/resources/META-INF/spring-form.tld
@@ -1,7 +1,7 @@
 
 
 
 	Spring Framework JSP Form Tag Library
diff --git a/spring-webmvc/src/main/resources/META-INF/spring.tld b/spring-webmvc/src/main/resources/META-INF/spring.tld
index a0a8c6f7fc7..92a0238644c 100644
--- a/spring-webmvc/src/main/resources/META-INF/spring.tld
+++ b/spring-webmvc/src/main/resources/META-INF/spring.tld
@@ -1,7 +1,7 @@
 
 
 
 	Spring Framework JSP Tag Library
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
index f97d3b331a3..7dab51d069c 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
@@ -5,8 +5,8 @@
 	targetNamespace="http://www.springframework.org/schema/mvc"
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd
index 8fc5f378193..adafa2c245b 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd
@@ -6,8 +6,8 @@
 	targetNamespace="http://www.springframework.org/schema/mvc"
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
index 2fab173ab62..1eb7169fc62 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
@@ -6,8 +6,8 @@
 	targetNamespace="http://www.springframework.org/schema/mvc"
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
-	
-	
+	
+	
 
 	
 		
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
index e303a77b3ce..d272c28c5c2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
@@ -86,7 +86,7 @@ public final class ContextLoaderTests {
 
 	/**
 	 * Addresses the issues raised in SPR-4008: Supply an opportunity to customize
 	 * context before calling refresh in ContextLoaders.
 	 */
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java
index 1d04321377b..d895ca97ec8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java
@@ -150,7 +150,7 @@ public class UrlFilenameViewControllerTests extends TestCase {
 
 	/**
 	 * This is the expected behavior, and it now has a test to prove it.
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2789
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2789
 	 */
 	public void testNestedPathisUsedAsViewName_InBreakingChangeFromSpring12Line() throws Exception {
 		UrlFilenameViewController ctrl = new UrlFilenameViewController();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
index 98e648f525f..e235a68d072 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
@@ -434,14 +434,14 @@ public class UrlTagTests extends AbstractTagTests {
 	}
 
 	public void testCreateUrlRemoteServer() throws JspException {
-		tag.setValue("http://www.springframework.org/");
+		tag.setValue("https://www.springframework.org/");
 
 		tag.doStartTag();
 
 		// String uri = tag.createUrl();
 		String uri = invokeCreateUrl(tag);
 
-		assertEquals("http://www.springframework.org/", uri);
+		assertEquals("https://www.springframework.org/", uri);
 	}
 
 	public void testCreateUrlRelative() throws JspException {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
index 2d4b9979b3f..e5158ec40a8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
@@ -339,7 +339,7 @@ public class ErrorsTagTests extends AbstractFormTagTests {
 	}
 
 	/**
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2788
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2788
 	 */
 	public void testAsBodyTagWithErrorsAndExistingMessagesAttributeInNonPageScopeAreNotClobbered() throws Exception {
 		String existingAttribute = "something";
@@ -362,35 +362,35 @@ public class ErrorsTagTests extends AbstractFormTagTests {
 	}
 
 	/**
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2788
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2788
 	 */
 	public void testAsBodyTagWithNoErrorsAndExistingMessagesAttributeInApplicationScopeAreNotClobbered() throws Exception {
 		assertWhenNoErrorsExistingMessagesInScopeAreNotClobbered(PageContext.APPLICATION_SCOPE);
 	}
 
 	/**
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2788
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2788
 	 */
 	public void testAsBodyTagWithNoErrorsAndExistingMessagesAttributeInSessionScopeAreNotClobbered() throws Exception {
 		assertWhenNoErrorsExistingMessagesInScopeAreNotClobbered(PageContext.SESSION_SCOPE);
 	}
 
 	/**
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2788
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2788
 	 */
 	public void testAsBodyTagWithNoErrorsAndExistingMessagesAttributeInPageScopeAreNotClobbered() throws Exception {
 		assertWhenNoErrorsExistingMessagesInScopeAreNotClobbered(PageContext.PAGE_SCOPE);
 	}
 
 	/**
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2788
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2788
 	 */
 	public void testAsBodyTagWithNoErrorsAndExistingMessagesAttributeInRequestScopeAreNotClobbered() throws Exception {
 		assertWhenNoErrorsExistingMessagesInScopeAreNotClobbered(PageContext.REQUEST_SCOPE);
 	}
 
 	/**
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-4005
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-4005
 	 */
 	public void testOmittedPathMatchesObjectErrorsOnly() throws Exception {
 		this.tag.setPath(null);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
index 1c7ac2af59b..b650fe16d54 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
@@ -221,7 +221,7 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
 	}
 
 	/*
-	 * See http://opensource.atlassian.com/projects/spring/browse/SPR-2645
+	 * See https://opensource.atlassian.com/projects/spring/browse/SPR-2645
 	 */
 	public void testXSSScriptingExploitWhenActionIsResolvedFromQueryString() throws Exception {
 		String xssQueryString = QUERY_STRING + "&stuff=\">";
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
index 86f21a06011..d28205838da 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
@@ -310,7 +310,7 @@ public class InputTagTests extends AbstractFormTagTests {
 	}
 
 	/**
-	 * See SPR-3127 (http://opensource.atlassian.com/projects/spring/browse/SPR-3127)
+	 * See SPR-3127 (https://opensource.atlassian.com/projects/spring/browse/SPR-3127)
 	 */
 	public void testReadOnlyAttributeRenderingWhenReadonlyIsTrue() throws Exception {
 		this.tag.setPath("name");
@@ -328,7 +328,7 @@ public class InputTagTests extends AbstractFormTagTests {
 	}
 
 	/**
-	 * See SPR-3127 (http://opensource.atlassian.com/projects/spring/browse/SPR-3127)
+	 * See SPR-3127 (https://opensource.atlassian.com/projects/spring/browse/SPR-3127)
 	 */
 	public void testReadOnlyAttributeRenderingWhenReadonlyIsFalse() throws Exception {
 		this.tag.setPath("name");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
index 5bdea9f8ed5..1f628a81a78 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
@@ -29,7 +29,7 @@ import javax.servlet.jsp.tagext.Tag;
 public class PasswordInputTagTests extends InputTagTests {
 
 	/*
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2866
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2866
 	 */
 	public void testPasswordValueIsNotRenderedByDefault() throws Exception {
 		this.getTag().setPath("name");
@@ -45,7 +45,7 @@ public class PasswordInputTagTests extends InputTagTests {
 	}
 
 	/*
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2866
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2866
 	 */
 	public void testPasswordValueIsRenderedIfShowPasswordAttributeIsSetToTrue() throws Exception {
 		this.getTag().setPath("name");
@@ -62,7 +62,7 @@ public class PasswordInputTagTests extends InputTagTests {
 	}
 
 	/*
-	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2866
+	 * https://opensource.atlassian.com/projects/spring/browse/SPR-2866
 	 */
 	public void testPasswordValueIsNotRenderedIfShowPasswordAttributeIsSetToFalse() throws Exception {
 		this.getTag().setPath("name");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
index c9aea6964ba..edb460c76c4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
@@ -650,7 +650,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 
 	/**
 	 * Tests new support added as a result of SPR-2660.
 	 * 
    
 	 * Specifically, if the {@code items} attribute is supplied a
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
index 88f6d700cd1..84c88acadc6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
@@ -68,7 +68,7 @@ public class RedirectViewTests {
 	@Test
 	public void http11() throws Exception {
 		RedirectView rv = new RedirectView();
-		rv.setUrl("http://url.somewhere.com");
+		rv.setUrl("https://url.somewhere.com");
 		rv.setHttp10Compatible(false);
 		MockHttpServletRequest request = createRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
@@ -76,7 +76,7 @@ public class RedirectViewTests {
 		request.setAttribute(DispatcherServlet.FLASH_MAP_MANAGER_ATTRIBUTE, new SessionFlashMapManager());
 		rv.render(new HashMap(), request, response);
 		assertEquals(303, response.getStatus());
-		assertEquals("http://url.somewhere.com", response.getHeader("Location"));
+		assertEquals("https://url.somewhere.com", response.getHeader("Location"));
 	}
 
 	private MockHttpServletRequest createRequest() {
@@ -89,45 +89,45 @@ public class RedirectViewTests {
 	@Test
 	public void explicitStatusCodeHttp11() throws Exception {
 		RedirectView rv = new RedirectView();
-		rv.setUrl("http://url.somewhere.com");
+		rv.setUrl("https://url.somewhere.com");
 		rv.setHttp10Compatible(false);
 		rv.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
 		MockHttpServletRequest request = createRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		rv.render(new HashMap(), request, response);
 		assertEquals(301, response.getStatus());
-		assertEquals("http://url.somewhere.com", response.getHeader("Location"));
+		assertEquals("https://url.somewhere.com", response.getHeader("Location"));
 	}
 
 	@Test
 	public void explicitStatusCodeHttp10() throws Exception {
 		RedirectView rv = new RedirectView();
-		rv.setUrl("http://url.somewhere.com");
+		rv.setUrl("https://url.somewhere.com");
 		rv.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
 		MockHttpServletRequest request = createRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		rv.render(new HashMap(), request, response);
 		assertEquals(301, response.getStatus());
-		assertEquals("http://url.somewhere.com", response.getHeader("Location"));
+		assertEquals("https://url.somewhere.com", response.getHeader("Location"));
 	}
 
 	@Test
 	public void attributeStatusCodeHttp11() throws Exception {
 		RedirectView rv = new RedirectView();
-		rv.setUrl("http://url.somewhere.com");
+		rv.setUrl("https://url.somewhere.com");
 		rv.setHttp10Compatible(false);
 		MockHttpServletRequest request = createRequest();
 		request.setAttribute(View.RESPONSE_STATUS_ATTRIBUTE, HttpStatus.CREATED);
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		rv.render(new HashMap(), request, response);
 		assertEquals(201, response.getStatus());
-		assertEquals("http://url.somewhere.com", response.getHeader("Location"));
+		assertEquals("https://url.somewhere.com", response.getHeader("Location"));
 	}
 
 	@Test
 	public void flashMap() throws Exception {
 		RedirectView rv = new RedirectView();
-		rv.setUrl("http://url.somewhere.com/path");
+		rv.setUrl("https://url.somewhere.com/path");
 		rv.setHttp10Compatible(false);
 		MockHttpServletRequest request = createRequest();
 		HttpServletResponse response = new MockHttpServletResponse();
@@ -137,7 +137,7 @@ public class RedirectViewTests {
 		ModelMap model = new ModelMap("id", "1");
 		rv.render(model, request, response);
 		assertEquals(303, response.getStatus());
-		assertEquals("http://url.somewhere.com/path?id=1", response.getHeader("Location"));
+		assertEquals("https://url.somewhere.com/path?id=1", response.getHeader("Location"));
 
 		assertEquals("/path", flashMap.getTargetRequestPath());
 		assertEquals(model, flashMap.getTargetRequestParams().toSingleValueMap());
@@ -213,7 +213,7 @@ public class RedirectViewTests {
 
 	@Test
 	public void singleParam() throws Exception {
-		String url = "http://url.somewhere.com";
+		String url = "https://url.somewhere.com";
 		String key = "foo";
 		String val = "bar";
 		Map model = new HashMap();
@@ -224,7 +224,7 @@ public class RedirectViewTests {
 
 	@Test
 	public void singleParamWithoutExposingModelAttributes() throws Exception {
-		String url = "http://url.somewhere.com";
+		String url = "https://url.somewhere.com";
 		String key = "foo";
 		String val = "bar";
 		Map model = new HashMap();
@@ -235,12 +235,12 @@ public class RedirectViewTests {
 
 	@Test
 	public void paramWithAnchor() throws Exception {
-		String url = "http://url.somewhere.com/test.htm#myAnchor";
+		String url = "https://url.somewhere.com/test.htm#myAnchor";
 		String key = "foo";
 		String val = "bar";
 		Map model = new HashMap();
 		model.put(key, val);
-		String expectedUrlForEncoding = "http://url.somewhere.com/test.htm" + "?" + key + "=" + val + "#myAnchor";
+		String expectedUrlForEncoding = "https://url.somewhere.com/test.htm" + "?" + key + "=" + val + "#myAnchor";
 		doTest(model, url, false, expectedUrlForEncoding);
 	}
 
@@ -252,7 +252,7 @@ public class RedirectViewTests {
 
 	@Test
 	public void twoParams() throws Exception {
-		String url = "http://url.somewhere.com";
+		String url = "https://url.somewhere.com";
 		String key = "foo";
 		String val = "bar";
 		String key2 = "thisIsKey2";
@@ -261,37 +261,37 @@ public class RedirectViewTests {
 		model.put(key, val);
 		model.put(key2, val2);
 		try {
-			String expectedUrlForEncoding = "http://url.somewhere.com?" + key + "=" + val + "&" + key2 + "=" + val2;
+			String expectedUrlForEncoding = "https://url.somewhere.com?" + key + "=" + val + "&" + key2 + "=" + val2;
 			doTest(model, url, false, expectedUrlForEncoding);
 		}
 		catch (AssertionFailedError err) {
 			// OK, so it's the other order... probably on Sun JDK 1.6 or IBM JDK 1.5
-			String expectedUrlForEncoding = "http://url.somewhere.com?" + key2 + "=" + val2 + "&" + key + "=" + val;
+			String expectedUrlForEncoding = "https://url.somewhere.com?" + key2 + "=" + val2 + "&" + key + "=" + val;
 			doTest(model, url, false, expectedUrlForEncoding);
 		}
 	}
 
 	@Test
 	public void arrayParam() throws Exception {
-		String url = "http://url.somewhere.com";
+		String url = "https://url.somewhere.com";
 		String key = "foo";
 		String[] val = new String[] {"bar", "baz"};
 		Map model = new HashMap();
 		model.put(key, val);
 		try {
-			String expectedUrlForEncoding = "http://url.somewhere.com?" + key + "=" + val[0] + "&" + key + "=" + val[1];
+			String expectedUrlForEncoding = "https://url.somewhere.com?" + key + "=" + val[0] + "&" + key + "=" + val[1];
 			doTest(model, url, false, expectedUrlForEncoding);
 		}
 		catch (AssertionFailedError err) {
 			// OK, so it's the other order... probably on Sun JDK 1.6 or IBM JDK 1.5
-			String expectedUrlForEncoding = "http://url.somewhere.com?" + key + "=" + val[1] + "&" + key + "=" + val[0];
+			String expectedUrlForEncoding = "https://url.somewhere.com?" + key + "=" + val[1] + "&" + key + "=" + val[0];
 			doTest(model, url, false, expectedUrlForEncoding);
 		}
 	}
 
 	@Test
 	public void collectionParam() throws Exception {
-		String url = "http://url.somewhere.com";
+		String url = "https://url.somewhere.com";
 		String key = "foo";
 		List val = new ArrayList();
 		val.add("bar");
@@ -299,19 +299,19 @@ public class RedirectViewTests {
 		Map> model = new HashMap>();
 		model.put(key, val);
 		try {
-			String expectedUrlForEncoding = "http://url.somewhere.com?" + key + "=" + val.get(0) + "&" + key + "=" + val.get(1);
+			String expectedUrlForEncoding = "https://url.somewhere.com?" + key + "=" + val.get(0) + "&" + key + "=" + val.get(1);
 			doTest(model, url, false, expectedUrlForEncoding);
 		}
 		catch (AssertionFailedError err) {
 			// OK, so it's the other order... probably on Sun JDK 1.6 or IBM JDK 1.5
-			String expectedUrlForEncoding = "http://url.somewhere.com?" + key + "=" + val.get(1) + "&" + key + "=" + val.get(0);
+			String expectedUrlForEncoding = "https://url.somewhere.com?" + key + "=" + val.get(1) + "&" + key + "=" + val.get(0);
 			doTest(model, url, false, expectedUrlForEncoding);
 		}
 	}
 
 	@Test
 	public void objectConversion() throws Exception {
-		String url = "http://url.somewhere.com";
+		String url = "https://url.somewhere.com";
 		String key = "foo";
 		String val = "bar";
 		String key2 = "int2";
@@ -322,7 +322,7 @@ public class RedirectViewTests {
 		model.put(key, val);
 		model.put(key2, val2);
 		model.put(key3, val3);
-		String expectedUrlForEncoding = "http://url.somewhere.com?" + key + "=" + val + "&" + key2 + "=" + val2;
+		String expectedUrlForEncoding = "https://url.somewhere.com?" + key + "=" + val + "&" + key2 + "=" + val2;
 		doTest(model, url, false, expectedUrlForEncoding);
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
index 376acc3c863..0d7ce412825 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
@@ -50,7 +50,7 @@ public class RedirectViewUriTemplateTests {
 		Map model = new HashMap();
 		model.put("foo", "bar");
 
-		String baseUrl = "http://url.somewhere.com";
+		String baseUrl = "https://url.somewhere.com";
 		RedirectView redirectView = new RedirectView(baseUrl + "/{foo}");
 		redirectView.renderMergedOutputModel(model, this.request, this.response);
 
@@ -62,7 +62,7 @@ public class RedirectViewUriTemplateTests {
 		Map model = new HashMap();
 		model.put("foo", "bar/bar baz");
 
-		String baseUrl = "http://url.somewhere.com";
+		String baseUrl = "https://url.somewhere.com";
 		RedirectView redirectView = new RedirectView(baseUrl + "/context path/{foo}");
 		redirectView.renderMergedOutputModel(model, this.request, this.response);
 
@@ -105,7 +105,7 @@ public class RedirectViewUriTemplateTests {
 		currentRequestUriTemplateVars.put("var3", "v3");
 		this.request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, currentRequestUriTemplateVars);
 
-		String url = "http://url.somewhere.com";
+		String url = "https://url.somewhere.com";
 		RedirectView redirectView = new RedirectView(url + "/{key1}/{var1}/{name}");
 		redirectView.renderMergedOutputModel(model, this.request, this.response);
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java
index a69e840006e..3b3ab13e862 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java
@@ -334,7 +334,7 @@ public class ExcelViewTests {
 
 	/**
 	 * Workaround JXL bug that causes ArrayIndexOutOfBounds exceptions when running in
-	 * *nix machines. Same bug as reported at http://jira.pentaho.com/browse/PDI-5031.
+	 * *nix machines. Same bug as reported at https://jira.pentaho.com/browse/PDI-5031.
 	 * 
    We want to use the latest JXL code because it doesn't include log4j config files
 	 * inside the jar. Since the project appears to be abandoned, AbstractJExcelView will
 	 * eventually get deprecated.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTests.java
index d8f4523c14b..8ae4f8040a3 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTests.java
@@ -61,7 +61,7 @@ public class RssFeedViewTests {
 		view.render(model, request, response);
 		assertEquals("Invalid content-type", "application/rss+xml", response.getContentType());
 		String expected = "" +
-				"Test Feedhttp://example.comTest feed description" +
+				"Test Feedhttps://example.comTest feed description" +
 				"2This is entry 2" +
 				"1This is entry 1" + "";
 		assertXMLEqual(expected, response.getContentAsString());
@@ -74,7 +74,7 @@ public class RssFeedViewTests {
 		protected void buildFeedMetadata(Map model, Channel channel, HttpServletRequest request) {
 			channel.setTitle("Test Feed");
 			channel.setDescription("Test feed description");
-			channel.setLink("http://example.com");
+			channel.setLink("https://example.com");
 		}
 
 		@Override
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/foo.html b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/foo.html
index 83ff005e6bf..b2f02184a64 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/foo.html
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/foo.html
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/src/api/overview.html b/src/api/overview.html
index 2ca88cfaf34..f37932935e5 100644
--- a/src/api/overview.html
+++ b/src/api/overview.html
@@ -1,7 +1,7 @@
 
 
 
    
-This is the public API documentation for the Spring Framework.
+This is the public API documentation for the Spring Framework.
 
    
 
 
diff --git a/src/dist/changelog.txt b/src/dist/changelog.txt
index 563dbfa7117..fec9e9a7f00 100644
--- a/src/dist/changelog.txt
+++ b/src/dist/changelog.txt
@@ -1,6 +1,6 @@
 SPRING FRAMEWORK CHANGELOG
 ===========================
-http://www.spring.io
+https://www.spring.io
 
 Changes in version 3.2.18 (2016-12-21)
 -------------------------------------
@@ -70,7 +70,7 @@ improved fix cron trigger example in reference documentation (SPR-10474)
 Changes in version 3.2.15 (2015-10-15)
 -------------------------------------
 
-protect against RFD exploits, see http://pivotal.io/security/cve-2015-5211 (SPR-13548)
+protect against RFD exploits, see https://pivotal.io/security/cve-2015-5211 (SPR-13548)
 fixed whether HttpInputMessage.getBody() is allowed to return null (SPR-13563)
 fixed JCacheCache doesn't recognize null values in other JVMs (SPR-13553)
 fixed AbstractEmbeddedDatabaseConfigurer.shutdown does not close JDBC resources (SPR-13474)
diff --git a/src/dist/license.txt b/src/dist/license.txt
index ce5f76c5495..e84d62a49e4 100644
--- a/src/dist/license.txt
+++ b/src/dist/license.txt
@@ -244,13 +244,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 THE POSSIBILITY OF SUCH DAMAGE.
 
-Copyright (c) 1999-2009, OW2 Consortium 
+Copyright (c) 1999-2009, OW2 Consortium 
 
 
 >>> CGLIB 3.0 (cglib:cglib:3.0):
 
 Per the LICENSE file in the CGLIB JAR distribution downloaded from
-http://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
+https://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
 CGLIB 3.0 is licensed under the Apache License, version 2.0, the text of which
 is included above.
 
@@ -262,7 +262,7 @@ other similar licenses that require the source code and/or modifications to
 source code to be made available (as would be noted above), you may obtain a
 copy of the source code corresponding to the binaries for such open source
 components and modifications thereto, if any, (the "Source Files"), by
-downloading the Source Files from http://www.springsource.org/download, or by
+downloading the Source Files from https://www.springsource.org/download, or by
 sending a request, with your name and address to:
 
     Pivotal, Inc., 875 Howard St,
diff --git a/src/dist/readme.txt b/src/dist/readme.txt
index c51de83e35b..0d7f994d78c 100644
--- a/src/dist/readme.txt
+++ b/src/dist/readme.txt
@@ -5,7 +5,7 @@ To find out what has changed since any earlier releases, see 'docs/changelog.txt
 
 Please consult the documentation located within the
 'docs/spring-framework-reference' directory of this release and also visit
-the official Spring Framework home at http://www.springsource.org/spring-framework
+the official Spring Framework home at https://www.springsource.org/spring-framework
 
 There you will find links to the forum, issue tracker, and other resources.
 
diff --git a/src/reference/docbook/images/overview-ejb.graffle b/src/reference/docbook/images/overview-ejb.graffle
index 3813752a400..8675627fe34 100644
--- a/src/reference/docbook/images/overview-ejb.graffle
+++ b/src/reference/docbook/images/overview-ejb.graffle
@@ -1,5 +1,5 @@
 
-
+
 
 
 	ActiveLayerIndex
diff --git a/src/reference/docbook/images/overview-full.graffle b/src/reference/docbook/images/overview-full.graffle
index b77b5cc11cf..4c617b771ae 100644
--- a/src/reference/docbook/images/overview-full.graffle
+++ b/src/reference/docbook/images/overview-full.graffle
@@ -1,5 +1,5 @@
 
-
+
 
 
 	ActiveLayerIndex
diff --git a/src/reference/docbook/images/overview-remoting.graffle b/src/reference/docbook/images/overview-remoting.graffle
index 029ffe2268e..de0e0e8726c 100644
--- a/src/reference/docbook/images/overview-remoting.graffle
+++ b/src/reference/docbook/images/overview-remoting.graffle
@@ -1,5 +1,5 @@
 
-
+
 
 
 	ActiveLayerIndex
diff --git a/src/reference/docbook/images/overview-thirdparty-web.graffle b/src/reference/docbook/images/overview-thirdparty-web.graffle
index 6a1d4278a87..d78f722e0cb 100644
--- a/src/reference/docbook/images/overview-thirdparty-web.graffle
+++ b/src/reference/docbook/images/overview-thirdparty-web.graffle
@@ -1,5 +1,5 @@
 
-
+
 
 
 	ActiveLayerIndex
diff --git a/src/reference/docbook/images/oxm-exceptions.graffle b/src/reference/docbook/images/oxm-exceptions.graffle
index 7e1c19f1dff..4b72bf45285 100644
--- a/src/reference/docbook/images/oxm-exceptions.graffle
+++ b/src/reference/docbook/images/oxm-exceptions.graffle
@@ -1,5 +1,5 @@
 
-
+
 
 
 	ActiveLayerIndex
diff --git a/src/reference/docbook/images/spring-overview.graffle b/src/reference/docbook/images/spring-overview.graffle
index 3dcbe41270b..1e0774681a7 100644
--- a/src/reference/docbook/images/spring-overview.graffle
+++ b/src/reference/docbook/images/spring-overview.graffle
@@ -1,5 +1,5 @@
 
-
+
 
 
 	ActiveLayerIndex