Author: henrib
Date: Sat Jul 1 14:54:25 2017
New Revision: 1800511
URL: http://svn.apache.org/viewvc?rev=1800511&view=rev
Log:
JEXL-227: JexlScriptEngineFactory.getEngineVersion() should return actual
version
Modified:
commons/proper/jexl/trunk/RELEASE-NOTES.txt
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngineFactory.java
commons/proper/jexl/trunk/src/site/xdoc/changes.xml
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
Modified: commons/proper/jexl/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/RELEASE-NOTES.txt?rev=1800511&r1=1800510&r2=1800511&view=diff
==============================================================================
--- commons/proper/jexl/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/jexl/trunk/RELEASE-NOTES.txt Sat Jul 1 14:54:25 2017
@@ -34,6 +34,7 @@ Bugs Fixed in 3.2:
==================
* JEXL-231: Syntax for accessing List elements is not mentioned in docs
* JEXL-230: List literal is not mentioned in docs
+* JEXL-227: JexlScriptEngineFactory.getEngineVersion() should return
actual version
There are no other changes.
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngineFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngineFactory.java?rev=1800511&r1=1800510&r2=1800511&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngineFactory.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngineFactory.java
Sat Jul 1 14:54:25 2017
@@ -37,7 +37,7 @@ import org.apache.commons.jexl3.parser.S
* See
* <a
href="http://java.sun.com/javase/6/docs/api/javax/script/package-summary.html";>Java
Scripting API</a>
* Javadoc.
- *
+ *
* @since 2.0
*/
public class JexlScriptEngineFactory implements ScriptEngineFactory {
@@ -49,7 +49,7 @@ public class JexlScriptEngineFactory imp
@Override
public String getEngineVersion() {
- return "3.0"; // ensure this is updated if function changes are made
to this class
+ return "3.2"; // ensure this is updated if function changes are made
to this class
}
@Override
@@ -59,7 +59,7 @@ public class JexlScriptEngineFactory imp
@Override
public String getLanguageVersion() {
- return "3.0"; // TODO this should be derived from the actual version
+ return "3.2"; // TODO this should be derived from the actual version
}
@Override
Modified: commons/proper/jexl/trunk/src/site/xdoc/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/site/xdoc/changes.xml?rev=1800511&r1=1800510&r2=1800511&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/site/xdoc/changes.xml (original)
+++ commons/proper/jexl/trunk/src/site/xdoc/changes.xml Sat Jul 1 14:54:25 2017
@@ -35,6 +35,9 @@
<action dev="henrib" type="fix" issue="JEXL-230" due-to="Dmitri
Blinov">
List literal is not mentioned in docs
</action>
+ <action dev="henrib" type="fix" issue="JEXL-227" due-to="Dmitri
Blinov">
+ JexlScriptEngineFactory.getEngineVersion() should return
actual version
+ </action>
<action dev="henrib" type="add" issue="JEXL-226" due-to="Min Wei">
add ?? operator support
</action>
Modified:
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java?rev=1800511&r1=1800510&r2=1800511&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
(original)
+++
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
Sat Jul 1 14:54:25 2017
@@ -39,9 +39,9 @@ public class JexlScriptEngineTest extend
public void testScriptEngineFactory() throws Exception {
JexlScriptEngineFactory factory = new JexlScriptEngineFactory();
assertEquals("JEXL Engine", factory.getParameter(ScriptEngine.ENGINE));
- assertEquals("3.0", factory.getParameter(ScriptEngine.ENGINE_VERSION));
+ assertEquals("3.2", factory.getParameter(ScriptEngine.ENGINE_VERSION));
assertEquals("JEXL", factory.getParameter(ScriptEngine.LANGUAGE));
- assertEquals("3.0",
factory.getParameter(ScriptEngine.LANGUAGE_VERSION));
+ assertEquals("3.2",
factory.getParameter(ScriptEngine.LANGUAGE_VERSION));
assertNull(factory.getParameter("THREADING"));
assertEquals(NAMES, factory.getParameter(ScriptEngine.NAME));
assertEquals(EXTENSIONS, factory.getExtensions());
