Return-Path: 
 <commits-return-14960-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
X-Original-To: apmail-struts-commits-archive@minotaur.apache.org
Delivered-To: apmail-struts-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C3F03185D3
	for <apmail-struts-commits-archive@minotaur.apache.org>;
 Wed,  4 Nov 2015 17:10:16 +0000 (UTC)
Received: (qmail 8890 invoked by uid 500); 4 Nov 2015 17:10:16 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 8849 invoked by uid 500); 4 Nov 2015 17:10:16 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 8840 invoked by uid 99); 4 Nov 2015 17:10:16 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Nov 2015 17:10:16 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 5018CE117C; Wed,  4 Nov 2015 17:10:16 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: lukaszlenart@apache.org
To: commits@struts.apache.org
Message-Id: <99b76acd9b6c492b836b4645d9f68d68@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: struts git commit: WW-4562 Upgrades OGNL to latest 3.0.13 version
Date: Wed,  4 Nov 2015 17:10:16 +0000 (UTC)

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 <lukasz.lenart@gmail.com>
Authored: Wed Nov 4 18:09:55 2015 +0100
Committer: Lukasz Lenart <lukasz.lenart@gmail.com>
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 @@
     <properties>
         <currentVersion>${project.version}</currentVersion>
         <struts2.springPlatformVersion>3.0.5.RELEASE</struts2.springPlatformVersion>
-        <ognl.version>3.0.6</ognl.version>
+        <ognl.version>3.0.13</ognl.version>
         <asm.version>3.3</asm.version>
         <asm5.version>5.0.2</asm5.version>
         <tiles.version>2.0.6</tiles.version>

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());
     }