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

Commit e873798

Browse files
authored
Merge pull request #244 from skyhit/upgrade_to_struts_2.3.32
fix dependencies
2 parents 40fbafc + 07fa932 commit e873798

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

build-dependencies.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
<property name="commons-fileupload-1.3.2.jar" value="${struts2_libdir}/commons-fileupload-1.3.2.jar"/>
420420
<property name="commons-io-2.2.jar" value="${struts2_libdir}/commons-io-2.2.jar"/>
421421
<property name="commons-lang-2.4.jar" value="${struts2_libdir}/commons-lang-2.4.jar"/>
422-
<property name="commons-lang3-3.3.2.jar" value="${struts2_libdir}/commons-lang3-3.3.2.jar"/>
422+
<property name="commons-lang3-3.2.jar" value="${struts2_libdir}/commons-lang3-3.2.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.22.jar" value="${struts2_libdir}/freemarker-2.3.22.jar"/>
@@ -491,7 +491,7 @@
491491
<pathelement location="${commons-fileupload-1.3.2.jar}"/>
492492
<pathelement location="${commons-io-2.2.jar}"/>
493493
<pathelement location="${commons-lang-2.4.jar}"/>
494-
<pathelement location="${commons-lang3-3.3.2.jar}"/>
494+
<pathelement location="${commons-lang3-3.2.jar}"/>
495495
<pathelement location="${commons-logging-1.1.3.jar}"/>
496496
<pathelement location="${ezmorph-1.0.6.jar}"/>
497497
<pathelement location="${freemarker-2.3.22.jar}"/>

build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
<copy file="${commons-fileupload-1.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
263263
<copy file="${commons-io-2.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
264264
<copy file="${commons-lang-2.4.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
265-
<copy file="${commons-lang3-3.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
265+
<copy file="${commons-lang3-3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
266266
<copy file="${commons-logging-1.1.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
267267
<copy file="${ezmorph-1.0.6.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
268268
<copy file="${freemarker-2.3.22.jar}" todir="${ear_shared_libdir}" overwrite="true"/>

components/topcoder_cockpit_project_metadata_services/build-dependencies.xml

+1-1
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.3.31/commons-logging-1.1.3.jar"/>
24+
<property name="commons-logging.jar" value="${ext_libdir}/struts/2.3.32/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"/>

components/topcoder_cockpit_task_management_services/build-dependencies.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<property name="spring-framework.dir" value="${ext_libdir}/spring"/>
2828
<property name="mockito.jar" value="${ext_libdir}/mockito/1.9.5/mockito-all-1.9.5.jar"/>
2929
<property name="easymock.jar" value="${ext_libdir}/easymock/3.1/easymock-3.1.jar"/>
30-
<property name="commons-logging.jar" value="${ext_libdir}/struts/2.3.31/commons-logging-1.1.3.jar"/>
30+
<property name="commons-logging.jar" value="${ext_libdir}/struts/2.3.32/commons-logging-1.1.3.jar"/>
3131
<property name="commons-dbcp.jar" value="${ext_libdir}/commons-dbcp/commons-dbcp.jar"/>
3232
<property name="commons-pool.jar" value="${ext_libdir}/commons-pool/commons-pool.jar"/>
3333

services/contest_service_facade/build-dependencies.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@
230230
<property name="tcwebcommon.jar" value="${tcs_libdir}/${tcwebcommon.jar.name}"/>
231231

232232
<property name="aws-java.jar" value="${ext_libdir}/aws-java-sdk/aws-java-sdk-1.0.004.jar"/>
233-
<property name="commons-io-2.2.jar" value="${ext_libdir}/struts/2.3.31/commons-io-2.2.jar"/>
234-
<property name="commons-lang-2.4.jar" value="${ext_libdir}/struts/2.3.31/commons-lang-2.4.jar"/>
233+
<property name="commons-io-2.2.jar" value="${ext_libdir}/struts/2.3.32/commons-io-2.2.jar"/>
234+
<property name="commons-lang-2.4.jar" value="${ext_libdir}/struts/2.3.32/commons-lang-2.4.jar"/>
235235

236236
<path id="component.tcs-dependencies">
237237
<pathelement location="${jboss_login_module.jar}"/>

0 commit comments

Comments
 (0)