Corrected typo in the value of tomcat.util.scan.DefaultJarScanner.jarsToSkip property

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

diff --git a/conf/catalina.properties b/conf/catalina.properties
index dc28bd9..e00d277 100644 (file)
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
@@ -93,7 +93,7 @@ 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,\
 tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
-tomcat-jdbc.jar\
+tomcat-jdbc.jar,\
 commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,\
 commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\
 commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f2e61b3..5017d22 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -53,6 +53,18 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues to not "pop up" wrt. others).
 -->
+<section name="Tomcat 7.0.20 (markt)">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        Corrected missing comma in the value of <code>jarsToSkip</code>
+        property in <code>conf/catalina.properties</code> file, which
+        caused tomcat-jdbc.jar and commons-beanutils*.jar to be not
+        ignored when scanning jars for tag libraries. (kkolinko)
+      </fix>
+    </changelog>
+  </subsection>
+</section>
 <section name="Tomcat 7.0.19 (markt)">
   <subsection name="Catalina">
     <changelog>