diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
index 66473bcf28..80ee4cea68 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
@@ -72,7 +72,7 @@ import static org.junit.Assert.*;
 
 /**
  * Miscellaneous tests for XML bean definitions.
- * 
+ *
  * @author Juergen Hoeller
  * @author Rod Johnson
  * @author Rick Evans
diff --git a/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java b/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java
index df4598ff9d..d926568d91 100644
--- a/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java
@@ -145,7 +145,7 @@ abstract class MetaAnnotationUtils {
 	 *
 	 * <p>This method traverses the annotations and superclasses of the specified
 	 * {@code clazz} if no annotation can be found on the given class itself.
-	 * 
+	 *
 	 * <p>This method explicitly handles class-level annotations which are not
 	 * declared as {@linkplain java.lang.annotation.Inherited inherited} <em>as
 	 * well as meta-annotations</em>.
diff --git a/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java b/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
index dd74f449f6..952ef1e87c 100644
--- a/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
@@ -255,7 +255,7 @@ public class JdbcTestUtils {
 	 * @param commentPrefix the prefix that identifies comments in the SQL script &mdash; typically "--"
 	 * @return a {@code String} containing the script lines
 	 * @deprecated as of Spring 4.0.3, in favor of using
-	 * {@link org.springframework.jdbc.datasource.init.ScriptUtils#readScript(LineNumberReader, String, String)}  
+	 * {@link org.springframework.jdbc.datasource.init.ScriptUtils#readScript(LineNumberReader, String, String)} 
 	 */
 	@Deprecated
 	public static String readScript(LineNumberReader lineNumberReader, String commentPrefix) throws IOException {
@@ -287,7 +287,7 @@ public class JdbcTestUtils {
 	 * @param delim character delimiting each statement &mdash; typically a ';' character
 	 * @param statements the list that will contain the individual statements
 	 * @deprecated as of Spring 4.0.3, in favor of using
-	 * {@link org.springframework.jdbc.datasource.init.ScriptUtils#splitSqlScript(String, char, List)}  
+	 * {@link org.springframework.jdbc.datasource.init.ScriptUtils#splitSqlScript(String, char, List)} 
 	 */
 	@Deprecated
 	public static void splitSqlScript(String script, char delim, List<String> statements) {
diff --git a/spring-test/src/test/java/org/springframework/test/context/hierarchies/meta/MetaContextHierarchyConfig.java b/spring-test/src/test/java/org/springframework/test/context/hierarchies/meta/MetaContextHierarchyConfig.java
index 70482902b5..3445be2905 100644
--- a/spring-test/src/test/java/org/springframework/test/context/hierarchies/meta/MetaContextHierarchyConfig.java
+++ b/spring-test/src/test/java/org/springframework/test/context/hierarchies/meta/MetaContextHierarchyConfig.java
@@ -30,7 +30,7 @@ import org.springframework.test.context.ContextHierarchy;
 
 /**
  * Custom context hierarchy configuration annotation.
- * 
+ *
  * @author Sam Brannen
  * @since 4.0.3
  */
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
index a1e65a4031..ffa7b6f456 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
@@ -44,7 +44,7 @@ import org.springframework.web.socket.sockjs.transport.SockJsSession;
 
 /**
  * An abstract base class for SockJS sessions implementing {@link SockJsSession}.
- * 
+ *
  * @author Rossen Stoyanchev
  * @author Sam Brannen
  * @since 4.0