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

58876: BDE-195 Fix tests in Maven
     Put FTPServerTest back into OwnJVM until MNT-10160 is fixed
     Put ThumbnailServiceImplTest back into OwnJVM too, as it is failing and seems to bring everything down
     Bring back RepositoryStartStopTest: this one is fine!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62053 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 00:26:34 +00:00
parent 0a746c042c
commit 995821ee71
3 changed files with 4 additions and 7 deletions

View File

@@ -28,11 +28,9 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.BaseApplicationContextHelper;
import org.junit.experimental.categories.Category;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
@@ -53,7 +51,6 @@ import junit.framework.TestCase;
*
* @author Nick Burch
*/
@Category(OwnJVMTestsCategory.class)
public class RepositoryStartStopTest extends TestCase
{
private ServiceRegistry serviceRegistry;