On 19/03/2014 13:03, Konstantin Kolinko wrote: > 2014-03-19 12:45 GMT+04:00 <ma...@apache.org>: >> Author: markt >> Date: Wed Mar 19 08:45:02 2014 >> New Revision: 1579170 >> >> URL: http://svn.apache.org/r1579170 >> Log: (empty) > > 1. An empty svn log message
Fixed. > 2. The fix is OK, but I wonder how to better describe it in the changelog. > > According to documentation (jasper-howto, web.xml) "1.7" is already the > default. > I see that this changes the fallback for incorrect values. That default is set in EmbeddedServletOptions. Maybe modify the change log to say invalid values will be replaced by ... Mark > > I will be offline for the next 4 hours. > > Best regards, > Konstantin Kolinko >> >> Modified: >> tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java >> tomcat/trunk/webapps/docs/changelog.xml >> >> Modified: tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1579170&r1=1579169&r2=1579170&view=diff >> ============================================================================== >> --- tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java (original) >> +++ tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Wed Mar 19 >> 08:45:02 2014 >> @@ -335,12 +335,12 @@ public class JDTCompiler extends org.apa >> } else { >> log.warn("Unknown source VM " + opt + " ignored."); >> settings.put(CompilerOptions.OPTION_Source, >> - CompilerOptions.VERSION_1_5); >> + CompilerOptions.VERSION_1_7); >> } >> } else { >> - // Default to 1.5 >> + // Default to 1.7 >> settings.put(CompilerOptions.OPTION_Source, >> - CompilerOptions.VERSION_1_5); >> + CompilerOptions.VERSION_1_7); >> } >> >> // Target JVM >> @@ -376,14 +376,14 @@ public class JDTCompiler extends org.apa >> } else { >> log.warn("Unknown target VM " + opt + " ignored."); >> settings.put(CompilerOptions.OPTION_TargetPlatform, >> - CompilerOptions.VERSION_1_5); >> + CompilerOptions.VERSION_1_7); >> } >> } else { >> - // Default to 1.5 >> + // Default to 1.7 >> settings.put(CompilerOptions.OPTION_TargetPlatform, >> - CompilerOptions.VERSION_1_5); >> + CompilerOptions.VERSION_1_7); >> settings.put(CompilerOptions.OPTION_Compliance, >> - CompilerOptions.VERSION_1_5); >> + CompilerOptions.VERSION_1_7); >> } >> >> final IProblemFactory problemFactory = >> >> Modified: tomcat/trunk/webapps/docs/changelog.xml >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1579170&r1=1579169&r2=1579170&view=diff >> ============================================================================== >> --- tomcat/trunk/webapps/docs/changelog.xml (original) >> +++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 19 08:45:02 2014 >> @@ -198,6 +198,10 @@ >> is made to <code>ServletContext.setInitParameter()</code> after the >> ServletContext has been initialized. (markt) >> </fix> >> + <fix> >> + Make the default compiler source and target versions for JSPs Java 7 >> + since Tomcat 8 requires Java 7 as a minimum. (markt) >> + </fix> >> </changelog> >> </subsection> >> <subsection name="WebSocket"> >> >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
