incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1591918 - /sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java
Date Fri, 02 May 2014 14:05:21 GMT
Author: cziegeler
Date: Fri May  2 14:05:20 2014
New Revision: 1591918

URL: http://svn.apache.org/r1591918
Log:
SLING-3405 : SLING2094Test and ServerSideScriptsTest fail with java 8: JSP compiler does not
find java.util.Arrays or java.lang.CharSequence

Modified:
    sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java

Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java?rev=1591918&r1=1591917&r2=1591918&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java
(original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java
Fri May  2 14:05:20 2014
@@ -40,8 +40,8 @@ public class JspServletOptions implement
     /** default log */
     private static final Logger log = LoggerFactory.getLogger(JspServletOptions.class);
 
-    /** Default source and target VM version (value is "1.5"). */
-    private static final String DEFAULT_VM_VERSION = "1.5";
+    /** Default source and target VM version (value is "1.6"). */
+    private static final String DEFAULT_VM_VERSION = "1.6";
 
     private Properties settings = new Properties();
 
@@ -307,7 +307,7 @@ public class JspServletOptions implement
             IOProvider ioProvider, ComponentContext componentContext,
             TldLocationsCache tldLocationsCache) {
 
-        // JVM version numbers default to 1.5
+        // JVM version numbers default to 1.6
         this.compilerSourceVM = DEFAULT_VM_VERSION;
         this.compilerTargetVM = DEFAULT_VM_VERSION;
 



Mime
View raw message