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/07/21 09:05:56 UTC

[tomcat] branch 9.0.x updated: Fix regression in fix for BZ 64540.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 1366462  Fix regression in fix for BZ 64540.
1366462 is described below

commit 13664621a2b4c9af09641a69438b2cf411238ca4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 21 10:04:19 2020 +0100

    Fix regression in fix for BZ 64540.
    
    Export additional packages,
---
 res/bnd/tomcat-coyote.jar.tmp.bnd |  6 +++---
 webapps/docs/changelog.xml        | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/res/bnd/tomcat-coyote.jar.tmp.bnd b/res/bnd/tomcat-coyote.jar.tmp.bnd
index 6d0ee68..0f9314a 100644
--- a/res/bnd/tomcat-coyote.jar.tmp.bnd
+++ b/res/bnd/tomcat-coyote.jar.tmp.bnd
@@ -33,16 +33,16 @@ Export-Package: \
     org.apache.tomcat.util.http.parser,\
     org.apache.tomcat.util.log,\
     org.apache.tomcat.util.modeler,\
+    org.apache.tomcat.util.modeler.modules,\
     org.apache.tomcat.util.net,\
+    org.apache.tomcat.util.net.jsse,\
     org.apache.tomcat.util.net.openssl,\
     org.apache.tomcat.util.net.openssl.ciphers
 
 -includepackage: \
     org.apache.tomcat.util.bcel,\
     org.apache.tomcat.util.http.fileupload.impl,\
-    org.apache.tomcat.util.http.fileupload.util.mime,\
-    org.apache.tomcat.util.modeler.modules,\
-    org.apache.tomcat.util.net.jsse
+    org.apache.tomcat.util.http.fileupload.util.mime
 
 -jpms-module-info: \
     ${module.name};\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 11916b2..cc357a1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,6 +103,16 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        Correct a regression in the fix for <bug>64540</bug> and include
+        <code>org.apache.tomcat.util.modeler.modules</code> and
+        <code>org.apache.tomcat.util.net.jsse</code> in the list of exported
+        packages. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 9.0.37 (markt)" rtext="2020-07-05">
   <subsection name="Catalina">


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