Author: kkolinko Date: Tue Jun 19 08:50:54 2012 New Revision: 1351607 URL: http://svn.apache.org/viewvc?rev=1351607&view=rev Log: Merged revision 1351604 from tomcat/trunk: Fix Checkstyle exclusion pattern for MANIFEST file of jdbc-pool module. The file does not pass validation because of trailing space characters on two lines, which are required by manifest file format.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1351604 Modified: tomcat/tc7.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1351607&r1=1351606&r2=1351607&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/build.xml (original) +++ tomcat/tc7.0.x/trunk/build.xml Tue Jun 19 08:50:54 2012 @@ -457,7 +457,6 @@ <exclude name="output/**"/> <exclude name="modules/**"/> <exclude name="**/*.mdl"/> - <exclude name="**/MANIFEST.MF"/> <exclude name="**/*_2.xml"/> <exclude name="res/checkstyle/header-al2.txt"/> <!-- Exclude auto-generated files --> @@ -477,6 +476,7 @@ </fileset> <fileset dir="modules/jdbc-pool" > <exclude name=".*/**"/> + <exclude name="**/MANIFEST.MF"/> <patternset refid="text.files" /> </fileset> </checkstyle> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org