Remove the deprecated BodyTag.EVAL_BODY_TAG constant

jakartaee · Oct 19, 2022 · c1e178b · c1e178b
1 parent 59462ed
commit c1e178b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTag.java b/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
@@ -97,15 +97,6 @@
  */
 public interface BodyTag extends IterationTag {
 
-    /**
-     * Deprecated constant that has the same value as EVAL_BODY_BUFFERED and EVAL_BODY_AGAIN. This name has been marked
-     * as deprecated to encourage the use of the two different terms, which are much more descriptive.
-     *
-     * @deprecated As of Java JSP API 1.2, use BodyTag.EVAL_BODY_BUFFERED or IterationTag.EVAL_BODY_AGAIN.
-     */
-    @Deprecated
-    public final static int EVAL_BODY_TAG = 2;
-
     /**
      * Request the creation of new buffer, a BodyContent on which to evaluate the body of this tag.
      *

diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/IterationTag.java b/api/src/main/java/jakarta/servlet/jsp/tagext/IterationTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
@@ -70,10 +70,6 @@ public interface IterationTag extends Tag {
 
     /**
      * Request the reevaluation of some body. Returned from doAfterBody.
-     *
-     * For compatibility with JSP 1.1, the value is carefully selected to be the same as the, now deprecated,
-     * BodyTag.EVAL_BODY_TAG,
-     * 
      */
     public final static int EVAL_BODY_AGAIN = 2;
 

diff --git a/spec/src/main/asciidoc/ServerPages.adoc b/spec/src/main/asciidoc/ServerPages.adoc
@@ -11554,6 +11554,8 @@ Jakarta Server Pages specification. This appendix is non-normative.
 
 * Remove the deprecated classes from the `jakarta.servlet.jsp.el` package.
 
+* Remove the deprecated `BodyTag.EVAL_BODY_TAG` constant.
+
 === Changes between JSP 3.1 and JSP 3.0
 
 * Deprecate methods that override `ELResolver.getFeatureDescriptors()` as that