This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 0db48d3f93 Review "Pin serialVersionUID in EL expression classes"
0db48d3f93 is described below
commit 0db48d3f93f5ca0d7b9156dbb8f993649eeafc3e
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Nov 5 13:24:12 2026 +0000
Review "Pin serialVersionUID in EL expression classes"
Don't break compatibility.
Add UID to additional classes that need it.
---
java/org/apache/el/MethodExpressionImpl.java | 2 +-
java/org/apache/el/MethodExpressionLiteral.java | 2 +-
java/org/apache/el/ValueExpressionImpl.java | 2 +-
java/org/apache/jasper/el/JspMethodExpression.java | 4 ++++
java/org/apache/jasper/el/JspValueExpression.java | 4 ++++
5 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/el/MethodExpressionImpl.java
b/java/org/apache/el/MethodExpressionImpl.java
index ec75d0eabb..47be8ee954 100644
--- a/java/org/apache/el/MethodExpressionImpl.java
+++ b/java/org/apache/el/MethodExpressionImpl.java
@@ -70,7 +70,7 @@ import org.apache.el.util.ReflectionUtil;
public final class MethodExpressionImpl extends MethodExpression implements
Externalizable {
@Serial
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 7625836928626978145L;
private Class<?> expectedType;
diff --git a/java/org/apache/el/MethodExpressionLiteral.java
b/java/org/apache/el/MethodExpressionLiteral.java
index 182ae8e02f..0302f8d674 100644
--- a/java/org/apache/el/MethodExpressionLiteral.java
+++ b/java/org/apache/el/MethodExpressionLiteral.java
@@ -39,7 +39,7 @@ import org.apache.el.util.ReflectionUtil;
public class MethodExpressionLiteral extends MethodExpression implements
Externalizable {
@Serial
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -3475757320946305522L;
private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new
Annotation[0];
private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
diff --git a/java/org/apache/el/ValueExpressionImpl.java
b/java/org/apache/el/ValueExpressionImpl.java
index def44a0b16..f76414652d 100644
--- a/java/org/apache/el/ValueExpressionImpl.java
+++ b/java/org/apache/el/ValueExpressionImpl.java
@@ -77,7 +77,7 @@ import org.apache.el.util.ReflectionUtil;
public final class ValueExpressionImpl extends ValueExpression implements
Externalizable {
@Serial
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1534424021831272939L;
private Class<?> expectedType;
diff --git a/java/org/apache/jasper/el/JspMethodExpression.java
b/java/org/apache/jasper/el/JspMethodExpression.java
index fddf3b8727..49226c96c2 100644
--- a/java/org/apache/jasper/el/JspMethodExpression.java
+++ b/java/org/apache/jasper/el/JspMethodExpression.java
@@ -20,6 +20,7 @@ import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import java.io.Serial;
import java.util.Objects;
import jakarta.el.ELContext;
@@ -36,6 +37,9 @@ import jakarta.el.PropertyNotFoundException;
*/
public final class JspMethodExpression extends MethodExpression implements
Externalizable {
+ @Serial
+ private static final long serialVersionUID = 5387881870932678316L;
+
private String mark;
private MethodExpression target;
diff --git a/java/org/apache/jasper/el/JspValueExpression.java
b/java/org/apache/jasper/el/JspValueExpression.java
index 25858ca70d..c431c53909 100644
--- a/java/org/apache/jasper/el/JspValueExpression.java
+++ b/java/org/apache/jasper/el/JspValueExpression.java
@@ -20,6 +20,7 @@ import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import java.io.Serial;
import java.util.Objects;
import jakarta.el.ELContext;
@@ -33,6 +34,9 @@ import jakarta.el.ValueExpression;
*/
public final class JspValueExpression extends ValueExpression implements
Externalizable {
+ @Serial
+ private static final long serialVersionUID = 6003098379712560193L;
+
private ValueExpression target;
private String mark;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
