Add some common JARs to the list of JARs to skip

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1095020 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/catalina.properties b/conf/catalina.properties
index e43fd03..f9aa1dd 100644 (file)
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
@@ -93,9 +93,9 @@ jasper.jar,jasper-el.jar,ecj-*.jar,\
 tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\
 tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
 commons-beanutils*.jar,commons-collections*.jar,commons-dbcp*.jar,\
-commons-digester*.jar,commons-fileupload*.jar,commons-logging*.jar,\
-commons-pool*.jar,\
-ant.jar,jmx.jar,jmx-tools.jar,\
+commons-digester*.jar,commons-fileupload*.jar,commons-io*.jar,\
+commons-logging*.jar,commons-math*.jar,commons-pool*.jar,\
+ant.jar,jmx.jar,hibernate*.jar,jmx-tools.jar,jta*.jar,log4j*.jar,slf4j*.jar\
 xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\
 dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar,sunpkcs11.jar,tools.jar,\
 apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar,dns_sd.jar,\

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9907347..e973b7c 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -74,6 +74,11 @@
         to MIME type mappings for MPEG 4 files. Based on a patch by Cédrik Lime.
         (markt)
       </fix>
+      <add>
+        Add some additional common JARs that do not contain TLDs or web
+        fragments to the list of JARs to skip when scanning for TLDs and web
+        fragments. (markt)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Coyote">