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
The following commit(s) were added to refs/heads/main by this push:
new eb69ef8402 Refine native resources metadata
eb69ef8402 is described below
commit eb69ef8402868a66ba7174ccd3d7adf90b1a4d4e
Author: Sébastien Deleuze <sdele...@vmware.com>
AuthorDate: Wed Nov 16 18:10:39 2022 +0100
Refine native resources metadata
This commit updates the native resources hints in order
to avoid classpath wide inclusion of resources.
It also removes from tomcat-embeded-core metadata 1.5M of
XSD and DTD servlet resources located in
jakarta/servlet/resources which now need to be configured
explicitly when needed.
---
modules/stuffed/tomcat-resource.json | 12 ++++++++----
.../tomcat-embed-core/native-image/tomcat-resource.json | 9 +++++----
res/graal/tomcat-embed-el/native-image/tomcat-resource.json | 6 ------
.../tomcat-embed-jasper/native-image/tomcat-resource.json | 6 ++----
.../native-image/tomcat-resource.json | 11 +----------
.../tomcat-embed-websocket/native-image/tomcat-resource.json | 6 ------
webapps/docs/changelog.xml | 5 +++++
7 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/modules/stuffed/tomcat-resource.json
b/modules/stuffed/tomcat-resource.json
index 96746e77b4..0c41918d60 100644
--- a/modules/stuffed/tomcat-resource.json
+++ b/modules/stuffed/tomcat-resource.json
@@ -73,9 +73,13 @@
{"name":"org.apache.tomcat.websocket.server.LocalStrings"}
],
"resources":[
- {"pattern":".*/mbeans-descriptors.xml$"},
- {"pattern":".*/*.properties$"},
- {"pattern":".*/*.dtd$"},
- {"pattern":".*/*.xsd$"}
+ {"pattern":"^org/apache/tomcat/.*mbeans-descriptors\\.xml$"},
+ {"pattern":"^org/apache/catalina/.*mbeans-descriptors\\.xml$"},
+ {"pattern":"^org/apache/coyote/.*mbeans-descriptors\\.xml$"},
+ {"pattern":"^org/apache/catalina/.*\\.properties$"},
+ {"pattern":"^jakarta/servlet/resources/.*"},
+ {"pattern":"^org/apache/tomcat/.*\\.dtd$"},
+ {"pattern":"^org/apache/jasper/.*mbeans-descriptors\\.xml$"},
+ {"pattern":"^jakarta/servlet/jsp/resources/.*"}
]
}
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 e356bab9fb..f10d8f2785 100644
--- a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
@@ -48,9 +48,10 @@
{"name":"org.apache.tomcat.util.threads.LocalStrings"}
],
"resources":[
- {"pattern":".*/mbeans-descriptors.xml$"},
- {"pattern":".*/*.properties$"},
- {"pattern":".*/*.dtd$"},
- {"pattern":".*/*.xsd$"}
+ {"pattern":"^org/apache/tomcat/.*mbeans-descriptors\\.xml$"},
+ {"pattern":"^org/apache/catalina/.*mbeans-descriptors\\.xml$"},
+ {"pattern":"^org/apache/coyote/.*mbeans-descriptors\\.xml$"},
+ {"pattern":"^org/apache/catalina/.*\\.properties$"},
+ {"pattern":"^org/apache/tomcat/.*\\.dtd$"}
]
}
diff --git a/res/graal/tomcat-embed-el/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-el/native-image/tomcat-resource.json
index 82e41a96f0..e94292424a 100644
--- a/res/graal/tomcat-embed-el/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-el/native-image/tomcat-resource.json
@@ -2,11 +2,5 @@
"bundles":[
{"name":"jakarta.el.LocalStrings"},
{"name":"org.apache.el.LocalStrings"}
- ],
- "resources":[
- {"pattern":".*/mbeans-descriptors.xml$"},
- {"pattern":".*/*.properties$"},
- {"pattern":".*/*.dtd$"},
- {"pattern":".*/*.xsd$"}
]
}
diff --git a/res/graal/tomcat-embed-jasper/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-jasper/native-image/tomcat-resource.json
index f8c661e6d8..fa339f838c 100644
--- a/res/graal/tomcat-embed-jasper/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-jasper/native-image/tomcat-resource.json
@@ -3,9 +3,7 @@
{"name":"org.apache.jasper.resources.LocalStrings"}
],
"resources":[
- {"pattern":".*/mbeans-descriptors.xml$"},
- {"pattern":".*/*.properties$"},
- {"pattern":".*/*.dtd$"},
- {"pattern":".*/*.xsd$"}
+ {"pattern":"^org/apache/jasper/.*mbeans-descriptors\\.xml$"},
+ {"pattern":"^jakarta/servlet/jsp/resources/.*"}
]
}
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 b084fa0b7a..ea7243d531 100644
--- a/res/graal/tomcat-embed-programmatic/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-programmatic/native-image/tomcat-resource.json
@@ -37,15 +37,6 @@
{"name":"org.apache.tomcat.util.threads.LocalStrings"}
],
"resources":[
- {"pattern":".*/Authenticators.properties$"},
- {"pattern":".*/MimeTypeMappings.properties$"},
- {"pattern":".*/catalina.properties$"},
- {"pattern":".*/CharsetMapperDefault.properties$"},
- {"pattern":".*/ServerInfo.properties$"},
- {"pattern":".*/RestrictedServlets.properties$"},
- {"pattern":".*/RestrictedListeners.properties$"},
- {"pattern":".*/RestrictedFilters.properties$"},
- {"pattern":".*/*.dtd$"},
- {"pattern":".*/*.xsd$"}
+ {"pattern":"^org/apache/catalina/.*\\.properties$"}
]
}
diff --git a/res/graal/tomcat-embed-websocket/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-websocket/native-image/tomcat-resource.json
index 60570692fc..b158949a9e 100644
--- a/res/graal/tomcat-embed-websocket/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-websocket/native-image/tomcat-resource.json
@@ -3,11 +3,5 @@
{"name":"org.apache.tomcat.websocket.LocalStrings"},
{"name":"org.apache.tomcat.websocket.pojo.LocalStrings"},
{"name":"org.apache.tomcat.websocket.server.LocalStrings"}
- ],
- "resources":[
- {"pattern":".*/mbeans-descriptors.xml$"},
- {"pattern":".*/*.properties$"},
- {"pattern":".*/*.dtd$"},
- {"pattern":".*/*.xsd$"}
]
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6cdd4ad845..0780339626 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -299,6 +299,11 @@
deprecated in Java 20 onwards, the reasons for deprecation are valid
for
all versions so move away from them now. (markt)
</scode>
+ <scode>
+ Refine the Tomcat native image metadata to avoid including unintended
+ non-Tomcat resources. Pull request <pr>569</pr> provided by Sébastien
+ Deleuze. (markt)
+ </scode>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
