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
commit deadbd1536a74885d961537f84307034dfde543f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 27 16:16:41 2023 +0000
Revert "Fix BZ 66491 - BND was removing config file required by war: URL
support"
This reverts commit a0c4bc3ccb9ac225013380a42f84c3b9a802893a.
---
build.xml | 7 ++++---
res/bnd/catalina.jar.tmp.bnd | 2 --
res/bnd/tomcat-embed-core.jar.tmp.bnd | 2 --
webapps/docs/changelog.xml | 18 ++++++------------
4 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/build.xml b/build.xml
index 1469bb6b22..a606cde065 100644
--- a/build.xml
+++ b/build.xml
@@ -301,7 +301,6 @@
<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"/>
@@ -1046,14 +1045,16 @@
<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 64bf062e35..8720b37d7f 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -49,8 +49,6 @@ 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 f964a1b610..7e83e60f56 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -124,8 +124,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 5742fa03e0..fc57364d7f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -115,25 +115,19 @@
</subsection>
<subsection name="Catalina">
<changelog>
- <add>
+ <update>
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. (remm)
- </add>
+ provided by Dimitrios Soumis. (markt)
+ </update>
<update>
Provide a more appropriate response (501 rather than 400) when
rejecting
an HTTP request using the CONNECT method. (markt)
</update>
<fix>
- <bug>66488</bug>: Correct a regression introduced in the fix for bug
- <bug>66196</bug> that meant that the HTTP headers and/or request line
- could get corrupted (one part overwriting another part) within a single
- request. (markt)
- </fix>
- <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>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
