You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/11/03 18:46:38 UTC
[tomcat] 03/04: Fix BZ 64849 JPMS provides/uses for EL
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9d3896a434e35cf8e9ebf1c95a81e1fcb739866e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Nov 2 19:53:05 2020 +0000
Fix BZ 64849 JPMS provides/uses for EL
Note this has exposed an issue with the JPMS module-info.class for
org.apache.tomcat.jasper.el
---
java/jakarta/el/ExpressionFactory.java | 3 +++
java/org/apache/el/ExpressionFactoryImpl.java | 1 +
res/checkstyle/jakarta-import-control.xml | 1 +
3 files changed, 5 insertions(+)
diff --git a/java/jakarta/el/ExpressionFactory.java b/java/jakarta/el/ExpressionFactory.java
index b1ffccc..dd17ddd 100644
--- a/java/jakarta/el/ExpressionFactory.java
+++ b/java/jakarta/el/ExpressionFactory.java
@@ -36,10 +36,13 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import aQute.bnd.annotation.spi.ServiceConsumer;
+
/**
*
* @since 2.1
*/
+@ServiceConsumer(value=jakarta.el.ExpressionFactory.class)
public abstract class ExpressionFactory {
private static final boolean IS_SECURITY_ENABLED =
diff --git a/java/org/apache/el/ExpressionFactoryImpl.java b/java/org/apache/el/ExpressionFactoryImpl.java
index 3ce47ad..719cd45 100644
--- a/java/org/apache/el/ExpressionFactoryImpl.java
+++ b/java/org/apache/el/ExpressionFactoryImpl.java
@@ -33,6 +33,7 @@ import org.apache.el.util.MessageFactory;
*
* @author Jacob Hookom [jacob@hookom.net]
*/
+@aQute.bnd.annotation.spi.ServiceProvider(value=jakarta.el.ExpressionFactory.class)
public class ExpressionFactoryImpl extends ExpressionFactory {
/**
diff --git a/res/checkstyle/jakarta-import-control.xml b/res/checkstyle/jakarta-import-control.xml
index 572c6a7..ceee9ae 100644
--- a/res/checkstyle/jakarta-import-control.xml
+++ b/res/checkstyle/jakarta-import-control.xml
@@ -21,6 +21,7 @@
<import-control pkg="jakarta">
<allow pkg="java"/>
+ <allow pkg="aQute.bnd.annotation.spi"/>
<subpackage name="annotation">
<allow pkg="jakarta.annotation"/>
</subpackage>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org