diff --git a/CHANGELOG b/CHANGELOG index 6a5feaa4ff85e0e8b997a8beb6dba28d91b64c8f..ef1639edd0e6af1815ffb29ed9c7f6be315fc237 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +minerva (17.0.0~beta.6) unstable; urgency=medium + * Bug fix (regression): when caching data on project upload annotation links + were not present (#2012) + + -- Piotr Gawron <piotr.gawron@uni.lu> Thu, 14 Mar 2024 10:00:00 +0200 + minerva (17.0.0~beta.5) unstable; urgency=medium * Small improvement (regression): additional info about archive/revive project action (#1971) diff --git a/CellDesigner-plugin/pom.xml b/CellDesigner-plugin/pom.xml index 4af37e4b5cc93d4784b667448bb8a5ba7c88dd37..05f57537deb87ddffd6be743c60152c07e2e24ce 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.5</version> + <version>17.0.0~beta.6</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.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>commons</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-CellDesigner</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> diff --git a/annotation/pom.xml b/annotation/pom.xml index dd5846141d187761a169aee42e6db5db04ca791d..05f358520aab6ae468f5a50dca5c435e7e53dcd4 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.5</version> + <version>17.0.0~beta.6</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.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- dependency from the MapViewer dao --> @@ -27,7 +27,7 @@ <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>persist</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</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.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- Log4J2 --> diff --git a/commons/pom.xml b/commons/pom.xml index 6a7a76f72426adb7c60576526cdc7030ed6ebd11..d7c3aa904d0b623f66de4fd903b650f1dc846e94 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.5</version> + <version>17.0.0~beta.6</version> </parent> <artifactId>commons</artifactId> <name>Mapviewer commons</name> diff --git a/converter-CellDesigner/pom.xml b/converter-CellDesigner/pom.xml index 42146cad941ca86f3667be6afb80a2eb359b3a3e..a7ec50143ffe829c0ce90f83326654dbcbd7a7d4 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.5</version> + <version>17.0.0~beta.6</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.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- Log4J2 --> diff --git a/converter-SBGNML/pom.xml b/converter-SBGNML/pom.xml index 745e3e33102b419bed6ae00417f0fdd53c90c04c..084fbab2223538e0696e74c57aeb5f2a7a827235 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.5</version> + <version>17.0.0~beta.6</version> </parent> <artifactId>converter-SBGNML</artifactId> @@ -20,26 +20,26 @@ <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>model</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>persist</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> <scope>test</scope> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-CellDesigner</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-graphics</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> diff --git a/converter-graphics/pom.xml b/converter-graphics/pom.xml index 5e2c828080d42bc967ba5eb57d374cfc8d0aa499..d62cb10b5250ce825141f9ce55cb99d214a00f15 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.5</version> + <version>17.0.0~beta.6</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.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>model-command</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- Log4J2 --> diff --git a/converter-sbml/pom.xml b/converter-sbml/pom.xml index d4134d7a8bc09ccb7887a94594f250d2522f6234..f3159fe05f921a58fc818dc0817408fc33dcf762 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.5</version> + <version>17.0.0~beta.6</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.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>model-command</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-CellDesigner</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- Log4J2 --> @@ -167,7 +167,7 @@ <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-graphics</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> <scope>test</scope> </dependency> diff --git a/converter/pom.xml b/converter/pom.xml index 1461e781c80b78298dbc1b49f6eda2c05e2344fc..c208389009ab0545d8f1928a65735606f9b510b3 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.5</version> + <version>17.0.0~beta.6</version> </parent> <artifactId>converter</artifactId> @@ -15,7 +15,7 @@ <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>model</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>xerces</groupId> diff --git a/frontend-js/pom.xml b/frontend-js/pom.xml index a321af8e8a4658378d6dc6d6c31e3ebb7ae63694..93019aa996d26c2d1f549be76558635f7124e331 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.5</version> + <version>17.0.0~beta.6</version> </parent> <artifactId>frontend-js</artifactId> <name>frontend-js</name> diff --git a/model-command/pom.xml b/model-command/pom.xml index 111638e5499161898f0f56c2f665155a6c28223f..14cab75758645387d89ff2d54a5612d230112891 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.5</version> + <version>17.0.0~beta.6</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.5</version> + <version>17.0.0~beta.6</version> </dependency> @@ -24,7 +24,7 @@ <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-CellDesigner</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- Log4J2--> diff --git a/model/pom.xml b/model/pom.xml index 9f98485334dc45cc1149a6605dbc8ad4c2b89030..1692eb32df4c903cb477b8495b6b090bc9a39466 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.5</version> + <version>17.0.0~beta.6</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.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- Java xml serialization --> diff --git a/pathvisio/pom.xml b/pathvisio/pom.xml index 1a86ce03bdd451b2e65bfe082dcfe6db8e41e7c8..74d4dffc930075de9d3db3fda4d5b48887b25932 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.5</version> + <version>17.0.0~beta.6</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.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-CellDesigner</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-graphics</artifactId> <scope>test</scope> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>model-command</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- Log4J2 --> diff --git a/persist/pom.xml b/persist/pom.xml index 1a7672fe2a9285689a5f42992f1b7b0af985e36e..317c5dc02386f1a85e17dd05fb69fcd178c3c839 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.5</version> + <version>17.0.0~beta.6</version> </parent> <artifactId>persist</artifactId> @@ -26,7 +26,7 @@ <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>model</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- Hibernate --> diff --git a/pom.xml b/pom.xml index 30e2f5f5990a70ee236322630cf3763de74514bd..6deebb69dbb6589d76bbecf0e99de84efcc53365 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>lcsb.mapviewer</groupId> <artifactId>parent</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> <packaging>pom</packaging> <name>parent MapViewer</name> diff --git a/rest-api/pom.xml b/rest-api/pom.xml index f31b282757d091df58ed6faba5192d061c79caba..4adae49b7dd7af63df9103b777ed9424f11e06ce 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.5</version> + <version>17.0.0~beta.6</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.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>service</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>pathvisio</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> diff --git a/service/pom.xml b/service/pom.xml index 0c1f1a12ebc1789eaefa39aab291fb20004f5374..0c2f4e033a8ed12f53528ad14169b3db896328c8 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.5</version> + <version>17.0.0~beta.6</version> </parent> <artifactId>service</artifactId> @@ -19,7 +19,7 @@ <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>model</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- dependency from the MapViewer dao --> @@ -27,47 +27,47 @@ <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>persist</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>model-command</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>annotation</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- dependency from the MapViewer cell designer parser --> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-CellDesigner</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- dependency from the MapViewer SBGN-ML parser --> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-SBGNML</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- dependency from the MapViewer graphics converter --> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-graphics</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- dependency from the SBML parser --> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>converter-sbml</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <!-- Log4J2 --> diff --git a/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java b/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java index bb4178cd833b3b4565893e8d4492688bbba48865..92c1309a8db64f9d4102067b5fa42a36e68fbc4a 100644 --- a/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java +++ b/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java @@ -432,9 +432,8 @@ public class ProjectService implements IProjectService { if (params.isCacheModel()) { self.cacheData(params.getProjectId()); - } else { - self.createRefreshMiriamInfoJobs(params.getProjectId()); } + self.createRefreshMiriamInfoJobs(params.getProjectId()); self.updateProjectStatus(params.getProjectId(), ProjectStatus.DONE, IProgressUpdater.MAX_PROGRESS); if (params.getNotifyEmail() != null && !params.getNotifyEmail().equals("")) { diff --git a/web/pom.xml b/web/pom.xml index a965995928a4a20ffc84dae41b6d1beb5b2729e2..c0ebbb3c9ef1d1998be57b12ec06329aa5e9777a 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.5</version> + <version>17.0.0~beta.6</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.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>rest-api</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> <artifactId>frontend-js</artifactId> - <version>17.0.0~beta.5</version> + <version>17.0.0~beta.6</version> </dependency> <dependency>