tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1579171 - in /tomcat/tc7.0.x/trunk: java/org/apache/jasper/compiler/JDTCompiler.java webapps/docs/changelog.xml
Date Wed, 19 Mar 2014 08:46:33 GMT
Author: markt
Date: Wed Mar 19 08:46:32 2014
New Revision: 1579171

URL: http://svn.apache.org/r1579171
Log:
Make default Java version for JSPs Java 6

Modified:
    tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1579171&r1=1579170&r2=1579171&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Wed Mar 19 08:46:32
2014
@@ -336,12 +336,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_6);
             }
         } else {
-            // Default to 1.5
+            // Default to 1.6
             settings.put(CompilerOptions.OPTION_Source,
-                    CompilerOptions.VERSION_1_5);
+                    CompilerOptions.VERSION_1_6);
         }
         
         // Target JVM
@@ -377,14 +377,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_6);
             }
         } else {
-            // Default to 1.5
+            // Default to 1.6
             settings.put(CompilerOptions.OPTION_TargetPlatform,
-                    CompilerOptions.VERSION_1_5);
+                    CompilerOptions.VERSION_1_6);
             settings.put(CompilerOptions.OPTION_Compliance,
-                    CompilerOptions.VERSION_1_5);
+                    CompilerOptions.VERSION_1_6);
         }
 
         final IProblemFactory problemFactory = 

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1579171&r1=1579170&r2=1579171&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Mar 19 08:46:32 2014
@@ -144,6 +144,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 6
+        since Tomcat 7 requires Java 6 as a minimum. (markt) 
+      </fix>
     </changelog>
   </subsection>
   <subsection name="WebSocket">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message