Author: lukaszlenart Date: Wed May 5 16:28:30 2010 New Revision: 941370 URL: http://svn.apache.org/viewvc?rev=941370&view=rev Log: Upgraded OGNL to version 3.0
Modified: struts/struts2/trunk/core/pom.xml Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=941370&r1=941369&r2=941370&view=diff ============================================================================== --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Wed May 5 16:28:30 2010 @@ -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>