[tomcat] branch 8.5.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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new f9138ce  jarsToSkip += derby-*.jar
f9138ce is described below

commit f9138ce7cceea15b0041ec123a209c66c56f35b3
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 dc2186f..a3f7349 100644
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
@@ -135,6 +135,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 cc61240..c3b7d5c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,10 @@
         scheme specific check can be performed. Based on pull request
         <pr>444</pr> by Robert Rodewald. (markt)
       </scode>
+      <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