This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 66af02be769d91328442056586aa1f92712541b2 Author: remm <[email protected]> AuthorDate: Sun Oct 18 18:13:57 2026 +0200 Compatibility --- java/org/apache/el/MethodExpressionImpl.java | 2 -- java/org/apache/el/MethodExpressionLiteral.java | 2 -- java/org/apache/el/ValueExpressionImpl.java | 2 -- test/org/apache/el/TestValueExpressionImpl.java | 6 +++--- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/java/org/apache/el/MethodExpressionImpl.java b/java/org/apache/el/MethodExpressionImpl.java index 00c1ee7fcb..4de8495706 100644 --- a/java/org/apache/el/MethodExpressionImpl.java +++ b/java/org/apache/el/MethodExpressionImpl.java @@ -20,7 +20,6 @@ import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import java.io.Serial; import jakarta.el.ELContext; import jakarta.el.ELException; @@ -68,7 +67,6 @@ import org.apache.el.util.ReflectionUtil; */ public final class MethodExpressionImpl extends MethodExpression implements Externalizable { - @Serial private static final long serialVersionUID = 1L; private Class<?> expectedType; diff --git a/java/org/apache/el/MethodExpressionLiteral.java b/java/org/apache/el/MethodExpressionLiteral.java index 182ae8e02f..c9fe57bd51 100644 --- a/java/org/apache/el/MethodExpressionLiteral.java +++ b/java/org/apache/el/MethodExpressionLiteral.java @@ -20,7 +20,6 @@ import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import java.io.Serial; import java.lang.annotation.Annotation; import jakarta.el.ELContext; @@ -38,7 +37,6 @@ import org.apache.el.util.ReflectionUtil; */ public class MethodExpressionLiteral extends MethodExpression implements Externalizable { - @Serial private static final long serialVersionUID = 1L; private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0]; diff --git a/java/org/apache/el/ValueExpressionImpl.java b/java/org/apache/el/ValueExpressionImpl.java index a6a46c3321..2bd002a1c2 100644 --- a/java/org/apache/el/ValueExpressionImpl.java +++ b/java/org/apache/el/ValueExpressionImpl.java @@ -20,7 +20,6 @@ import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import java.io.Serial; import jakarta.el.ELContext; import jakarta.el.ELException; @@ -75,7 +74,6 @@ import org.apache.el.util.ReflectionUtil; */ public final class ValueExpressionImpl extends ValueExpression implements Externalizable { - @Serial private static final long serialVersionUID = 1L; private Class<?> expectedType; diff --git a/test/org/apache/el/TestValueExpressionImpl.java b/test/org/apache/el/TestValueExpressionImpl.java index 1df77e220f..cec9a2edc8 100644 --- a/test/org/apache/el/TestValueExpressionImpl.java +++ b/test/org/apache/el/TestValueExpressionImpl.java @@ -88,7 +88,7 @@ public class TestValueExpressionImpl { @Test public void testGetValueReferenceMethodCall() { ExpressionFactory factory = ExpressionFactory.newInstance(); - ELContext context = new ELContextImpl(); + ELContext context = new ELContextImpl(factory); TesterBeanM beanM = new TesterBeanM(); ValueExpression var = factory.createValueExpression(beanM, TesterBeanM.class); @@ -104,7 +104,7 @@ public class TestValueExpressionImpl { @Test public void testGetValueReferenceMethodCallResult() { ExpressionFactory factory = ExpressionFactory.newInstance(); - ELContext context = new ELContextImpl(); + ELContext context = new ELContextImpl(factory); TesterBeanM beanM = new TesterBeanM(); ValueExpression var = factory.createValueExpression(beanM, TesterBeanM.class); @@ -124,7 +124,7 @@ public class TestValueExpressionImpl { @Test public void testGetValueReferencePropertyThenMethodCall() { ExpressionFactory factory = ExpressionFactory.newInstance(); - ELContext context = new ELContextImpl(); + ELContext context = new ELContextImpl(factory); TesterBeanM beanM = new TesterBeanM(); ValueExpression var = factory.createValueExpression(beanM, TesterBeanM.class); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
