This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2d90b7a9f598872ee0b82805ad0be50efd40c16a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 27 16:08:38 2023 +0000
Revert incorrect BZ 66491 fix
Revert parts of 57f5075a00d3c243d3ebe888f09b8b11b1fbc416
https://bz.apache.org/bugzilla/show_bug.cgi?id=66491
---
res/bnd/catalina.jar.tmp.bnd | 2 --
res/bnd/tomcat-embed-core.jar.tmp.bnd | 2 --
webapps/docs/changelog.xml | 11 +++--------
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index b8a0814a6c..7579a233b1 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -46,8 +46,6 @@ Export-Package: \
org.apache.catalina.manager.util,\
org.apache.catalina
--includeresource.meta-inf: /META-INF/=${tomcat.output}/manifests/catalina.jar/
-
-jpms-module-info: \
${module.name};\
access=32;\
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index e85c0b5204..2c0f8e7495 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -123,8 +123,6 @@ Provide-Capability: \
Implementation-Version=${servlet.spec.version}${servlet.revision};\
Implementation-Vendor=Apache Software Foundation
--includeresource.meta-inf:
/META-INF/=${tomcat.output}/manifests/tomcat-embed-core.jar/
-
-jpms-module-info: \
${module.name};\
access=32;\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index feaabd8985..06e690ea4a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -125,15 +125,10 @@
an HTTP request using the CONNECT method. (markt)
</update>
<fix>
- <bug>66491</bug>: Correct the BND configuration used by the build
script
- so that the provider configuration file required by Tomcat's custom URL
- protocol for WAR files is retained when adding OSGi meta-data. (markt)
+ <bug>66491</bug>: Revert the switch to using the ServiceLoader
mechanism
+ to load the custom URL protocol handlers that Tomcat uses. The original
+ system property based approach has been restored. (markt)
</fix>
- <update>
- Revert switch to using the ServiceLoader mechanism to load the custom
URL
- protocol handlers that Tomcat uses. The original system property based
- approach has been restored. (markt)
- </update>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
