You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/07/03 09:15:46 UTC
svn commit: r1607547 -
/sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerOptions.java
Author: cziegeler
Date: Thu Jul 3 07:15:46 2014
New Revision: 1607547
URL: http://svn.apache.org/r1607547
Log:
SLING-3724 : Provide option to always use current vm version for source and target
Modified:
sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerOptions.java
Modified: sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerOptions.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerOptions.java?rev=1607547&r1=1607546&r2=1607547&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerOptions.java (original)
+++ sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerOptions.java Thu Jul 3 07:15:46 2014
@@ -31,6 +31,7 @@ public class CompilerOptions extends Opt
* the component configuration.
*/
public static CompilerOptions createOptions(final Dictionary<String, Object> props) {
+ final String currentVersion = System.getProperty("java.specification.version");
final CompilerOptions opts = new CompilerOptions();
final Boolean classDebugInfo = (Boolean)props.get(JavaScriptEngineFactory.PROPERTY_CLASSDEBUGINFO);
@@ -39,13 +40,13 @@ public class CompilerOptions extends Opt
final String sourceVM = (String) props.get(JavaScriptEngineFactory.PROPERTY_COMPILER_SOURCE_V_M);
opts.put(Options.KEY_SOURCE_VERSION, sourceVM != null && sourceVM.trim().length() > 0 ? sourceVM.trim() : JavaScriptEngineFactory.VERSION_AUTO);
if ( JavaScriptEngineFactory.VERSION_AUTO.equalsIgnoreCase((String)opts.get(Options.KEY_SOURCE_VERSION)) ) {
- opts.put(Options.KEY_SOURCE_VERSION, System.getProperty("java.vm.specification.version"));
+ opts.put(Options.KEY_SOURCE_VERSION, currentVersion);
}
final String targetVM = (String) props.get(JavaScriptEngineFactory.PROPERTY_COMPILER_TARGET_V_M);
opts.put(Options.KEY_TARGET_VERSION, targetVM != null && targetVM.trim().length() > 0 ? targetVM.trim() : JavaScriptEngineFactory.VERSION_AUTO);
if ( JavaScriptEngineFactory.VERSION_AUTO.equalsIgnoreCase((String)opts.get(Options.KEY_TARGET_VERSION)) ) {
- opts.put(Options.KEY_TARGET_VERSION, System.getProperty("java.vm.specification.version"));
+ opts.put(Options.KEY_TARGET_VERSION, currentVersion);
}
final String encoding = (String) props.get(JavaScriptEngineFactory.PROPERTY_ENCODING);