Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57529: Merded DEV to HEAD-BUG-FIX (4.3)
      57218: MNT-9727 : Remove Ant from packaged libraries
      Excluded ant-1.7.1.jar from build path of Data Model project.
      Fixed the tests and source files to use java.util.zip.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61843 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 21:04:15 +00:00
parent b4e45ef15c
commit 18e8f40d81
6 changed files with 25 additions and 25 deletions

View File

@@ -18,6 +18,8 @@
*/
package org.alfresco.repo.importer;
import java.util.zip.ZipFile;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.security.authentication.AuthenticationContext;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -30,7 +32,6 @@ import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.PropertyCheck;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tools.zip.ZipFile;
import org.springframework.context.ApplicationEvent;
import org.springframework.extensions.surf.util.AbstractLifecycleBean;