struts git commit: WW-4562 Upgrades OGNL to latest 3.0.13 version

2015-11-04 Thread lukaszlenart
Repository: struts
Updated Branches:
  refs/heads/support-2-3 095807776 -> 22cb8c7e7


WW-4562 Upgrades OGNL to latest 3.0.13 version


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

Branch: refs/heads/support-2-3
Commit: 22cb8c7e7dad955eb6077cc8b775ba67274e2b31
Parents: 0958077
Author: Lukasz Lenart 
Authored: Wed Nov 4 18:09:55 2015 +0100
Committer: Lukasz Lenart 
Committed: Wed Nov 4 18:09:55 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/struts/blob/22cb8c7e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c6bd7ad..30ebfa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
 
 ${project.version}
 
3.0.5.RELEASE
-3.0.6
+3.0.13
 3.3
 5.0.2
 2.0.6

http://git-wip-us.apache.org/repos/asf/struts/blob/22cb8c7e/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
--
diff --git 
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java 
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index 6726af6..96daab0 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -496,12 +496,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 +518,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());
 }



struts git commit: WW-4561 Upgrades OGNL to 3.1.1

2015-11-04 Thread lukaszlenart
Repository: struts
Updated Branches:
  refs/heads/master f8718f918 -> afb0c2a22


WW-4561 Upgrades OGNL to 3.1.1


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

Branch: refs/heads/master
Commit: afb0c2a228b2590a0c26fa529517c929163614b7
Parents: f8718f9
Author: Lukasz Lenart 
Authored: Wed Nov 4 18:15:37 2015 +0100
Committer: Lukasz Lenart 
Committed: Wed Nov 4 18:15:37 2015 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/afb0c2a2/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8afd9ae..9750ef3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
 
 ${project.version}
 
4.1.6.RELEASE
-3.0.11
+3.1.1
 3.3
 5.0.2
 2.0.6