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

Commit f440214

Browse files
authored
Merge pull request #186 from skyhit/upgrade_struts2_version
fix dependencies
2 parents ed94440 + 0ecb1f8 commit f440214

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

components/copilot_pool_and_profiles_services/build-dependencies.xml

-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
<property name="jaxb-api.jar" value="${ext_libdir}/jaxb/2.1.7/jaxb-api.jar"/>
2727
<property name="javaee.jar" value="${ext_libdir}/j2ee/1.5/javaee.jar"/>
2828

29-
<!-- Struts jars -->
30-
<property name="struts_dir" value="${ext_libdir}/struts/2.0.14/lib" />
31-
<property name="commons-logging.jar" value="${struts_dir}/commons-logging-1.0.4.jar"/>
32-
3329
<!-- Spring jars -->
3430

3531

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/commons-logging-1.1.1.jar"/>
24+
<property name="commons-logging.jar" value="${ext_libdir}/struts/2.3.31/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/commons-logging-1.1.1.jar"/>
30+
<property name="commons-logging.jar" value="${ext_libdir}/struts/2.3.31/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

+3-3
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.0.1.jar" value="${ext_libdir}/struts/commons-io-2.0.1.jar"/>
234-
<property name="commons-lang-2.4.jar" value="${ext_libdir}/struts/commons-lang-2.4.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"/>
235235

236236
<path id="component.tcs-dependencies">
237237
<pathelement location="${jboss_login_module.jar}"/>
@@ -319,7 +319,7 @@
319319
<pathelement location="${jaxb-impl.jar}"/>
320320

321321
<pathelement location="${aws-java.jar}"/>
322-
<pathelement location="${commons-io-2.0.1.jar}"/>
322+
<pathelement location="${commons-io-2.2.jar}"/>
323323
<pathelement location="${commons-lang-2.4.jar}"/>
324324
</path>
325325

0 commit comments

Comments
 (0)