Update Javadoc for mocks regarding Servlet 3.0

Commit deba32cad9 upgraded the Servlet API mocks to Servlet 3.0;
however, not all of the Javadoc was updated accordingly.

This commit updates the remaining Javadoc with regard to Servlet 3.0 as
the baseline for mocks in the spring-test module.

In addition, this commit syncs up the mocks used for internal testing in
the spring-web module with the most current versions from spring-test.

Issue: SPR-11049

spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java

@@ -40,8 +40,9 @@ import org.springframework.web.util.WebUtils;
 /**
  * Mock implementation of the {@link javax.servlet.http.HttpServletResponse} interface.
  *
- * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline. Beyond that,
- * this MockHttpServletResponse is also compatible with Servlet 3.1's setContentLengthLong.
+ * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline.
+ * Beyond that, {@code MockHttpServletResponse} is also compatible with Servlet
+ * 3.1's {@code setContentLengthLong()} method.
  *
  * @author Juergen Hoeller
  * @author Rod Johnson

spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java

@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
 /**
  * Mock implementation of the {@link javax.servlet.http.HttpSession} interface.
  *
- * <p>Compatible with Servlet 2.5 as well as Servlet 3.0.
+ * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline.
  *
  * <p>Used for testing the web framework; also useful for testing application
  * controllers.

spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java

@@ -35,6 +35,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
  * Mock implementation of the
  * {@link org.springframework.web.multipart.MultipartHttpServletRequest} interface.
  *
+ * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline.
+ *
  * <p>Useful for testing application controllers that access multipart uploads.
  * The {@link MockMultipartFile} can be used to populate these mock requests
  * with files.

spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java

@@ -56,7 +56,9 @@ import org.springframework.web.util.WebUtils;
 /**
  * Mock implementation of the {@link javax.servlet.ServletContext} interface.
  *
- * <p>Compatible with Servlet 3.0. Can be configured to expose a specific version
+ * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline.
+ *
+ * <p>Compatible with Servlet 3.0 but can be configured to expose a specific version
  * through {@link #setMajorVersion}/{@link #setMinorVersion}; default is 3.0.
  * Note that Servlet 3.0 support is limited: servlet, filter and listener
  * registration methods are not supported; neither is JSP configuration.

spring-test/src/main/java/org/springframework/mock/web/package-info.java

@@ -1,15 +1,14 @@
-
 /**
+ * A comprehensive set of Servlet API 3.0 mock objects, targeted at usage with
+ * Spring's web MVC framework.
  *
- * A comprehensive set of Servlet API 2.5 mock objects,
- * targeted at usage with Spring's web MVC framework.
- * Useful for testing web contexts and controllers.
+ * <p>Useful for testing web contexts and controllers.
  *
  * <p>More convenient to use than dynamic mock objects
  * (<a href="http://www.easymock.org">EasyMock</a>) or
  * existing Servlet API mock objects
  * (<a href="http://www.mockobjects.com">MockObjects</a>).
- *
  */
+
 package org.springframework.mock.web;