You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/01/02 16:53:13 UTC

[2/3] struts git commit: Fix to ww-4577 and ww-4576

Fix to ww-4577 and ww-4576

Upgrade OGNL to version 3.1.2
Upgrade to Log4j2 version 2.5

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

Branch: refs/heads/master
Commit: 9cc383e436acc4fb360059fa923e9ec0f8fe6555
Parents: db483cc
Author: Victor Sosa <vi...@gmail.com>
Authored: Thu Dec 31 16:53:38 2015 -0400
Committer: Victor Sosa <vi...@gmail.com>
Committed: Thu Dec 31 16:53:38 2015 -0400

----------------------------------------------------------------------
 core/pom.xml | 1 +
 pom.xml      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/9cc383e4/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 91cc5eb..1795597 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -240,6 +240,7 @@
         <dependency>
             <groupId>ognl</groupId>
             <artifactId>ognl</artifactId>
+            <version>${ognl.version}</version>
         </dependency>
 
         <!-- Velocity -->

http://git-wip-us.apache.org/repos/asf/struts/blob/9cc383e4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5b33c88..862630b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,11 +85,11 @@
     <properties>
         <currentVersion>${project.version}</currentVersion>
         <struts2.springPlatformVersion>4.1.6.RELEASE</struts2.springPlatformVersion>
-        <ognl.version>3.1.1</ognl.version>
+        <ognl.version>3.1.2</ognl.version>
         <asm.version>3.3</asm.version>
         <asm5.version>5.0.2</asm5.version>
         <tiles.version>2.0.6</tiles.version>
-        <log4j2.version>2.3</log4j2.version>
+        <log4j2.version>2.5</log4j2.version>
 
         <!-- SCM Site Configuration -->
         <site.mainDirectory>${project.build.directory}/site</site.mainDirectory>