From f0104c84b348f325bf15fb956fe1e3575cf502e8 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Wed, 5 May 2010 16:28:30 +0000
Subject: [PATCH] Upgraded OGNL to version 3.0

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@941370 13f79535-47bb-0310-9956-ffa450edef68
---
 core/pom.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 7250e3485..c71962787 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -41,6 +41,7 @@
 
     <properties>
         <tlib.version>2.2</tlib.version>
+        <ognl.version>3.0</ognl.version>
     </properties>
 
     <build>
@@ -241,7 +242,7 @@
         <dependency>
             <groupId>ognl</groupId>
             <artifactId>ognl</artifactId>
-            <version>2.7.3</version>
+            <version>${ognl.version}</version>
         </dependency>
 
         <!-- Velocity -->
@@ -262,6 +263,10 @@
                     <groupId>struts</groupId>
                     <artifactId>struts</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -393,6 +398,5 @@
             <optional>true</optional>
         </dependency>
 
-
     </dependencies>
 </project>