From 3783c589b8921098b57131ca966b5160129885b6 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 6 Sep 2018 17:54:23 +0200
Subject: [PATCH] ensembl is in new version 7.0
---
.../annotation/services/annotators/EnsemblAnnotator.java | 2 +-
.../lcsb/mapviewer/annotation/AnnotationTestFunctions.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/EnsemblAnnotator.java b/annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/EnsemblAnnotator.java
index 65d3eebe51..c3474f8c1f 100644
--- a/annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/EnsemblAnnotator.java
+++ b/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.
diff --git a/annotation/src/test/java/lcsb/mapviewer/annotation/AnnotationTestFunctions.java b/annotation/src/test/java/lcsb/mapviewer/annotation/AnnotationTestFunctions.java
index 689b3eba24..73690ea7ee 100644
--- a/annotation/src/test/java/lcsb/mapviewer/annotation/AnnotationTestFunctions.java
+++ b/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 {
--
GitLab