Merge pull request #3 from topcoder-platform/upgrade_to_struts_2.3.32

Upgrade to struts 2.3.32
topcoder-platform · Apr 14, 2017 · da87cd5 · da87cd5
2 parents bffc3e9 + d9d43f9
commit da87cd5
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 5 deletions.
diff --git a/build-dependencies.xml b/build-dependencies.xml
@@ -68,14 +68,14 @@
     <property name="jackson-databind.jar" value="${ext_libdir}/jackson/jackson-databind-2.1.5.jar"/>
     <property name="jackson-annotations.jar" value="${ext_libdir}/jackson/jackson-annotations-2.1.5.jar"/>
 
-    <property name="struts2-core.jar" value="${ext_libdir}/struts/struts2-core-2.3.15.3.jar"/>
-    <property name="struts2-json-plugin.jar" value="${ext_libdir}/struts/struts2-json-plugin-2.3.15.3.jar"/>
-    <property name="struts2-spring-plugin.jar" value="${ext_libdir}/struts/struts2-spring-plugin-2.3.15.3.jar"/>
-    <property name="xwork-core.jar" value="${ext_libdir}/struts/xwork-core-2.3.15.3.jar"/>
+    <property name="struts2-core.jar" value="${ext_libdir}/struts/struts2-core-2.3.32.jar"/>
+    <property name="struts2-json-plugin.jar" value="${ext_libdir}/struts/struts2-json-plugin-2.3.32.jar"/>
+    <property name="struts2-spring-plugin.jar" value="${ext_libdir}/struts/struts2-spring-plugin-2.3.32.jar"/>
+    <property name="xwork-core.jar" value="${ext_libdir}/struts/xwork-core-2.3.32.jar"/>
     <!-- xwork 1 is used by jive-->
     <property name="xwork.jar" value="${ext_libdir}/struts/xwork-1.2.3.jar"/>
 
-    <property name="ognl.jar" value="${ext_libdir}/ognl-3.0.6.jar"/>
+    <property name="ognl.jar" value="${ext_libdir}/struts/ognl-3.0.19.jar"/>
     <property name="antlr.jar" value="${ext_libdir}/antlr-2.7.2.jar"/>
 
     <property name="junit.jar" value="${ext_libdir}/testing/junit-3.8.1.jar"/>

diff --git a/lib/third_party/struts/freemarker-2.3.19.jar b/lib/third_party/struts/freemarker-2.3.19.jar
diff --git a/lib/third_party/struts/freemarker-2.3.22.jar b/lib/third_party/struts/freemarker-2.3.22.jar
diff --git a/lib/third_party/struts/ognl-3.0.6.jar → lib/third_party/struts/ognl-3.0.19.jar b/lib/third_party/struts/ognl-3.0.6.jar → lib/third_party/struts/ognl-3.0.19.jar
diff --git a/lib/third_party/struts/struts2-core-2.3.15.3.jar b/lib/third_party/struts/struts2-core-2.3.15.3.jar
diff --git a/lib/third_party/struts/struts2-core-2.3.32.jar b/lib/third_party/struts/struts2-core-2.3.32.jar
diff --git a/lib/third_party/struts/struts2-json-plugin-2.3.15.3.jar b/lib/third_party/struts/struts2-json-plugin-2.3.15.3.jar
diff --git a/lib/third_party/struts/struts2-json-plugin-2.3.32.jar b/lib/third_party/struts/struts2-json-plugin-2.3.32.jar
diff --git a/lib/third_party/struts/struts2-spring-plugin-2.3.15.3.jar b/lib/third_party/struts/struts2-spring-plugin-2.3.15.3.jar
diff --git a/lib/third_party/struts/struts2-spring-plugin-2.3.32.jar b/lib/third_party/struts/struts2-spring-plugin-2.3.32.jar
diff --git a/lib/third_party/struts/xwork-core-2.3.15.3.jar b/lib/third_party/struts/xwork-core-2.3.15.3.jar
diff --git a/lib/third_party/struts/xwork-core-2.3.32.jar b/lib/third_party/struts/xwork-core-2.3.32.jar