diff --git a/CellDesigner-plugin/pom.xml b/CellDesigner-plugin/pom.xml
index 34a9a264c87ce7547b496a9b39c0646121cf52f9..89b045d5261b52088bfd2ff36990c15cbfbf6173 100644
--- a/CellDesigner-plugin/pom.xml
+++ b/CellDesigner-plugin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>CellDesigner-plugin</artifactId>
<!-- dependency from the MapViewer model -->
@@ -50,19 +50,19 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>commons</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
diff --git a/annotation/pom.xml b/annotation/pom.xml
index 6211d3bf65bf824d2f07b83e759fcaa87cd46a26..7aad4bf76db25f7d7de0bfe50a4f61809937c6c7 100644
--- a/annotation/pom.xml
+++ b/annotation/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>annotation</artifactId>
<name>Annotation module</name>
@@ -19,7 +19,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- dependency from the MapViewer dao -->
@@ -27,7 +27,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>persist</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- dependency from the MapViewer cell designer parser (we need access
@@ -35,13 +35,13 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- Log4J2 -->
diff --git a/annotation/src/main/java/lcsb/mapviewer/annotation/cache/GeneralCache.java b/annotation/src/main/java/lcsb/mapviewer/annotation/cache/GeneralCache.java
index 1016c4f358de978c6bc5bbe40a209e3d13f7f294..5c4a050f9395753e57ec60f5f27b00dda97106f4 100644
--- a/annotation/src/main/java/lcsb/mapviewer/annotation/cache/GeneralCache.java
+++ b/annotation/src/main/java/lcsb/mapviewer/annotation/cache/GeneralCache.java
@@ -469,8 +469,8 @@ public class GeneralCache implements GeneralCacheInterface, ApplicationContextAw
}
@Override
- public List<CacheQuery> getExpired() {
- return cacheQueryDao.getExpired(Integer.MAX_VALUE);
+ public List<CacheQuery> getExpired(final int limit) {
+ return cacheQueryDao.getExpired(limit);
}
@Override
diff --git a/annotation/src/main/java/lcsb/mapviewer/annotation/cache/GeneralCacheInterface.java b/annotation/src/main/java/lcsb/mapviewer/annotation/cache/GeneralCacheInterface.java
index bbc942e63b25accc237dbafcdddc080801dd0108..2ae0843e13b39df2522cbe831164045f7a4ec5b5 100644
--- a/annotation/src/main/java/lcsb/mapviewer/annotation/cache/GeneralCacheInterface.java
+++ b/annotation/src/main/java/lcsb/mapviewer/annotation/cache/GeneralCacheInterface.java
@@ -29,6 +29,6 @@ public interface GeneralCacheInterface extends QueryCacheInterface, MinervaJobEx
void delete(CacheQuery entry);
- List<CacheQuery> getExpired();
+ List<CacheQuery> getExpired(int limit);
}
diff --git a/commons/pom.xml b/commons/pom.xml
index 8b9f1beda344ea72b81f8869edb87ee62ea79b47..3ace6a52b60d75a620491bb87fcf26b5d63aa4d3 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>commons</artifactId>
<name>Mapviewer commons</name>
diff --git a/converter-CellDesigner/pom.xml b/converter-CellDesigner/pom.xml
index bbe121dd52fff1de15b06f82d31b64c9f2b91102..24b1138069a6cc0b6ad58a1046a105b81085a6cd 100644
--- a/converter-CellDesigner/pom.xml
+++ b/converter-CellDesigner/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>converter-CellDesigner</artifactId>
<name>CellDesigner converter</name>
@@ -17,13 +17,13 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- Log4J2 -->
diff --git a/converter-SBGNML/pom.xml b/converter-SBGNML/pom.xml
index c84b19af293752fdf66c3591cdc1b1edf5014b64..2dfd4d9f02bcd873ca793710fd441bb72d208d93 100644
--- a/converter-SBGNML/pom.xml
+++ b/converter-SBGNML/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>converter-SBGNML</artifactId>
@@ -20,26 +20,26 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>persist</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
diff --git a/converter-graphics/pom.xml b/converter-graphics/pom.xml
index 45420c8b0749aea6c45b8f84b805ecf5c4e6d410..bdff18d4bc471a702b5e05dd8dd48eefcfd8f421 100644
--- a/converter-graphics/pom.xml
+++ b/converter-graphics/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>converter-graphics</artifactId>
<name>MapViewer graphics converter</name>
@@ -18,13 +18,13 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- Log4J2 -->
diff --git a/converter-sbml/pom.xml b/converter-sbml/pom.xml
index adcdfde6e1b1917359577f384bb70546106d01e0..7f9d8be1f76ebeddfa86c6c8ae56d831c3e49cc9 100644
--- a/converter-sbml/pom.xml
+++ b/converter-sbml/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>converter-sbml</artifactId>
<name>converter-sbml</name>
@@ -40,22 +40,22 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- Log4J2 -->
@@ -167,7 +167,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
<scope>test</scope>
</dependency>
diff --git a/converter/pom.xml b/converter/pom.xml
index f7b13a025817c0fbd7c6775f2276bb44c5a4601b..1014fb5b76bea520a31be1e36a450dd97da24dc1 100644
--- a/converter/pom.xml
+++ b/converter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>converter</artifactId>
@@ -15,7 +15,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
diff --git a/frontend-js/pom.xml b/frontend-js/pom.xml
index c0005a0d4e57dcc9e57828d92c975037aa228252..ebe77cb5ddb9aa0a5a74209d54f78409f9ef1396 100644
--- a/frontend-js/pom.xml
+++ b/frontend-js/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>frontend-js</artifactId>
<name>frontend-js</name>
diff --git a/model-command/pom.xml b/model-command/pom.xml
index aabe146546dbacebed6caabd1bdafeba420aac46..e9fb51ed4ce6719bbdf8fba1412760e5e69d43f8 100644
--- a/model-command/pom.xml
+++ b/model-command/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>model-command</artifactId>
<name>Model commands</name>
@@ -16,7 +16,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
@@ -24,7 +24,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- Log4J2-->
diff --git a/model/pom.xml b/model/pom.xml
index c5fd43624dc2075b2410f8cc505c69ad336ba939..295990e5e0cbe12b962d08f7227b59c47099d5f0 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>model</artifactId>
<name>model MapViewer</name>
@@ -15,7 +15,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>commons</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- Java xml serialization -->
diff --git a/pathvisio/pom.xml b/pathvisio/pom.xml
index 58180f02690c8bf94bfd22fd5dd3e26011e2576a..ee78db2868239c1d87167278134e348dac9b9520 100644
--- a/pathvisio/pom.xml
+++ b/pathvisio/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>pathvisio</artifactId>
<name>Pathvisio plugin</name>
@@ -77,26 +77,26 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId>
<scope>test</scope>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- Log4J2 -->
diff --git a/persist/pom.xml b/persist/pom.xml
index b84a019f593b10e05ca3ed24d7e0d63137dc7fde..e6ba90ee07600834d0d033d490cc3d48df9f67d6 100644
--- a/persist/pom.xml
+++ b/persist/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>persist</artifactId>
@@ -26,7 +26,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- Hibernate -->
diff --git a/pom.xml b/pom.xml
index 9f93a87010e35e2e9c593e7d64332a29b3150d16..c1aed1a7ec039c14993b2d70f7546c1861e7d0c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
<packaging>pom</packaging>
<name>parent MapViewer</name>
diff --git a/rest-api/pom.xml b/rest-api/pom.xml
index 7e457ea2c2b66f5e7e24e08be12f9594cf40edfb..e393d8b8537ed010e32ced892efb80038997c3e6 100644
--- a/rest-api/pom.xml
+++ b/rest-api/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>rest-api</artifactId>
<name>rest-api</name>
@@ -19,19 +19,19 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>service</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>pathvisio</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
diff --git a/service/pom.xml b/service/pom.xml
index 5f057d70d6dd15b8a3348d01f2db386768f31a75..bb2496f51467d80a1ddc859df976759fe2da2bc1 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>service</artifactId>
@@ -19,7 +19,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- dependency from the MapViewer dao -->
@@ -27,47 +27,47 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>persist</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>annotation</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- dependency from the MapViewer cell designer parser -->
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- dependency from the MapViewer SBGN-ML parser -->
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-SBGNML</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- dependency from the MapViewer graphics converter -->
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- dependency from the SBML parser -->
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-sbml</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<!-- Log4J2 -->
diff --git a/web/pom.xml b/web/pom.xml
index 3e763a9920c1ccb7d9ebcfc8853e378472a7ff73..dadc1aab212668fa8c3f4ba9278e9c8b99f2bea0 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</parent>
<artifactId>web</artifactId>
<packaging>jar</packaging>
@@ -36,19 +36,19 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>service</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>rest-api</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>frontend-js</artifactId>
- <version>17.0.0~beta.1</version>
+ <version>17.0.0~beta.2</version>
</dependency>
<dependency>