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 8a74961481 Fix references to the org.apache.tomcat.util.threads.res
package
8a74961481 is described below
commit 8a74961481141755af83c8b242f53ccb06d33fd1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 15 14:49:15 2022 +0100
Fix references to the org.apache.tomcat.util.threads.res package
The files were moved to org.apache.tomcat.util.threads
---
res/bnd/tomcat-embed-core.jar.tmp.bnd | 3 +--
res/bnd/tomcat-util.jar.tmp.bnd | 3 +--
res/graal/tomcat-embed-core/native-image/tomcat-resource.json | 2 +-
.../tomcat-embed-programmatic/native-image/tomcat-resource.json | 2 +-
webapps/docs/changelog.xml | 7 +++++++
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index c41a851dde..7b9966416b 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -93,8 +93,7 @@ Export-Package: \
org.apache.tomcat.util.bcel,\
org.apache.tomcat.util.http.fileupload.util.mime,\
org.apache.tomcat.util.json,\
- org.apache.tomcat.util.net.jsse,\
- org.apache.tomcat.util.threads.res
+ org.apache.tomcat.util.net.jsse
-includeresource.notice2:
META-INF/NOTICE=${tomcat.output}/manifests/servlet-api.jar.notice
-includeresource.license2:
META-INF/LICENSE=${tomcat.output}/manifests/servlet-api.jar.license
diff --git a/res/bnd/tomcat-util.jar.tmp.bnd b/res/bnd/tomcat-util.jar.tmp.bnd
index 1a36c40674..f687924d3b 100644
--- a/res/bnd/tomcat-util.jar.tmp.bnd
+++ b/res/bnd/tomcat-util.jar.tmp.bnd
@@ -29,8 +29,7 @@ Export-Package: \
org.apache.tomcat.util.threads
-includepackage: \
- org.apache.tomcat.util.json,\
- org.apache.tomcat.util.threads.res
+ org.apache.tomcat.util.json
-jpms-module-info: \
${module.name};\
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
index 4b5cc5d34f..e23572b6e8 100644
--- a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
@@ -45,7 +45,7 @@
{"name":"org.apache.tomcat.util.net.LocalStrings"},
{"name":"org.apache.tomcat.util.scan.LocalStrings"},
{"name":"org.apache.tomcat.util.security.LocalStrings"},
- {"name":"org.apache.tomcat.util.threads.res.LocalStrings"}
+ {"name":"org.apache.tomcat.util.threads.LocalStrings"}
],
"resources":[
{"pattern":".*/mbeans-descriptors.xml$"},
diff --git
a/res/graal/tomcat-embed-programmatic/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-programmatic/native-image/tomcat-resource.json
index bf5ca8068e..135d134f92 100644
--- a/res/graal/tomcat-embed-programmatic/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-programmatic/native-image/tomcat-resource.json
@@ -34,7 +34,7 @@
{"name":"org.apache.tomcat.util.net.LocalStrings"},
{"name":"org.apache.tomcat.util.scan.LocalStrings"},
{"name":"org.apache.tomcat.util.security.LocalStrings"},
- {"name":"org.apache.tomcat.util.threads.res.LocalStrings"}
+ {"name":"org.apache.tomcat.util.threads.LocalStrings"}
],
"resources":[
{"pattern":".*/Authenticators.properties$"},
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3b8fdfd1a8..eca857cc50 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -172,6 +172,13 @@
Update the packaged version of the Tomcat Native Library to 1.2.34 to
improve the support for building with OpenSSL 3.0.x.(markt)
</update>
+ <fix>
+ Remove and/or update references to the removed
+ <code>org.apache.tomcat.util.threads.res</code> package. The
+ <code>LocalStrings*.properties</code> files in that package were moved
+ to <code>org.apache.tomcat.util.threads</code> package for consistency
+ with the rest of the Tomcat code base.
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
