[tomcat] 01/02: Add version info to deprecation markers

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 806b2f9ae3cf4ff3767d47def59b3db3abdf0a73
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 24 11:10:45 2019 +0100

    Add version info to deprecation markers
---
 java/org/apache/catalina/servlets/DefaultServlet.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 87860f0..dd0bfbc 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1481,8 +1481,8 @@ public class DefaultServlet extends HttpServlet {
      * directory.
      *
      * @param contextPath Context path to which our internal paths are relative
-     * @param resource The associated resource
-     * @param xsltSource The XSL stylesheet
+     * @param resource    The associated resource
+     * @param xsltSource  The XSL stylesheet
      *
      * @return the XML data
      *
@@ -1503,15 +1503,15 @@ public class DefaultServlet extends HttpServlet {
      * directory.
      *
      * @param contextPath Context path to which our internal paths are relative
-     * @param resource The associated resource
-     * @param xsltSource The XSL stylesheet
+     * @param resource    The associated resource
+     * @param xsltSource  The XSL stylesheet
      * @param encoding    The encoding to use to process the readme (if any)
      *
      * @return the XML data
      *
      * @throws IOException an IO error occurred
      * @throws ServletException rendering error
-     * @deprecated Unused. Will be removed in Tomcat 9
+     * @deprecated Unused. Will be removed in Tomcat 10
      * @deprecated Use {@link #render(HttpServletRequest, String, WebResource, 
String)} instead
      */
     @Deprecated
@@ -1686,7 +1686,7 @@ public class DefaultServlet extends HttpServlet {
      *
      * @throws IOException an IO error occurred
      *
-     * @deprecated Unused. Will be removed in Tomcat 9
+     * @deprecated Unused. Will be removed in Tomcat 10
      * @deprecated Use {@link #renderHtml(HttpServletRequest, String, 
WebResource, String)} instead
      */
     @Deprecated


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org