And finally , the updated diff for 8.5.x Again, sorry for the incomplete earlier patches.
Index: res/rat/rat-excludes.txt =================================================================== --- res/rat/rat-excludes.txt (revision 1762203) +++ res/rat/rat-excludes.txt (working copy) @@ -73,6 +73,8 @@ output/dist/src/test/webresources/dir1/d1/d1-f1.txt output/dist/src/test/webresources/dir1/d2/d2-f1.txt output/dist/src/test/webresources/dir1/*.txt +output/test-tmp/** +test/webapp/index.html.br test/webapp/bug53257/*.txt test/webapp/bug53257/foo bar/foobar.txt test/webapp-fragments/WEB-INF/classes/*.txt Gav... > -----Original Message----- > From: ma...@apache.org [mailto:ma...@apache.org] > Sent: Sunday, September 25, 2016 7:23 PM > To: dev@tomcat.apache.org > Subject: svn commit: r1762169 - in /tomcat/tc8.5.x/trunk: ./ res/rat/rat- > excludes.txt webapps/docs/changelog.xml > > Author: markt > Date: Sun Sep 25 09:23:29 2016 > New Revision: 1762169 > > URL: http://svn.apache.org/viewvc?rev=1762169&view=rev > Log: > Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60170 > Exclude the compressed test file index.html.br from RAT analysis. > Patch provided by Gavin McDonald. > > Modified: > tomcat/tc8.5.x/trunk/ (props changed) > tomcat/tc8.5.x/trunk/res/rat/rat-excludes.txt > tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml > > Propchange: tomcat/tc8.5.x/trunk/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sun Sep 25 09:23:29 2016 > @@ -1 +1 @@ > - > /tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1 > 735577,1735597,1735599- > 1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,173648 > 9,1736646,1736703,1736836,1736849,1737104- > 1737105,1737112,1737117,1737119- > 1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,173771 > 5,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,17380 > 14-1738015,1738018,1738022,1738039,1738043,1738059- > 1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623- > 1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953- > 1738954,1738979,1738982,1739079- > 1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,173972 > 6,1739762,1739775,1739814,1739817- > 1739818,1739975,1740131,1740324,1740465,1740495,1740508- > 1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,174099 > 1,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,17411 > 59,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741 > 221,1741225,1741232,1741409,1741501 > > ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,174209 > 3,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,17421 > 84,1742187,1742246,1742248-1742251,1742263- > 1742264,1742268,1742276,1742369,1742387,1742448,1742509- > 1742512,1742917,1742919,1742933,1742975- > 1742976,1742984,1742986,1743019,1743115,1743117,1743124- > 1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700- > 1743701,1744058,1744064- > 1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,174469 > 7,1744705,1744713,1744760,1744786,1745083,1745142- > 1745143,1745145,1745177,1745179- > 1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,174573 > 5,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340- > 1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495- > 1746496,1746499-1746501,1746503- > 1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,174662 > 0,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,17472 > 25,1747234,1747253,1747404,1747506,1747536,1747 > > 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,174 > 8715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665- > 1749666,1749763,1749865- > 1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,175061 > 7,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,17507 > 23,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751 > 447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,175 > 3363,1754111,1754140- > 1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,175453 > 2-1754533,1754613,1754714,1754874,1754941,1754944,1754950- > 1754951,1755005,1755007,1755009,1755132,1755180- > 1755181,1755185,1755190,1755204- > 1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646- > 1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,175573 > 1-1755737,1755812,1755828,1755884,1755890,1755918- > 1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,175603 > 9,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 > 756778,1756798,1756878,1756898,1756939,1757123- > 1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167- > 1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,175735 > 3- > 1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,175749 > 9,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,17580 > 72-1758075,1758078-1758079,1758292,1758369,1758423,1758425- > 1758427,1758430,1758459,1758483,1758486- > 1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,175901 > 9,1759212,1759224,1759227,1759252,1759274,1759513- > 1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,176064 > 0,1760648,1761057,1761422,1761491,1761498,1761500- > 1761501,1761550,1761553,1761572,1761574,1761625- > 1761626,1761628,1761682,1761740,1761752,1762123 > +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480 > ,1 > +735577,1735597,1735599- > 1735600,1735615,1736145,1736162,1736209,1736280, > +1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104- > 1737105 > +,1737112,1737117,1737119- > 1737120,1737155,1737157,1737192,1737280,173733 > +9,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,173 > 79 > +59,1738005,1738007,1738014- > 1738015,1738018,1738022,1738039,1738043,1738 > +059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623- > 173 > +8625,1738643,1738816,1738850,1738855,1738946-1738948,1738953- > 1738954,17 > +38979,1738982,1739079- > 1739081,1739087,1739113,1739153,1739172,1739176,1 > +739191,1739474,1739726,1739762,1739775,1739814,1739817- > 1739818,1739975, > +1740131,1740324,1740465,1740495,1740508- > 1740509,1740520,1740535,1740707 > +,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741 > 03 > +6,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,174 > 11 > +90,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,17 > 41 > +501 > > ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,174209 > 3,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,17421 > 84,1742187,1742246,1742248-1742251,1742263- > 1742264,1742268,1742276,1742369,1742387,1742448,1742509- > 1742512,1742917,1742919,1742933,1742975- > 1742976,1742984,1742986,1743019,1743115,1743117,1743124- > 1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700- > 1743701,1744058,1744064- > 1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,174469 > 7,1744705,1744713,1744760,1744786,1745083,1745142- > 1745143,1745145,1745177,1745179- > 1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,174573 > 5,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340- > 1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495- > 1746496,1746499-1746501,1746503- > 1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,174662 > 0,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,17472 > 25,1747234,1747253,1747404,1747506,1747536,1747 > > 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,174 > 8715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665- > 1749666,1749763,1749865- > 1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,175061 > 7,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,17507 > 23,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751 > 447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,175 > 3363,1754111,1754140- > 1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,175453 > 2-1754533,1754613,1754714,1754874,1754941,1754944,1754950- > 1754951,1755005,1755007,1755009,1755132,1755180- > 1755181,1755185,1755190,1755204- > 1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646- > 1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,175573 > 1-1755737,1755812,1755828,1755884,1755890,1755918- > 1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,175603 > 9,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 > 756778,1756798,1756878,1756898,1756939,1757123- > 1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167- > 1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,175735 > 3- > 1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,175749 > 9,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,17580 > 72-1758075,1758078-1758079,1758292,1758369,1758423,1758425- > 1758427,1758430,1758459,1758483,1758486- > 1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,175901 > 9,1759212,1759224,1759227,1759252,1759274,1759513- > 1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,176064 > 0,1760648,1761057,1761422,1761491,1761498,1761500- > 1761501,1761550,1761553,1761572,1761574,1761625- > 1761626,1761628,1761682,1761740,1761752,1762123,1762168 > > Modified: tomcat/tc8.5.x/trunk/res/rat/rat-excludes.txt > URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/rat/rat- > excludes.txt?rev=1762169&r1=1762168&r2=1762169&view=diff > ========================================================== > ==================== > --- tomcat/tc8.5.x/trunk/res/rat/rat-excludes.txt (original) > +++ tomcat/tc8.5.x/trunk/res/rat/rat-excludes.txt Sun Sep 25 09:23:29 > +++ 2016 > @@ -66,6 +66,7 @@ output/deployer/deployer-howto.html > output/dist/webapps/docs/*/package-list > output/dist/webapps/docs/*/script.js > > +output/dist/src/test/webapp/index.html.br > output/dist/src/test/webapp/bug53257/*.txt > output/dist/src/test/webapp/bug53257/foo bar/foobar.txt > output/dist/src/test/webapp-fragments/WEB-INF/classes/*.txt > > Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml > URL: > http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changel > og.xml?rev=1762169&r1=1762168&r2=1762169&view=diff > ========================================================== > ==================== > --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) > +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Sun Sep 25 09:23:29 > +++ 2016 > @@ -89,6 +89,11 @@ > <code>ResourceLink</code> fails to specify the type, specifies an > unknown type or specifies the wrong type. (markt) > </add> > + <fix> > + <bug>60170</bug>: Exclude the compressed test file > + <code>index.html.br</code> from RAT analysis. Patch provided by > Gavin > + McDonald. (markt) > + </fix> > </changelog> > </subsection> > <subsection name="Coyote"> > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional > commands, e-mail: dev-h...@tomcat.apache.org > > > > ----- > No virus found in this message. > Checked by AVG - www.avg.com > Version: 2016.0.7797 / Virus Database: 4656/13079 - Release Date: 09/25/16 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
