This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3d2e5cad9778621cbf3f8452eafb2e12e9ec8323
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Nov 2 19:53:05 2020 +0000
Fix BZ 64849 JPMS provides/uses for EL
---
java/javax/el/ExpressionFactory.java | 3 +++
java/org/apache/el/ExpressionFactoryImpl.java | 1 +
res/checkstyle/javax-import-control.xml | 1 +
webapps/docs/changelog.xml | 4 ++++
4 files changed, 9 insertions(+)
diff --git a/java/javax/el/ExpressionFactory.java
b/java/javax/el/ExpressionFactory.java
index 9158e12..2f42de7 100644
--- a/java/javax/el/ExpressionFactory.java
+++ b/java/javax/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=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 e32eced..c4b97cd 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 [ja...@hookom.net]
*/
+@aQute.bnd.annotation.spi.ServiceProvider(value=ExpressionFactory.class)
public class ExpressionFactoryImpl extends ExpressionFactory {
/**
diff --git a/res/checkstyle/javax-import-control.xml
b/res/checkstyle/javax-import-control.xml
index 010f511..3ce4303 100644
--- a/res/checkstyle/javax-import-control.xml
+++ b/res/checkstyle/javax-import-control.xml
@@ -21,6 +21,7 @@
<import-control pkg="javax">
<allow pkg="java"/>
+ <allow pkg="aQute.bnd.annotation.spi"/>
<subpackage name="annotation">
<allow pkg="javax.annotation"/>
</subpackage>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 781e31b..f82492b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,6 +147,10 @@
<update>
Update to the Eclipse JDT compiler 4.17. (markt)
</update>
+ <fix>
+ <bug>64849</bug>: Correct JPMS metadata for the Jakarta Expression
+ Langauge JARs to provide missing ServiceLoader information. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
