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 a0c4bc3ccb Fix BZ 66491 - BND was removing config file required by
war: URL support
a0c4bc3ccb is described below
commit a0c4bc3ccb9ac225013380a42f84c3b9a802893a
Author: Mark Thomas <[email protected]>
AuthorDate: Sun Feb 26 17:30:08 2023 +0000
Fix BZ 66491 - BND was removing config file required by war: URL support
---
build.xml | 7 +++----
res/bnd/catalina.jar.tmp.bnd | 2 ++
res/bnd/tomcat-embed-core.jar.tmp.bnd | 2 ++
webapps/docs/changelog.xml | 11 ++++++++---
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index ccc18a4229..639d94faec 100644
--- a/build.xml
+++ b/build.xml
@@ -301,6 +301,7 @@
<include name="**/jakarta.servlet.ServletContainerInitializer"/>
<include name="**/jakarta.websocket.ContainerProvider"/>
<include
name="**/jakarta.websocket.server.ServerEndpointConfig$Configurator"/>
+ <include name="**/java.net.spi.URLStreamHandlerProvider"/>
<include name="**/.gitignore"/>
<include name="**/*.bnd"/>
<include name="**/*.classpath"/>
@@ -1045,16 +1046,14 @@
<filter token="annotation.revision" value="${annotation.revision}"/>
<mkdir dir="${tomcat.manifests}" />
- <copy todir="${tomcat.manifests}" overwrite="yes" filtering="yes"
- encoding="ISO-8859-1">
+ <copy todir="${tomcat.manifests}" overwrite="yes" filtering="yes"
encoding="ISO-8859-1">
<filterset refid="version.filters"/>
<fileset dir="${tomcat.home}/res/META-INF" />
</copy>
<!-- Ensure text files in JARs have consistent line endings. Required for
reproducible builds. -->
- <fixcrlf srcdir="${tomcat.manifests}" eol="lf"
- encoding="ISO-8859-1" fixlast="false" >
+ <fixcrlf srcdir="${tomcat.manifests}" eol="lf" encoding="ISO-8859-1"
fixlast="false" >
<patternset refid="text.files" />
</fixcrlf>
</target>
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 8720b37d7f..64bf062e35 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -49,6 +49,8 @@ Export-Package: \
-includepackage: \
org.apache.naming.factory.webservices
+-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 7e83e60f56..f964a1b610 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -124,6 +124,8 @@ 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 69685c67b3..621d701767 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -107,15 +107,20 @@
<section name="Tomcat 10.1.7 (markt)" rtext="in development">
<subsection name="Catalina">
<changelog>
- <update>
+ <add>
Add support for <code>txt:</code> and <code>rnd:</code> rewrite map
types from mod_rewrite. Based on a pull request <pr>591</pr>
- provided by Dimitrios Soumis. (markt)
- </update>
+ provided by Dimitrios Soumis. (remm)
+ </add>
<update>
Provide a more appropriate response (501 rather than 400) when
rejecting
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)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
