[tomcat] branch 10.0.x updated: Remove catalina ssi from catalina.jar.tmp.bnd file

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.0.x by this push:
     new 4f9f1ef  Remove catalina ssi from catalina.jar.tmp.bnd file
4f9f1ef is described below

commit 4f9f1ef99b95edf54930206bcfff89fed0c7ed2b
Author: Hui Wang <hu...@redhat.com>
AuthorDate: Fri Sep 3 15:27:28 2021 +0800

    Remove catalina ssi from catalina.jar.tmp.bnd file
---
 res/bnd/catalina.jar.tmp.bnd | 1 -
 webapps/docs/changelog.xml   | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 972745c..181e69f 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -33,7 +33,6 @@ Export-Package: \
     org.apache.catalina.security,\
     org.apache.catalina.servlets,\
     org.apache.catalina.session,\
-    org.apache.catalina.ssi,\
     org.apache.catalina.startup,\
     org.apache.catalina.users,\
     org.apache.catalina.util,\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fea61de..72267af 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -152,6 +152,10 @@
         Add <code>derby-*.jar</code> to the list of JARs to skip when scanning
         for TLDs, web fragments and annotations. (markt)
       </add>
+      <fix>
+        <pr>447</pr>. Correct JPMS metadata for catalina.jar. Pull request
+        provided by Hui Wang. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org