[tomcat] branch 9.0.x updated: jarsToSkip += derby-*.jar

[ma...@apache.org]

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 24f6bcd  jarsToSkip += derby-*.jar
24f6bcd is described below

commit 24f6bcd11ea6a969cb50ee0074a92c28512b7e28
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 3 09:02:05 2021 +0100

    jarsToSkip += derby-*.jar
---
 conf/catalina.properties   | 1 +
 webapps/docs/changelog.xml | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/conf/catalina.properties b/conf/catalina.properties
index cff2aa2..918f8f1 100644
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
@@ -134,6 +134,7 @@ commons-lang*.jar,\
 commons-logging*.jar,\
 commons-math*.jar,\
 commons-pool*.jar,\
+derby-*.jar,\
 dom4j-*.jar,\
 easymock-*.jar,\
 ecj-*.jar,\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 223b6ec..bfc418d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -148,6 +148,10 @@
         contents, and add an option to have it be static, similar to the other
         realms. (remm)
       </fix>
+      <add>
+        Add <code>derby-*.jar</code> to the list of JARs to skip when scanning
+        for TLDs, web fragments and annotations. (markt)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Coyote">

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org