This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git


The following commit(s) were added to refs/heads/master by this push:
     new afd342b  Standardize on American English spelling of 'behavior'.
afd342b is described below

commit afd342beabb846930799d5ab1db8bd1702938af3
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Mar 30 14:00:38 2020 -0400

    Standardize on American English spelling of 'behavior'.
---
 RELEASE-NOTES.txt                                                     | 4 ++--
 src/site/xdoc/changes.xml                                             | 2 +-
 src/site/xdoc/reference/syntax.xml                                    | 2 +-
 src/test/java/org/apache/commons/jexl3/JexlTest.java                  | 2 +-
 .../java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 4249085..26297b3 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -349,7 +349,7 @@ Bugs fixed in 2.0:
 
 * JEXL-90:     JEXL parser allows invalid expressions, e.g. "a=1 b=2 3"
 * JEXL-88:     MethodKey.java - name clash getMostSpecific() with Java 1.5.0
-* JEXL-87:     Inconsistent behaviour of arithmetical operations
+* JEXL-87:     Inconsistent behavior of arithmetical operations
 * JEXL-81:     Introspector does not use ListGetExecutor for List
 * JEXL-80:     Lenient mode should not throw exception when {g,s}etting an 
undefined property
 * JEXL-78:     Ternary operator throws Exception when JexlEngine in strict mode
@@ -357,7 +357,7 @@ Bugs fixed in 2.0:
 * JEXL-71:     Parsing errors?
 * JEXL-67:     Potential NPE in util.introspection.MethodKey
 * JEXL-66:     testDottedNames expects map enumeration order
-* JEXL-64:     Inconsistent behaviour of dotted names
+* JEXL-64:     Inconsistent behavior of dotted names
 * JEXL-62:     NPE in Interpreter
 * JEXL-59:     ClassMap holds a reference to class
 * JEXL-56:     Logging wrongly uses java.util.logging
diff --git a/src/site/xdoc/changes.xml b/src/site/xdoc/changes.xml
index 83c6b23..281d8d4 100644
--- a/src/site/xdoc/changes.xml
+++ b/src/site/xdoc/changes.xml
@@ -628,7 +628,7 @@
             <action dev="dion" type="fix" issue="JEXL-32" due-to="Kedar 
Dave">BigDecimal values are treated as Long values which results in loss of 
precision</action>
             <action dev="dion" type="fix" issue="JEXL-33">Remove unnecessary 
throws Exception from various classes</action>
             <action dev="henrib" type="fix" issue="JEXL-50" due-to="sebb">Div 
operator does not do integer division</action>
-            <action dev="henrib" type="fix" issue="JEXL-87" 
due-to="sebb">Inconsistent behaviour of arithmetical operations</action>
+            <action dev="henrib" type="fix" issue="JEXL-87" 
due-to="sebb">Inconsistent behavior of arithmetical operations</action>
             <action dev="henrib" type="fix" issue="JEXL-21" 
due-to="AC">operator overloading / hooks on operator processing</action>
             <action dev="henrib" type="add">&quot;new&quot; operator 
support</action>
             <action dev="henrib" type="add">Support Unicode escapes in string 
literals</action>
diff --git a/src/site/xdoc/reference/syntax.xml 
b/src/site/xdoc/reference/syntax.xml
index af09165..36e784b 100644
--- a/src/site/xdoc/reference/syntax.xml
+++ b/src/site/xdoc/reference/syntax.xml
@@ -233,7 +233,7 @@
                         These syntaxes are mixable with safe-access as in 
<code>foo.'b a r'?.quux</code> or <code>
                             foo?.`${bar}`.quux</code>.</p>
                         <p>Access operators can be overloaded in 
<code>JexlArithmetic</code>, so that
-                           the operator behaviour will differ depending on the 
type of the operator arguments</p>
+                           the operator behavior will differ depending on the 
type of the operator arguments</p>
                     </td>
                 </tr>
                 <tr>
diff --git a/src/test/java/org/apache/commons/jexl3/JexlTest.java 
b/src/test/java/org/apache/commons/jexl3/JexlTest.java
index e8bd57a..5e4ca78 100644
--- a/src/test/java/org/apache/commons/jexl3/JexlTest.java
+++ b/src/test/java/org/apache/commons/jexl3/JexlTest.java
@@ -670,7 +670,7 @@ public class JexlTest extends JexlTestCase {
             assertExpression(new MapContext(), "empty()", null);
             Assert.fail("Bad expression didn't throw ParseException");
         } catch (JexlException pe) {
-            // expected behaviour
+            // expected behavior
         }
     }
 
diff --git 
a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java 
b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
index ed6c4e0..4b4e7e9 100644
--- a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
+++ b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
@@ -92,7 +92,7 @@ public class JexlScriptEngineTest {
         Assert.assertEquals(initialValue,engine.get("old"));
         Assert.assertEquals(newValue,engine.get("value"));
         
Assert.assertEquals(engine.getContext(),engine.get(JexlScriptEngine.CONTEXT_KEY));
-        // Check behaviour of JEXL object
+        // Check behavior of JEXL object
         
Assert.assertEquals(engine.getContext().getReader(),engine.eval("JEXL.in"));
         
Assert.assertEquals(engine.getContext().getWriter(),engine.eval("JEXL.out"));
         
Assert.assertEquals(engine.getContext().getErrorWriter(),engine.eval("JEXL.err"));

Reply via email to