ensembl is in new version 7.0

annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/EnsemblAnnotator.java

@@ -41,7 +41,7 @@ public class EnsemblAnnotator extends ElementAnnotator implements IExternalServi
 	/**
 	 * Version of the rest API that is supported by this annotator.
 	 */
-	static final String					SUPPORTED_VERSION				 = "6.2";
+	static final String					SUPPORTED_VERSION				 = "7.0";
 
 	/**
 	 * Url address of ensembl restful service.

annotation/src/test/java/lcsb/mapviewer/annotation/AnnotationTestFunctions.java

@@ -34,7 +34,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -55,13 +54,12 @@ import lcsb.mapviewer.persist.DbUtils;
 import lcsb.mapviewer.persist.dao.cache.CacheTypeDao;
 
 @Transactional(value = "txManager")
-@Rollback(false)
 @ContextConfiguration(locations = { //
     "/applicationContext-annotation.xml", //
     "/applicationContext-persist.xml", //
     "/test-applicationContext.xml", //
     "/test-applicationContext.xml", //
-    "/dataSource.xml", //
+    "/test-dataSource.xml", //
 })
 @RunWith(SpringJUnit4ClassRunner.class)
 public abstract class AnnotationTestFunctions extends AbstractTransactionalJUnit4SpringContextTests {