Merge pull request #243 from skyhit/upgrade_to_struts_2.3.32

upgrade to struts 2.3.32

Author: ajefts

build-dependencies.xml

@@ -413,7 +413,7 @@
 -->
 
     <!-- Struts 2 libs -->
-    <property name="struts2_libdir" value="${ext_libdir}/struts/2.3.31"/>
+    <property name="struts2_libdir" value="${ext_libdir}/struts/2.3.32"/>
     <property name="commons-beanutils-1.8.0.jar" value="${struts2_libdir}/commons-beanutils-1.8.0.jar"/>
     <property name="commons-collections-3.2.2.jar" value="${struts2_libdir}/commons-collections-3.2.2.jar"/>
     <property name="commons-fileupload-1.3.2.jar" value="${struts2_libdir}/commons-fileupload-1.3.2.jar"/>
@@ -425,11 +425,11 @@
     <property name="freemarker-2.3.22.jar" value="${struts2_libdir}/freemarker-2.3.22.jar"/>
     <property name="json-lib-2.3-jdk15.jar" value="${struts2_libdir}/json-lib-2.3-jdk15.jar"/>
     <property name="ognl-3.0.19.jar" value="${struts2_libdir}/ognl-3.0.19.jar"/>
-    <property name="struts2-convention-plugin-2.3.31.jar" value="${struts2_libdir}/struts2-convention-plugin-2.3.31.jar"/>
-    <property name="struts2-core-2.3.31.jar" value="${struts2_libdir}/struts2-core-2.3.31.jar"/>
-    <property name="struts2-spring-plugin-2.3.31.jar" value="${struts2_libdir}/struts2-spring-plugin-2.3.31.jar"/>
-    <property name="struts2-json-plugin-2.3.31.jar" value="${struts2_libdir}/struts2-json-plugin-2.3.31.jar"/>
-    <property name="xwork-core-2.3.31.jar" value="${struts2_libdir}/xwork-core-2.3.31.jar"/>
+    <property name="struts2-convention-plugin-2.3.32.jar" value="${struts2_libdir}/struts2-convention-plugin-2.3.32.jar"/>
+    <property name="struts2-core-2.3.32.jar" value="${struts2_libdir}/struts2-core-2.3.32.jar"/>
+    <property name="struts2-spring-plugin-2.3.32.jar" value="${struts2_libdir}/struts2-spring-plugin-2.3.32.jar"/>
+    <property name="struts2-json-plugin-2.3.32.jar" value="${struts2_libdir}/struts2-json-plugin-2.3.32.jar"/>
+    <property name="xwork-core-2.3.32.jar" value="${struts2_libdir}/xwork-core-2.3.32.jar"/>
     <property name="struts2-ssl-plugin-1.2.1.jar" value="${ext_libdir}/struts/struts2-ssl-plugin-1.2.1.jar"/>
     <property name="xwork-1.2.3.jar" value="${ext_libdir}/struts/xwork-1.2.3.jar"/>
 
@@ -497,13 +497,13 @@
         <pathelement location="${freemarker-2.3.22.jar}"/>
         <pathelement location="${json-lib-2.3-jdk15.jar}"/>
         <pathelement location="${ognl-3.0.19.jar}"/>
-        <pathelement location="${struts2-convention-plugin-2.3.31.jar}"/>
-        <pathelement location="${struts2-core-2.3.31.jar}"/>
-        <pathelement location="${struts2-spring-plugin-2.3.31.jar}"/>
-        <pathelement location="${struts2-json-plugin-2.3.31.jar}"/>
+        <pathelement location="${struts2-convention-plugin-2.3.32.jar}"/>
+        <pathelement location="${struts2-core-2.3.32.jar}"/>
+        <pathelement location="${struts2-spring-plugin-2.3.32.jar}"/>
+        <pathelement location="${struts2-json-plugin-2.3.32.jar}"/>
         <pathelement location="${struts2-ssl-plugin-1.2.1.jar}"/>
         <pathelement location="${xwork-1.2.3.jar}"/>
-        <pathelement location="${xwork-core-2.3.31.jar}"/>
+        <pathelement location="${xwork-core-2.3.32.jar}"/>
     </path>
 
     <!-- Spring libraries -->

build.xml

@@ -268,13 +268,13 @@
         <copy file="${freemarker-2.3.22.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${json-lib-2.3-jdk15.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${ognl-3.0.19.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-convention-plugin-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-core-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-spring-plugin-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-json-plugin-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-convention-plugin-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-core-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-spring-plugin-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-json-plugin-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
 		<copy file="${struts2-ssl-plugin-1.2.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${xwork-1.2.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${xwork-core-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${xwork-core-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${jboss-cache-jdk50.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${jgroups.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${ehcache.jar}" todir="${ear_shared_libdir}" overwrite="true"/>

lib/third_party/struts/2.3.31/commons-lang3-3.3.2.jar

@@ -213,11 +213,11 @@
         <copy file="${freemarker-2.3.15.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${json-lib-2.3-jdk15.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${ognl-2.7.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-convention-plugin-2.1.8.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-core-2.1.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-spring-plugin-2.1.8.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-convention-plugin-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-core-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-spring-plugin-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${xwork-1.2.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${xwork-core-2.1.6.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${xwork-core-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${jboss-cache-jdk50.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${jgroups.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
 

lib/third_party/struts/2.3.31/commons-beanutils-1.8.0.jar renamed to lib/third_party/struts/2.3.32/commons-beanutils-1.8.0.jar

@@ -213,11 +213,11 @@
         <copy file="${freemarker-2.3.15.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${json-lib-2.3-jdk15.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${ognl-2.7.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-convention-plugin-2.1.8.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-core-2.1.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-spring-plugin-2.1.8.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-convention-plugin-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-core-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-spring-plugin-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${xwork-1.2.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${xwork-core-2.1.6.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${xwork-core-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${jboss-cache-jdk50.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${jgroups.jar}" todir="${ear_shared_libdir}" overwrite="true"/>