Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit faf7aed

Browse files
ajeftsajefts
authored
Merge pull request #315 from appirio-tech/dev
Upgrade to struts 2.5.13
2 parents 7e32bb4 + 20696e0 commit faf7aed

35 files changed

+59
-59
lines changed

‎build-dependencies.xml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,9 @@
356356

357357
<property name="tccache.jar" value="${tcs_libdir}/tc_cache/1.0.0/tc_cache.jar"/>
358358
<!-- 3rd party dependencies -->
359-
<property name="asm-5.1.jar" value="${ext_libdir}/asm/asm-5.1.jar"/>
360-
<property name="asm-commons-5.1.jar" value="${ext_libdir}/asm/asm-commons-5.1.jar"/>
361-
<property name="asm-tree-5.1.jar" value="${ext_libdir}/asm/asm-tree-5.1.jar"/>
359+
<property name="asm-5.2.jar" value="${ext_libdir}/asm/asm-5.2.jar"/>
360+
<property name="asm-commons-5.2.jar" value="${ext_libdir}/asm/asm-commons-5.2.jar"/>
361+
<property name="asm-tree-5.2.jar" value="${ext_libdir}/asm/asm-tree-5.2.jar"/>
362362
<property name="aws-java-sdk.jar" value="${ext_libdir}/aws-java-sdk/aws-java-sdk-1.0.004.jar"/>
363363
<property name="jackson-core.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-asl.jar"/>
364364
<property name="jackson-mapper.jar" value="${ext_libdir}/jackson/1.9.7/jackson-mapper-asl.jar"/>
@@ -413,23 +413,23 @@
413413
-->
414414

415415
<!-- Struts 2 libs -->
416-
<property name="struts2_libdir" value="${ext_libdir}/struts/2.5.10.1"/>
416+
<property name="struts2_libdir" value="${ext_libdir}/struts/2.5.13"/>
417417
<property name="commons-beanutils-1.9.2.jar" value="${struts2_libdir}/commons-beanutils-1.9.2.jar"/>
418-
<property name="commons-collections-3.2.1.jar" value="${struts2_libdir}/commons-collections-3.2.1.jar"/>
419-
<property name="commons-fileupload-1.3.2.jar" value="${struts2_libdir}/commons-fileupload-1.3.2.jar"/>
420-
<property name="commons-io-2.4.jar" value="${struts2_libdir}/commons-io-2.4.jar"/>
418+
<property name="commons-collections-3.2.2.jar" value="${struts2_libdir}/commons-collections-3.2.2.jar"/>
419+
<property name="commons-fileupload-1.3.3.jar" value="${struts2_libdir}/commons-fileupload-1.3.3.jar"/>
420+
<property name="commons-io-2.5.jar" value="${struts2_libdir}/commons-io-2.5.jar"/>
421421
<property name="commons-lang-2.4.jar" value="${struts2_libdir}/commons-lang-2.4.jar"/>
422-
<property name="commons-lang3-3.4.jar" value="${struts2_libdir}/commons-lang3-3.4.jar"/>
422+
<property name="commons-lang3-3.6.jar" value="${struts2_libdir}/commons-lang3-3.6.jar"/>
423423
<property name="commons-logging-1.1.3.jar" value="${struts2_libdir}/commons-logging-1.1.3.jar"/>
424424
<property name="ezmorph-1.0.6.jar" value="${struts2_libdir}/ezmorph-1.0.6.jar"/>
425425
<property name="freemarker-2.3.23.jar" value="${struts2_libdir}/freemarker-2.3.23.jar"/>
426426
<property name="json-lib-2.3-jdk15.jar" value="${struts2_libdir}/json-lib-2.3-jdk15.jar"/>
427-
<property name="log4j-api-2.7.jar" value="${struts2_libdir}/log4j-api-2.7.jar"/>
428-
<property name="ognl-3.1.12.jar" value="${struts2_libdir}/ognl-3.1.12.jar"/>
429-
<property name="struts2-convention-plugin-2.5.10.1.jar" value="${struts2_libdir}/struts2-convention-plugin-2.5.10.1.jar"/>
430-
<property name="struts2-core-2.5.10.1.jar" value="${struts2_libdir}/struts2-core-2.5.10.1.jar"/>
431-
<property name="struts2-spring-plugin-2.5.10.1.jar" value="${struts2_libdir}/struts2-spring-plugin-2.5.10.1.jar"/>
432-
<property name="struts2-json-plugin-2.5.10.1.jar" value="${struts2_libdir}/struts2-json-plugin-2.5.10.1.jar"/>
427+
<property name="log4j-api-2.8.2.jar" value="${struts2_libdir}/log4j-api-2.8.2.jar"/>
428+
<property name="ognl-3.1.15.jar" value="${struts2_libdir}/ognl-3.1.15.jar"/>
429+
<property name="struts2-convention-plugin-2.5.13.jar" value="${struts2_libdir}/struts2-convention-plugin-2.5.13.jar"/>
430+
<property name="struts2-core-2.5.13.jar" value="${struts2_libdir}/struts2-core-2.5.13.jar"/>
431+
<property name="struts2-spring-plugin-2.5.13.jar" value="${struts2_libdir}/struts2-spring-plugin-2.5.13.jar"/>
432+
<property name="struts2-json-plugin-2.5.13.jar" value="${struts2_libdir}/struts2-json-plugin-2.5.13.jar"/>
433433
<property name="struts2-ssl-plugin-1.2.1.jar" value="${ext_libdir}/struts/struts2-ssl-plugin-1.2.1.jar"/>
434434
<property name="xwork-1.2.3.jar" value="${ext_libdir}/struts/xwork-1.2.3.jar"/>
435435

@@ -487,21 +487,21 @@
487487
<!-- Struts2 libraries -->
488488
<path id="struts.libs">
489489
<pathelement location="${commons-beanutils-1.9.2.jar}"/>
490-
<pathelement location="${commons-collections-3.2.1.jar}"/>
491-
<pathelement location="${commons-fileupload-1.3.2.jar}"/>
492-
<pathelement location="${commons-io-2.4.jar}"/>
490+
<pathelement location="${commons-collections-3.2.2.jar}"/>
491+
<pathelement location="${commons-fileupload-1.3.3.jar}"/>
492+
<pathelement location="${commons-io-2.5.jar}"/>
493493
<pathelement location="${commons-lang-2.4.jar}"/>
494-
<pathelement location="${commons-lang3-3.4.jar}"/>
494+
<pathelement location="${commons-lang3-3.6.jar}"/>
495495
<pathelement location="${commons-logging-1.1.3.jar}"/>
496496
<pathelement location="${ezmorph-1.0.6.jar}"/>
497497
<pathelement location="${freemarker-2.3.23.jar}"/>
498498
<pathelement location="${json-lib-2.3-jdk15.jar}"/>
499-
<pathelement location="${log4j-api-2.7.jar}"/>
500-
<pathelement location="${ognl-3.1.12.jar}"/>
501-
<pathelement location="${struts2-convention-plugin-2.5.10.1.jar}"/>
502-
<pathelement location="${struts2-core-2.5.10.1.jar}"/>
503-
<pathelement location="${struts2-spring-plugin-2.5.10.1.jar}"/>
504-
<pathelement location="${struts2-json-plugin-2.5.10.1.jar}"/>
499+
<pathelement location="${log4j-api-2.8.2.jar}"/>
500+
<pathelement location="${ognl-3.1.15.jar}"/>
501+
<pathelement location="${struts2-convention-plugin-2.5.13.jar}"/>
502+
<pathelement location="${struts2-core-2.5.13.jar}"/>
503+
<pathelement location="${struts2-spring-plugin-2.5.13.jar}"/>
504+
<pathelement location="${struts2-json-plugin-2.5.13.jar}"/>
505505
<pathelement location="${struts2-ssl-plugin-1.2.1.jar}"/>
506506
<pathelement location="${xwork-1.2.3.jar}"/>
507507
</path>
@@ -545,9 +545,9 @@
545545

546546
<!-- Asm libraries -->
547547
<path id="asm.libs">
548-
<pathelement location="${asm-commons-5.1.jar}"/>
549-
<pathelement location="${asm-tree-5.1.jar}"/>
550-
<pathelement location="${asm-5.1.jar}"/>
548+
<pathelement location="${asm-commons-5.2.jar}"/>
549+
<pathelement location="${asm-tree-5.2.jar}"/>
550+
<pathelement location="${asm-5.2.jar}"/>
551551
</path>
552552

553553
<path id="svnant.lib">

‎build.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@
222222
<copy file="${user_project_data_store.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
223223

224224
<!-- third-party libs -->
225-
<copy file="${asm-5.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
226-
<copy file="${asm-commons-5.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
227-
<copy file="${asm-tree-5.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
225+
<copy file="${asm-5.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
226+
<copy file="${asm-commons-5.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
227+
<copy file="${asm-tree-5.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
228228
<copy file="${aws-java-sdk.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
229229
<copy file="${axis.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
230230
<copy file="${commons-dbcp.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
@@ -250,21 +250,21 @@
250250
<copy file="${spring-tx.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
251251
<copy file="${common-annotations.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
252252
<copy file="${commons-beanutils-1.9.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
253-
<copy file="${commons-collections-3.2.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
254-
<copy file="${commons-fileupload-1.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
255-
<copy file="${commons-io-2.4.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
253+
<copy file="${commons-collections-3.2.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
254+
<copy file="${commons-fileupload-1.3.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
255+
<copy file="${commons-io-2.5.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
256256
<copy file="${commons-lang-2.4.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
257-
<copy file="${commons-lang3-3.4.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
257+
<copy file="${commons-lang3-3.6.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
258258
<copy file="${commons-logging-1.1.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
259259
<copy file="${ezmorph-1.0.6.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
260260
<copy file="${freemarker-2.3.23.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
261261
<copy file="${json-lib-2.3-jdk15.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
262-
<copy file="${log4j-api-2.7.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
263-
<copy file="${ognl-3.1.12.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
264-
<copy file="${struts2-convention-plugin-2.5.10.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
265-
<copy file="${struts2-core-2.5.10.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
266-
<copy file="${struts2-spring-plugin-2.5.10.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
267-
<copy file="${struts2-json-plugin-2.5.10.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
262+
<copy file="${log4j-api-2.8.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
263+
<copy file="${ognl-3.1.15.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
264+
<copy file="${struts2-convention-plugin-2.5.13.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
265+
<copy file="${struts2-core-2.5.13.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
266+
<copy file="${struts2-spring-plugin-2.5.13.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
267+
<copy file="${struts2-json-plugin-2.5.13.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
268268
<copy file="${struts2-ssl-plugin-1.2.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
269269
<copy file="${xwork-1.2.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
270270
<copy file="${jboss-cache-jdk50.jar}" todir="${ear_shared_libdir}" overwrite="true"/>

‎components/topcoder_cockpit_project_metadata_services/build-dependencies.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<property name="ifxjdbc.jar" value="${ext_libdir}/informix/ifxjdbc.jar"/>
2222

2323
<property name="commons-dbcp.jar" value="${ext_libdir}/commons-dbcp/commons-dbcp.jar"/>
24-
<property name="commons-logging.jar" value="${ext_libdir}/struts/2.5.10.1/commons-logging-1.1.3.jar"/>
24+
<property name="commons-logging.jar" value="${ext_libdir}/struts/2.5.13/commons-logging-1.1.3.jar"/>
2525
<property name="commons-pool.jar" value="${ext_libdir}/commons-pool/commons-pool.jar"/>
2626
<property name="log4j.jar" value="${ext_libdir}/jboss/log4j.jar"/>
2727
<property name="hibernate3.jar" value="${ext_libdir}/hibernate/hibernate3.jar"/>

‎lib/third_party/asm/asm-5.1.jar‎

-52.2 KB
Binary file not shown.

‎lib/third_party/asm/asm-5.2.jar‎

52 KB
Binary file not shown.

‎lib/third_party/asm/asm-commons-5.1.jar‎ renamed to ‎lib/third_party/asm/asm-commons-5.2.jar‎

46.1 KB
Binary file not shown.

‎lib/third_party/asm/asm-tree-5.1.jar‎ renamed to ‎lib/third_party/asm/asm-tree-5.2.jar‎

28.4 KB
Binary file not shown.

‎lib/third_party/struts/2.5.10.1/commons-collections-3.2.1.jar‎

-562 KB
Binary file not shown.

‎lib/third_party/struts/2.5.10.1/commons-fileupload-1.3.2.jar‎

-68.6 KB
Binary file not shown.

‎lib/third_party/struts/2.5.10.1/commons-io-2.4.jar‎

-181 KB
Binary file not shown.

0 commit comments

Comments
 (0)