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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 25ca8a03bf Correct JPMS and OSGi meta-data for tomcat-enbed-core.jar
25ca8a03bf is described below

commit 25ca8a03bfc2d75c7c581bb6555c35a7eef4f707
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 15 08:40:38 2024 +0000

    Correct JPMS and OSGi meta-data for tomcat-enbed-core.jar
    
    Remove reference to org.apache.catalina.ssi package that is no longer
    included in the JAR.
    
    Based on pull request #684 by Jendrik Johannes
---
 res/bnd/tomcat-embed-core.jar.tmp.bnd |  1 -
 webapps/docs/changelog.xml            | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd 
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 7e83e60f56..558c2b43d6 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -38,7 +38,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 9b16f0fd0b..a509a06dc1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,16 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 10.1.19 (schultz)" rtext="in development">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        Correct JPMS and OSGi meta-data for <code>tomcat-enbed-core.jar</code>
+        by removing reference to <code>org.apache.catalina.ssi</code> package
+        that is no longer included in the JAR. Based on pull request
+        <pr>684</pr> by Jendrik Johannes. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Coyote">
     <changelog>
       <fix>


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

Reply via email to