From 5e8cc326ca62d8466c482df2be2ae8de2a8c02ea Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Fri, 7 Aug 2015 12:32:14 +0000 Subject: [PATCH] Fixed dependency issue ant removed ant as a dependecy git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@109779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- rm-server/pom.xml | 16 +++++----------- .../webscript/ClassificationRestApiTest.java | 6 +++--- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 444b96fe3c..bfcaeb91ba 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -452,17 +452,11 @@ tests test - - org.alfresco.test - alfresco-testng - 1.1 - test - - - org.apache.ant - ant - 1.8.2 - test + + org.alfresco.test + alfresco-testng + 1.1 + test diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ClassificationRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ClassificationRestApiTest.java index dd5f00c673..07ecd30ff0 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ClassificationRestApiTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ClassificationRestApiTest.java @@ -59,7 +59,7 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMWebScriptTestC import org.alfresco.service.cmr.repository.InvalidNodeRefException; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; -import org.apache.tools.ant.util.DateUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -182,8 +182,8 @@ public class ClassificationRestApiTest extends BaseRMWebScriptTestCase assertEquals(1, editedClassificationReasonsList.size()); assertTrue(editedClassificationReasonsList.contains(CLASSIFICATION_REASON_3_ID_VALUE)); assertEquals(DOWNGRADE.toModelString(), nodeService.getProperty(record, PROP_LAST_RECLASSIFICATION_ACTION)); - String date1 = DateUtils.format(new Date(), ISO_DATE_FORMAT.getPattern()); - String date2 = DateUtils.format((Date) nodeService.getProperty(record, PROP_LAST_RECLASSIFY_AT), ISO_DATE_FORMAT.getPattern()); + String date1 = DateFormatUtils.format(new Date(), ISO_DATE_FORMAT.getPattern()); + String date2 = DateFormatUtils.format((Date) nodeService.getProperty(record, PROP_LAST_RECLASSIFY_AT), ISO_DATE_FORMAT.getPattern()); assertEquals(date1, date2); assertEquals(LAST_RECLASSIFY_BY_VALUE, nodeService.getProperty(record, PROP_LAST_RECLASSIFY_BY)); assertEquals(LAST_RECLASSIFY_REASON_VALUE, nodeService.getProperty(record, PROP_LAST_RECLASSIFY_REASON));