This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new dc70d16 EL 5.0 will removed this deprecated, mis-spelt method dc70d16 is described below commit dc70d1613241e1f18d4d4d5efaad65e70cc3fedc Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed May 26 09:40:31 2021 +0100 EL 5.0 will removed this deprecated, mis-spelt method --- java/jakarta/el/MethodExpression.java | 17 ----------------- java/org/apache/el/MethodExpressionImpl.java | 12 ------------ webapps/docs/changelog.xml | 5 +++++ 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/java/jakarta/el/MethodExpression.java b/java/jakarta/el/MethodExpression.java index 5298495..d0ba8b4 100644 --- a/java/jakarta/el/MethodExpression.java +++ b/java/jakarta/el/MethodExpression.java @@ -64,21 +64,4 @@ public abstract class MethodExpression extends Expression { // Expected to be over-ridden by implementation return false; } - - /** - * @since EL 2.2 - * - * Note: The spelling mistake is deliberate. - * isParmetersProvided() - Specification definition - * isParametersProvided() - Corrected spelling - * - * @return Always <code>false</code> - * - * @deprecated Use {@link #isParametersProvided()} - */ - @Deprecated - public boolean isParmetersProvided() { - // Expected to be over-ridden by implementation - return false; - } } diff --git a/java/org/apache/el/MethodExpressionImpl.java b/java/org/apache/el/MethodExpressionImpl.java index eb9b764..3ec5235 100644 --- a/java/org/apache/el/MethodExpressionImpl.java +++ b/java/org/apache/el/MethodExpressionImpl.java @@ -316,16 +316,4 @@ public final class MethodExpressionImpl extends MethodExpression implements public boolean isParametersProvided() { return this.getNode().isParametersProvided(); } - - /** - * @since EL 2.2 - * Note: The spelling mistake is deliberate. - * isParmetersProvided() - Specification definition - * isParametersProvided() - Corrected spelling - */ - @Override - public boolean isParmetersProvided() { - return this.getNode().isParametersProvided(); - } - } diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index c190b2c..8e39a2a 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -207,6 +207,11 @@ Update JspC to generate <code>web.xml</code> and <code>web-fragment.xml</code> files using Servlet 5.0 schemas. (markt) </fix> + <scode> + Remove the deprecated method + <code>MethodExpression.getParmetersProvided()</code> from the EL API to + align with the current EL 5.0 development branch. (markt) + </scode> </changelog> </subsection> <subsection name="WebSocket"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org