You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/03/13 20:51:51 UTC

svn commit: r1734848 - in /tomcat/tc8.0.x/trunk/java/org/apache: catalina/ catalina/ant/jmx/ catalina/core/ catalina/filters/ catalina/ha/session/ catalina/realm/ catalina/session/ catalina/startup/ catalina/tribes/group/interceptors/ catalina/tribes/m...

Author: markt
Date: Sun Mar 13 19:51:50 2016
New Revision: 1734848

URL: http://svn.apache.org/viewvc?rev=1734848&view=rev
Log:
By default, these will all be deprecated in 8.5.x. That can be pushed back to 9.0.x if removal causes problems in 8.5.x.

Modified:
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceEvent.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceListener.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/LifecycleState.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/Manager.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/Wrapper.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardService.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/IOTools.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/InstanceSupport.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/RequestUtil.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
    tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java
    tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java Sun Mar 13 19:51:50 2016
@@ -801,7 +801,7 @@ public interface Context extends Contain
      *
      * @param listener Java class name of an InstanceListener class
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     public void addInstanceListener(String listener);
@@ -991,7 +991,7 @@ public interface Context extends Contain
      * Return the set of InstanceListener classes that will be added to
      * newly created Wrappers automatically.
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     public String[] findInstanceListeners();
@@ -1221,7 +1221,7 @@ public interface Context extends Contain
      *
      * @param listener Class name of an InstanceListener class to be removed
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     public void removeInstanceListener(String listener);

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java Sun Mar 13 19:51:50 2016
@@ -309,9 +309,9 @@ public final class Globals {
     public static final String JASPER_XML_BLOCK_EXTERNAL_INIT_PARAM =
             "org.apache.jasper.XML_BLOCK_EXTERNAL";
 
-    @Deprecated // Will be removed in Tomcat 9.0.x
+    @Deprecated // Will be removed in Tomcat 8.5.x
     public static final boolean IS_ORACLE_JVM = JreVendor.IS_ORACLE_JVM;
 
-    @Deprecated // Will be removed in Tomcat 9.0.x
+    @Deprecated // Will be removed in Tomcat 8.5.x
     public static final boolean IS_IBM_JVM = JreVendor.IS_IBM_JVM;
 }

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceEvent.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceEvent.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceEvent.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceEvent.java Sun Mar 13 19:51:50 2016
@@ -34,7 +34,7 @@ import javax.servlet.ServletResponse;
  *
  * @author Craig R. McClanahan
  *
- * @deprecated Will be removed in 9.0.x onwards
+ * @deprecated Will be removed in 8.5.x onwards
  */
 @Deprecated
 public final class InstanceEvent extends EventObject {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceListener.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceListener.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceListener.java Sun Mar 13 19:51:50 2016
@@ -26,7 +26,7 @@ package org.apache.catalina;
  *
  * @author Craig R. McClanahan
  *
- * @deprecated Will be removed in 9.0.x onwards
+ * @deprecated Will be removed in 8.5.x onwards
  */
 @Deprecated
 public interface InstanceListener {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/LifecycleState.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/LifecycleState.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/LifecycleState.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/LifecycleState.java Sun Mar 13 19:51:50 2016
@@ -35,7 +35,7 @@ public enum LifecycleState {
     DESTROYED(false, Lifecycle.AFTER_DESTROY_EVENT),
     FAILED(false, null),
     /**
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x. The state transition
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x. The state transition
      *             checking in {@link org.apache.catalina.util.LifecycleBase}
      *             makes it impossible to use this state. The intended behaviour
      *             can be obtained by setting the state to
@@ -45,7 +45,7 @@ public enum LifecycleState {
     @Deprecated
     MUST_STOP(true, null),
     /**
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x. The state transition
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x. The state transition
      *             checking in {@link org.apache.catalina.util.LifecycleBase}
      *             makes it impossible to use this state. The intended behaviour
      *             can be obtained by implementing {@link Lifecycle.SingleUse}.

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/Manager.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/Manager.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/Manager.java Sun Mar 13 19:51:50 2016
@@ -92,7 +92,7 @@ public interface Manager {
      * this Manager.
      *
      * @deprecated Ignored. {@link Context#getDistributable()} always takes
-     *             precedence. Will be removed in Tomcat 9.0.x.
+     *             precedence. Will be removed in Tomcat 8.5.x.
      */
     @Deprecated
     public boolean getDistributable();
@@ -106,7 +106,7 @@ public interface Manager {
      * @param distributable The new distributable flag
      *
      * @deprecated Ignored. {@link Context#getDistributable()} always takes
-     *             precedence. Will be removed in Tomcat 9.0.x.
+     *             precedence. Will be removed in Tomcat 8.5.x.
      */
     @Deprecated
     public void setDistributable(boolean distributable);
@@ -117,7 +117,7 @@ public interface Manager {
      * for Sessions created by this Manager.
      *
      * @deprecated Ignored. {@link Context#getSessionTimeout()} always takes
-     *             precedence. Will be removed in Tomcat 9.0.x.
+     *             precedence. Will be removed in Tomcat 8.5.x.
      */
     @Deprecated
     public int getMaxInactiveInterval();
@@ -130,7 +130,7 @@ public interface Manager {
      * @param interval The new default value
      *
      * @deprecated Ignored. {@link Context#getSessionTimeout()} always takes
-     *             precedence. Will be removed in Tomcat 9.0.x.
+     *             precedence. Will be removed in Tomcat 8.5.x.
      */
     @Deprecated
     public void setMaxInactiveInterval(int interval);

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/Wrapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/Wrapper.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/Wrapper.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/Wrapper.java Sun Mar 13 19:51:50 2016
@@ -175,7 +175,7 @@ public interface Wrapper extends Contain
      *
      * @param listener The new listener
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     public void addInstanceListener(InstanceListener listener);
@@ -297,7 +297,7 @@ public interface Wrapper extends Contain
      *
      * @param listener The listener to remove
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     public void removeInstanceListener(InstanceListener listener);

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Sun Mar 13 19:51:50 2016
@@ -150,7 +150,7 @@ public class JMXAccessorQueryTask extend
      * @param pname
      * @param oname
      *
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x
      */
     @Deprecated
     protected void bindAttributes(MBeanServerConnection jmxServerConnection,

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java Sun Mar 13 19:51:50 2016
@@ -572,7 +572,7 @@ final class ApplicationFilterChain imple
      *
      * @param support The InstanceSupport object for our Wrapper
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     void setSupport(InstanceSupport support) {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Sun Mar 13 19:51:50 2016
@@ -2970,7 +2970,7 @@ public class StandardContext extends Con
      *
      * @param listener Java class name of an InstanceListener class
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     @Override
@@ -3462,7 +3462,7 @@ public class StandardContext extends Con
      * Return the set of InstanceListener classes that will be added to
      * newly created Wrappers automatically.
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     @Override
@@ -4040,7 +4040,7 @@ public class StandardContext extends Con
      *
      * @param listener Class name of an InstanceListener class to be removed
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     @Override
@@ -6240,7 +6240,7 @@ public class StandardContext extends Con
      * @return string deployment descriptor
      *
      * @deprecated The JSR-77 implementation is incomplete and will be removed
-     *             in 9.0.x
+     *             in 8.5.x
      */
     @Deprecated
     public String getDeploymentDescriptor() {
@@ -6275,7 +6275,7 @@ public class StandardContext extends Con
      * @return list of all servlets ( we know about )
      *
      * @deprecated The JSR-77 implementation is incomplete and will be removed
-     *             in 9.0.x
+     *             in 8.5.x
      */
     @Deprecated
     public String[] getServlets() {
@@ -6492,7 +6492,7 @@ public class StandardContext extends Con
      * Support for "stateManageable" JSR77
      *
      * @deprecated The JSR-77 implementation is incomplete and will be removed
-     *             in 9.0.x
+     *             in 8.5.x
      */
     @Deprecated
     public boolean isStateManageable() {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardService.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardService.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardService.java Sun Mar 13 19:51:50 2016
@@ -92,7 +92,7 @@ public class StandardService extends Lif
     /**
      * The Container associated with this Service.
      *
-     * @deprecated Will be made private in 9.0.x
+     * @deprecated Will be made private in 8.5.x
      */
     @Deprecated
     protected Container container = null;

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Sun Mar 13 19:51:50 2016
@@ -144,7 +144,7 @@ public class StandardWrapper extends Con
     /**
      * The support object for our instance listeners.
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     protected final InstanceSupport instanceSupport = new InstanceSupport(this);
@@ -353,7 +353,7 @@ public class StandardWrapper extends Con
     /**
      * Return the InstanceSupport object for this Wrapper instance.
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     public InstanceSupport getInstanceSupport() {
@@ -737,7 +737,7 @@ public class StandardWrapper extends Con
      *
      * @param listener The new listener
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     @Override
@@ -1289,7 +1289,7 @@ public class StandardWrapper extends Con
      *
      * @param listener The listener to remove
      *
-     * @deprecated Will be removed in 9.0.x onwards
+     * @deprecated Will be removed in 8.5.x onwards
      */
     @Deprecated
     @Override
@@ -1868,7 +1868,7 @@ public class StandardWrapper extends Con
      * JSR 77. Always return false.
      *
      * @deprecated The JSR-77 implementation is incomplete and will be removed
-     *             in 9.0.x
+     *             in 8.5.x
      */
     @Deprecated
     public boolean isStateManageable() {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java Sun Mar 13 19:51:50 2016
@@ -1075,7 +1075,7 @@ public final class CorsFilter implements
 
     /**
      * {@link Collection} of HTTP methods. Case sensitive.
-     * @deprecated Not used. Will be removed in Tomcat 9.0.x onwards.
+     * @deprecated Not used. Will be removed in Tomcat 8.5.x onwards.
      */
     @Deprecated
     public static final Collection<String> HTTP_METHODS =
@@ -1084,7 +1084,7 @@ public final class CorsFilter implements
 
     /**
      * {@link Collection} of non-simple HTTP methods. Case sensitive.
-     * @deprecated Not used. Will be removed in Tomcat 9.0.x onwards. All HTTP
+     * @deprecated Not used. Will be removed in Tomcat 8.5.x onwards. All HTTP
      *             methods not in {@link #SIMPLE_HTTP_METHODS} are assumed to be
      *             non-simple.
      */
@@ -1097,7 +1097,7 @@ public final class CorsFilter implements
      * @see  <a href="http://www.w3.org/TR/cors/#terminology"
      *       >http://www.w3.org/TR/cors/#terminology</a>
      *
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x onwards.
      */
     @Deprecated
     public static final Collection<String> SIMPLE_HTTP_METHODS =
@@ -1109,7 +1109,7 @@ public final class CorsFilter implements
      * @see  <a href="http://www.w3.org/TR/cors/#terminology"
      *       >http://www.w3.org/TR/cors/#terminology</a>
      *
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x onwards.
      */
     @Deprecated
     public static final Collection<String> SIMPLE_HTTP_REQUEST_HEADERS =
@@ -1122,7 +1122,7 @@ public final class CorsFilter implements
      * @see  <a href="http://www.w3.org/TR/cors/#terminology"
      *       >http://www.w3.org/TR/cors/#terminology</a>
      *
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x onwards.
      */
     @Deprecated
     public static final Collection<String> SIMPLE_HTTP_RESPONSE_HEADERS =

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java Sun Mar 13 19:51:50 2016
@@ -83,7 +83,7 @@ public abstract class ClusterManagerBase
      * @return the sessionAttributeFilter
      *
      * @deprecated Use {@link #getSessionAttributeNameFilter()}. Will be removed
-     *             in Tomcat 9.0.x
+     *             in Tomcat 8.5.x
      */
     @Deprecated
     public String getSessionAttributeFilter() {
@@ -101,7 +101,7 @@ public abstract class ClusterManagerBase
      *            the filter name pattern to set
      *
      * @deprecated Use {@link #setSessionAttributeNameFilter(String)}. Will be
-     *             removed in Tomcat 9.0.x
+     *             removed in Tomcat 8.5.x
      */
     @Deprecated
     public void setSessionAttributeFilter(String sessionAttributeFilter) {
@@ -123,7 +123,7 @@ public abstract class ClusterManagerBase
      * @return true if the attribute should be distributed
      *
      * @deprecated Use {@link #willAttributeDistribute(String, Object)}. Will be
-     *             removed in Tomcat 9.0.x
+     *             removed in Tomcat 8.5.x
      */
     @Deprecated
     public boolean willAttributeDistribute(String name) {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Sun Mar 13 19:51:50 2016
@@ -108,7 +108,7 @@ public abstract class RealmBase extends
      * MessageDigest class, or <code>null</code> if no digesting should
      * be performed.
      *
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x onwards.
      */
     @Deprecated
     protected String digest = null;
@@ -116,7 +116,7 @@ public abstract class RealmBase extends
     /**
      * The encoding charset for the digest.
      *
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x onwards.
      */
     @Deprecated
     protected String digestEncoding = null;
@@ -128,7 +128,7 @@ public abstract class RealmBase extends
     /**
      * The MessageDigest object for digesting user credentials (passwords).
      *
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x onwards.
      */
     @Deprecated
     protected volatile MessageDigest md = null;
@@ -137,7 +137,7 @@ public abstract class RealmBase extends
     /**
      * MD5 message digest provider.
      *
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x onwards.
      */
     @Deprecated
     protected static volatile MessageDigest md5Helper;
@@ -248,7 +248,7 @@ public abstract class RealmBase extends
      * @return The currently configured algorithm used to digest stored
      *         credentials
      *
-     * @deprecated  This will be removed in Tomcat 9.0.x as it has been replaced
+     * @deprecated  This will be removed in Tomcat 8.5.x as it has been replaced
      *              by the CredentialHandler
      */
     @Deprecated
@@ -266,7 +266,7 @@ public abstract class RealmBase extends
      *
      * @param digest The new digest algorithm
      *
-     * @deprecated  This will be removed in Tomcat 9.0.x as it has been replaced
+     * @deprecated  This will be removed in Tomcat 8.5.x as it has been replaced
      *              by the CredentialHandler
      */
     @Deprecated
@@ -294,7 +294,7 @@ public abstract class RealmBase extends
      *
      * @return The charset (may be null) for platform default
      *
-     * @deprecated  This will be removed in Tomcat 9.0.x as it has been replaced
+     * @deprecated  This will be removed in Tomcat 8.5.x as it has been replaced
      *              by the CredentialHandler
      */
     @Deprecated
@@ -311,7 +311,7 @@ public abstract class RealmBase extends
      *
      * @param charset The charset (null for platform default)
      *
-     * @deprecated  This will be removed in Tomcat 9.0.x as it has been replaced
+     * @deprecated  This will be removed in Tomcat 8.5.x as it has been replaced
      *              by the CredentialHandler
      */
     @Deprecated
@@ -332,7 +332,7 @@ public abstract class RealmBase extends
 
 
     /**
-     * @deprecated  This will be removed in Tomcat 9.0.x as it has been replaced
+     * @deprecated  This will be removed in Tomcat 8.5.x as it has been replaced
      *              by the CredentialHandler
      */
     @Deprecated
@@ -611,7 +611,7 @@ public abstract class RealmBase extends
 
 
     /**
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x onwards.
      */
     @Deprecated
     protected boolean compareCredentials(String userCredentials,

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Sun Mar 13 19:51:50 2016
@@ -77,7 +77,7 @@ public abstract class ManagerBase extend
      * session controlled by this Manager must be Serializable.
      *
      * @deprecated Ignored. {@link Context#getDistributable()} always takes
-     *             precedence. Will be removed in Tomcat 9.0.x.
+     *             precedence. Will be removed in Tomcat 8.5.x.
      */
     @Deprecated
     protected boolean distributable;
@@ -94,7 +94,7 @@ public abstract class ManagerBase extend
      * this Manager.
      *
      * @deprecated Ignored. {@link Context#getSessionTimeout()} always takes
-     *             precedence. Will be removed in Tomcat 9.0.x.
+     *             precedence. Will be removed in Tomcat 8.5.x.
      */
     @Deprecated
     protected int maxInactiveInterval = 30 * 60;

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java Sun Mar 13 19:51:50 2016
@@ -1723,7 +1723,7 @@ public class StandardSession implements
      * @param name the attribute's name
      *
      * @deprecated Use {@link #exclude(String, Object)}. Will be removed in
-     *             Tomcat 9.0.x.
+     *             Tomcat 8.5.x.
      */
     @Deprecated
     protected boolean exclude(String name){

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Sun Mar 13 19:51:50 2016
@@ -1220,7 +1220,7 @@ public class HostConfig
      * Check resources for redeployment and reloading.
      *
      * @deprecated Use {@link #checkResources(DeployedApplication, boolean)}.
-     *             Will be removed in Tomcat 9.0.x
+     *             Will be removed in Tomcat 8.5.x
      */
     @Deprecated
     protected synchronized void checkResources(DeployedApplication app) {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java Sun Mar 13 19:51:50 2016
@@ -21,7 +21,7 @@ package org.apache.catalina.tribes.group
  *             features. Now the minimum Java version is >=5, those features
  *             have been added to {@link MessageDispatchInterceptor} which
  *             should be used instead. This class will be removed in Tomcat
- *             9.0.x onwards.
+ *             8.5.x onwards.
  */
 @Deprecated
 public class MessageDispatch15Interceptor extends MessageDispatchInterceptor {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java Sun Mar 13 19:51:50 2016
@@ -48,7 +48,7 @@ public class MessageDispatchInterceptor
 
     protected long maxQueueSize = 1024*1024*64; //64MB
     /**
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x.
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x.
      */
     @Deprecated
     // Use fully qualified name to avoid deprecation warning on import.
@@ -56,7 +56,7 @@ public class MessageDispatchInterceptor
             new org.apache.catalina.tribes.transport.bio.util.FastQueue();
     protected volatile boolean run = false;
     /**
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x.
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x.
      */
     @Deprecated
     protected Thread msgDispatchThread = null;
@@ -120,7 +120,7 @@ public class MessageDispatchInterceptor
 
     /**
      * @deprecated Not used. The thread pool contains its own queue. This will
-     *             be removed in Tomcat 9.0.x onwards.
+     *             be removed in Tomcat 8.5.x onwards.
      *
      * @return Always null
      */
@@ -263,7 +263,7 @@ public class MessageDispatchInterceptor
 
 
     /**
-     * @deprecated Unused. Will be removed in 9.0.x
+     * @deprecated Unused. Will be removed in 8.5.x
      */
     @Deprecated
     @Override
@@ -273,7 +273,7 @@ public class MessageDispatchInterceptor
 
 
     /**
-     * @deprecated Unused. Will be removed in 9.0.x
+     * @deprecated Unused. Will be removed in 8.5.x
      */
     @Deprecated
     protected org.apache.catalina.tribes.transport.bio.util.LinkObject sendAsyncData(

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java Sun Mar 13 19:51:50 2016
@@ -277,7 +277,7 @@ public class Membership implements Clone
     /**
      * Get a copy from all member entries.
      *
-     * @deprecated Unused. Will be removed in Tomcat 9.0.x.
+     * @deprecated Unused. Will be removed in Tomcat 8.5.x.
      */
     @Deprecated
     protected synchronized MbrEntry[] getMemberEntries() {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java Sun Mar 13 19:51:50 2016
@@ -34,7 +34,7 @@ import org.apache.juli.logging.LogFactor
  *
  * @author Peter Rossbach
  *
- * @deprecated Unused. Will be removed in Tomcat 9.0.x.
+ * @deprecated Unused. Will be removed in Tomcat 8.5.x.
  */
 @Deprecated
 public class FastQueue {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java Sun Mar 13 19:51:50 2016
@@ -29,7 +29,7 @@ import org.apache.catalina.tribes.group.
  *
  * @author Peter Rossbach
  *
- * @deprecated Unused. Will be removed in Tomcat 9.0.x
+ * @deprecated Unused. Will be removed in Tomcat 8.5.x
  */
 @Deprecated
 public class LinkObject {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java Sun Mar 13 19:51:50 2016
@@ -47,7 +47,7 @@ package org.apache.catalina.tribes.trans
  * @author Peter Rossbach
  * @version 1.1
  *
- * @deprecated Unused. Will be removed in Tomcat 9.0.x
+ * @deprecated Unused. Will be removed in Tomcat 8.5.x
  */
 @Deprecated
 public class SingleRemoveSynchronizedAddLock {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/IOTools.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/IOTools.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/IOTools.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/IOTools.java Sun Mar 13 19:51:50 2016
@@ -68,7 +68,7 @@ public class IOTools {
      * @param os output stream the output stream to write to.
      * @param buf the byte array to use as a buffer
      *
-     * @deprecated Unused. Will be removed in 9.0.x
+     * @deprecated Unused. Will be removed in 8.5.x
      */
     @Deprecated
     public static void flow( InputStream is, OutputStream os, byte[] buf )

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/InstanceSupport.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/InstanceSupport.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/InstanceSupport.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/InstanceSupport.java Sun Mar 13 19:51:50 2016
@@ -35,7 +35,7 @@ import org.apache.catalina.Wrapper;
  *
  * @author Craig R. McClanahan
  *
- * @deprecated Will be removed in 9.0.x onwards
+ * @deprecated Will be removed in 8.5.x onwards
  */
 @Deprecated
 public final class InstanceSupport {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/RequestUtil.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/RequestUtil.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/RequestUtil.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/RequestUtil.java Sun Mar 13 19:51:50 2016
@@ -99,7 +99,7 @@ public final class RequestUtil {
      * If an unsupported encoding is specified the parameters will not be
      * parsed and the map will not be modified
      *
-     * @deprecated Unused. This will be removed in Tomcat 9.0.x.
+     * @deprecated Unused. This will be removed in Tomcat 8.5.x.
      */
     @Deprecated
     public static void parseParameters(Map<String,String[]> map, String data,
@@ -185,7 +185,7 @@ public final class RequestUtil {
      * @exception UnsupportedEncodingException if the requested encoding is not
      * supported.
      *
-     * @deprecated Unused. This will be removed in Tomcat 9.0.x.
+     * @deprecated Unused. This will be removed in Tomcat 8.5.x.
      */
     @Deprecated
     public static void parseParameters(Map<String,String[]> map, byte[] data,

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Sun Mar 13 19:51:50 2016
@@ -739,7 +739,7 @@ public class RewriteValve extends ValveB
     /**
      * Determine if a URI string has a <code>scheme</code> component.
      *
-     * @deprecated Unused. Will be removed in 9.0.x.
+     * @deprecated Unused. Will be removed in 8.5.x.
      */
     @Deprecated
     protected static boolean hasScheme(StringBuffer uri) {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java Sun Mar 13 19:51:50 2016
@@ -69,7 +69,7 @@ public class Constants {
      * servlet definition.  If present on a request, this overrides the
      * value returned by <code>request.getServletPath()</code> to select
      * the JSP page to be executed.
-     * @deprecated  This will be removed in Tomcat 9.0.x onwards. It is replaced
+     * @deprecated  This will be removed in Tomcat 8.5.x onwards. It is replaced
      *              by the use of the jspFile servlet initialisation parameter
      */
     @Deprecated

Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java Sun Mar 13 19:51:50 2016
@@ -276,7 +276,7 @@ public class JspServlet extends HttpServ
     }
 
 
-    @SuppressWarnings("deprecation") // Use of JSP_FILE to be removed in 9.0.x
+    @SuppressWarnings("deprecation") // Use of JSP_FILE to be removed in 8.5.x
     @Override
     public void service (HttpServletRequest request,
                              HttpServletResponse response)

Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java Sun Mar 13 19:51:50 2016
@@ -195,7 +195,7 @@ public final class LegacyCookieProcessor
      * @return Always returns true
      *
      * @deprecated No longer used. Cookie headers are now always preserved. Will
-     *             be removed in Tomcat 9.0.x.
+     *             be removed in Tomcat 8.5.x.
      */
     @Deprecated
     public boolean getPreserveCookieHeader() {
@@ -209,7 +209,7 @@ public final class LegacyCookieProcessor
      * @param preserveCookieHeader Ignored
      *
      * @deprecated No longer used. Cookie headers are now always preserved. Will
-     *             be removed in Tomcat 9.0.x.
+     *             be removed in Tomcat 8.5.x.
      */
     @Deprecated
     public void setPreserveCookieHeader(boolean preserveCookieHeader) {

Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun Mar 13 19:51:50 2016
@@ -83,7 +83,7 @@ public class NioEndpoint extends Abstrac
 
 
     public static final int OP_REGISTER = 0x100; //register interest op
-    @Deprecated // Unused. Will be removed in Tomcat 9.0.x
+    @Deprecated // Unused. Will be removed in Tomcat 8.5.x
     public static final int OP_CALLBACK = 0x200; //callback interest op
 
     // ----------------------------------------------------------------- Fields
@@ -1331,9 +1331,9 @@ public class NioEndpoint extends Abstrac
 
         public Poller getPoller() { return poller;}
         public void setPoller(Poller poller){this.poller = poller;}
-        @Deprecated // Unused. NO-OP. Will be removed in Tomcat 9.0.x
+        @Deprecated // Unused. NO-OP. Will be removed in Tomcat 8.5.x
         public void setCometNotify(@SuppressWarnings("unused") boolean notify) { /* NO-OP */ }
-        @Deprecated // Unused. Always returns false. Will be removed in Tomcat 9.0.x
+        @Deprecated // Unused. Always returns false. Will be removed in Tomcat 8.5.x
         public boolean getCometNotify() { return false; }
         public int interestOps() { return interestOps;}
         public int interestOps(int ops) { this.interestOps  = ops; return ops; }

Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java Sun Mar 13 19:51:50 2016
@@ -43,7 +43,7 @@ import java.util.Locale;
  *
  * @author Craig R. McClanahan
  *
- * @deprecated Will be removed in Tomcat 9.0.x. Use {@link java.net.URI} or
+ * @deprecated Will be removed in Tomcat 8.5.x. Use {@link java.net.URI} or
  *             {@link org.apache.tomcat.util.buf.UriUtil}.
  */
 @Deprecated

Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java?rev=1734848&r1=1734847&r2=1734848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java Sun Mar 13 19:51:50 2016
@@ -35,7 +35,7 @@ public class Constants {
     public static final String EXECUTOR_CORE_SIZE_INIT_PARAM =
             "org.apache.tomcat.websocket.executorCoreSize";
     /**
-     * @deprecated No longer used and will be removed in Tomcat 9.0.x
+     * @deprecated No longer used and will be removed in Tomcat 8.5.x
      */
     @Deprecated
     public static final String EXECUTOR_MAX_SIZE_INIT_PARAM =




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