Quite annoyed with myself because I specifically looked for other things to merge across besides the dependency update, and missed it. Oh well. :(
Thanks again for sorting it. :) Jon On Mon, Mar 31, 2014 at 10:19 PM, Romain Manni-Bucau <[email protected]>wrote: > found it just because tracked the cause of the line just before which > was a tomcat error ;) > Romain Manni-Bucau > Twitter: @rmannibucau > Blog: http://rmannibucau.wordpress.com/ > LinkedIn: http://fr.linkedin.com/in/rmannibucau > Github: https://github.com/rmannibucau > > > > 2014-03-31 23:18 GMT+02:00 Jonathan Gallimore < > [email protected]>: > > Thanks for adding this - was just about to try and track it down but you > saved me a job. Didn't spot this change in trunk for some reason :(. > > > > Jon > > > > > > > >> On 31 Mar 2014, at 22:05, [email protected] wrote: > >> > >> Author: rmannibucau > >> Date: Mon Mar 31 21:05:22 2014 > >> New Revision: 1583464 > >> > >> URL: http://svn.apache.org/r1583464 > >> Log: > >> tomcat 7.0.53 upgrade from trunk was not correctly merged, adding some > things preventing TCKs to pass > >> > >> Modified: > >> > > tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java > >> > >> Modified: > tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java > >> URL: > http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1583464&r1=1583463&r2=1583464&view=diff > >> > ============================================================================== > >> --- > tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java > (original) > >> +++ > tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java > Mon Mar 31 21:05:22 2014 > >> @@ -1059,6 +1059,8 @@ public class TomcatWebAppBuilder impleme > >> > >> // breaks cdi > >> > standardContext.setTldValidation(Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.tld.validation", > "false"))); > >> + // breaks jstl > >> + > > standardContext.setXmlValidation(Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.xml.validation", > "false"))); > >> } > >> > >> /** > >> > >> >
