diff -Nru mybatis-3.2.2/pom.xml mybatis-3.2.2-gil/pom.xml --- mybatis-3.2.2/pom.xml 2013-04-02 12:54:43.000000000 +0200 +++ mybatis-3.2.2-gil/pom.xml 2013-04-20 07:56:47.235021426 +0200 @@ -132,9 +132,9 @@ <dependencies> <dependency> - <groupId>ognl</groupId> - <artifactId>ognl</artifactId> - <version>2.6.9</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-ognl</artifactId> + <version>4.0-incubating-SNAPSHOT</version> <scope>provided</scope> <optional>true</optional> </dependency> diff -Nru mybatis-3.2.2/src/main/java/org/apache/ibatis/scripting/xmltags/DynamicContext.java mybatis-3.2.2-gil/src/main/java/org/apache/ibatis/scripting/xmltags/DynamicContext.java --- mybatis-3.2.2/src/main/java/org/apache/ibatis/scripting/xmltags/DynamicContext.java 2013-04-02 12:54:43.000000000 +0200 +++ mybatis-3.2.2-gil/src/main/java/org/apache/ibatis/scripting/xmltags/DynamicContext.java 2013-04-20 08:02:19.774699834 +0200 @@ -18,9 +18,9 @@ import java.util.HashMap; import java.util.Map; -import ognl.OgnlException; -import ognl.OgnlRuntime; -import ognl.PropertyAccessor; +import org.apache.commons.ognl.OgnlException; +import org.apache.commons.ognl.OgnlRuntime; +import org.apache.commons.ognl.MapPropertyAccessor; import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.session.Configuration; @@ -98,7 +98,7 @@ } } - static class ContextAccessor implements PropertyAccessor { + static class ContextAccessor extends MapPropertyAccessor { public Object getProperty(Map context, Object target, Object name) throws OgnlException { diff -Nru mybatis-3.2.2/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlCache.java mybatis-3.2.2-gil/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlCache.java --- mybatis-3.2.2/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlCache.java 2013-04-02 12:54:43.000000000 +0200 +++ mybatis-3.2.2-gil/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlCache.java 2013-04-20 08:09:57.799421995 +0200 @@ -20,13 +20,13 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import ognl.ExpressionSyntaxException; -import ognl.Node; -import ognl.Ognl; -import ognl.OgnlException; -import ognl.OgnlParser; -import ognl.ParseException; -import ognl.TokenMgrError; +import org.apache.commons.ognl.ExpressionSyntaxException; +import org.apache.commons.ognl.Node; +import org.apache.commons.ognl.Ognl; +import org.apache.commons.ognl.OgnlException; +import org.apache.commons.ognl.OgnlParser; +import org.apache.commons.ognl.ParseException; +import org.apache.commons.ognl.TokenMgrError; import org.apache.ibatis.builder.BuilderException; @@ -38,7 +38,7 @@ */ public class OgnlCache { - private static final Map<String, ognl.Node> expressionCache = new ConcurrentHashMap<String, ognl.Node>(); + private static final Map<String, org.apache.commons.ognl.Node> expressionCache = new ConcurrentHashMap<String, org.apache.commons.ognl.Node>(); public static Object getValue(String expression, Object root) { try {