Author: markt
Date: Thu Feb 20 12:51:11 2014
New Revision: 1570175
URL: http://svn.apache.org/r1570175
Log:
Tomcat 8 requires Java 7 so make that the default compiler source and target
versions for JSP compilation.
Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1570175&r1=1570174&r2=1570175&view=diff
==============================================================================
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Thu Feb 20 12:51:11 2014
@@ -131,9 +131,9 @@
<!-- pages. See the jasper documentation for more -->
<!-- information. -->
<!-- -->
- <!-- compilerSourceVM Compiler source VM. [1.6] -->
+ <!-- compilerSourceVM Compiler source VM. [1.7] -->
<!-- -->
- <!-- compilerTargetVM Compiler target VM. [1.6] -->
+ <!-- compilerTargetVM Compiler target VM. [1.7] -->
<!-- -->
<!-- development Is Jasper used in development mode? If true, -->
<!-- the frequency at which JSPs are checked for -->
Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1570175&r1=1570174&r2=1570175&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Thu Feb 20
12:51:11 2014
@@ -132,12 +132,12 @@ public final class EmbeddedServletOption
/**
* Compiler target VM.
*/
- private String compilerTargetVM = "1.6";
+ private String compilerTargetVM = "1.7";
/**
* The compiler source VM.
*/
- private String compilerSourceVM = "1.6";
+ private String compilerSourceVM = "1.7";
/**
* The compiler class name.
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1570175&r1=1570174&r2=1570175&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Feb 20 12:51:11 2014
@@ -187,8 +187,8 @@ public class JspC extends Task implement
protected String compiler = null;
- protected String compilerTargetVM = "1.6";
- protected String compilerSourceVM = "1.6";
+ protected String compilerTargetVM = "1.7";
+ protected String compilerSourceVM = "1.7";
protected boolean classDebugInfo = true;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1570175&r1=1570174&r2=1570175&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Feb 20 12:51:11 2014
@@ -84,6 +84,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Change the default compiler source and compiler target versions to 1.7
+ since Tomcat 8 requires a minimum of Java 7. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="WebSocket">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
