From 040d4cb1347d08c4f927f90697448f233f4f8033 Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Thu, 9 Sep 2021 09:11:03 +0100
Subject: [PATCH] ELResolver.getFeatureDescriptors() is deprecated as of EL 5.0

---
 .../java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java | 4 ++++
 .../jakarta/servlet/jsp/el/ScopedAttributeELResolver.java     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java b/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
index c02d9be6..6038a0c5 100644
--- a/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -285,7 +285,11 @@ public boolean isReadOnly(ELContext context, Object base, Object property) {
      *                <code>null</code> return value.
      * @return An <code>Iterator</code> containing one <code>FeatureDescriptor</code> object for each implicit object,
      *         or <code>null</code> if <code>base</code> is not <code>null</code>.
+     *         
+     * @deprecated This method is deprecated as of EL 5.0 and will be removed in EL 6.0 (Jakarta EE 11). Therefore it
+     *             will be removed here in JSP 4.0.
      */
+    @Deprecated(forRemoval = true, since = "JSP 3.1")
     @Override
     public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
 
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java b/api/src/main/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java
index 2b288e15..c90425fb 100644
--- a/api/src/main/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java
+++ b/api/src/main/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java
@@ -253,7 +253,11 @@ public boolean isReadOnly(ELContext context, Object base, Object property) {
      *                <code>null</code> return value.
      * @return An <code>Iterator</code> containing one <code>FeatureDescriptor</code> object for each scoped attribute,
      *         or <code>null</code> if <code>base</code> is not <code>null</code>.
+     *         
+     * @deprecated This method is deprecated as of EL 5.0 and will be removed in EL 6.0 (Jakarta EE 11). Therefore it
+     *             will be removed here in JSP 4.0.
      */
+    @Deprecated(forRemoval = true, since = "JSP 3.1")
     @Override
     public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
         Enumeration<String> attrs;