struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject struts git commit: WW-4207 Upgrades OGNL to latest available version
Date Mon, 22 Jun 2015 06:34:16 GMT
Repository: struts
Updated Branches:
  refs/heads/master ce61023a4 -> 3bbe68134


WW-4207 Upgrades OGNL to latest available version


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3bbe6813
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3bbe6813
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3bbe6813

Branch: refs/heads/master
Commit: 3bbe681346339a671b7e3c986f041ce415848dff
Parents: ce61023
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Mon Jun 22 08:33:59 2015 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Mon Jun 22 08:33:59 2015 +0200

----------------------------------------------------------------------
 .../java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 12 +++---------
 pom.xml                                                 |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/3bbe6813/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index 6726af6..1ccdc4a 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -28,12 +28,6 @@ import ognl.*;
 import java.lang.reflect.Method;
 import java.util.*;
 
-
-/**
- * Unit test of {@link ognlUtil}.
- * 
- * @version $Date$ $Id$
- */
 public class OgnlUtilTest extends XWorkTestCase {
     
     private OgnlUtil ognlUtil;
@@ -496,12 +490,12 @@ public class OgnlUtilTest extends XWorkTestCase {
         Map context = ognlUtil.createDefaultContext(foo);
 
         Map props = new HashMap();
-        props.put("aLong", "123");
+        props.put("ALong", "123");
 
         ognlUtil.setProperties(props, foo, context);
         assertEquals(123, foo.getALong());
 
-        props.put("aLong", new String[]{"123"});
+        props.put("ALong", new String[]{"123"});
 
         foo.setALong(0);
         ognlUtil.setProperties(props, foo, context);
@@ -518,7 +512,7 @@ public class OgnlUtilTest extends XWorkTestCase {
         assertEquals(88, foo.getALong());
 
         Map props = new HashMap();
-        props.put("aLong", "99");
+        props.put("ALong", "99");
         ognlUtil.setProperties(props, foo, context);
         assertEquals(99, foo.getALong());
     }

http://git-wip-us.apache.org/repos/asf/struts/blob/3bbe6813/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1b8474e..3e8df70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
     <properties>
         <currentVersion>${project.version}</currentVersion>
         <struts2.springPlatformVersion>4.1.6.RELEASE</struts2.springPlatformVersion>
-        <ognl.version>3.0.6</ognl.version>
+        <ognl.version>3.0.11</ognl.version>
         <asm.version>3.3</asm.version>
         <asm5.version>5.0.2</asm5.version>
         <tiles.version>2.0.6</tiles.version>


Mime
View raw message