diff --git a/CHANGELOG b/CHANGELOG
index 493a5fbd27a4164acabd1f07d47e3f9178a7a1d8..3d7f817464881a37bb0a248a72c07b3f1158fe37 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+minerva (17.1.0) unstable; urgency=medium
+  * Bug fix: sometimes there was a deadlock when uploading a project due (#2069)
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Thu, 29 Aug 2024 13:00:00 +0200
+
 minerva (17.1.0) unstable; urgency=medium
   * Improvement: downloadModel API call contains strictCutoff parameter
     (default=true) to allow selecting reaction that cross polygon (#1769)
diff --git a/CellDesigner-plugin/pom.xml b/CellDesigner-plugin/pom.xml
index 8f07c889ecf60659b46f4e50cd5a8f1767dbb438..6508b076a65158401be488979a4c2b46f01cfdff 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.1.0</version>
+		<version>17.1.1</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.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>commons</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter-CellDesigner</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/annotation/pom.xml b/annotation/pom.xml
index a4cc3d91cbc366443584e87f85500f7bdfd5e297..67b6180d20da47b708d2aa5037f43b6d52cf2b37 100644
--- a/annotation/pom.xml
+++ b/annotation/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>lcsb.mapviewer</groupId>
 		<artifactId>parent</artifactId>
-		<version>17.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 	<artifactId>annotation</artifactId>
 	<name>Annotation module</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- dependency from the MapViewer dao -->
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>persist</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</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.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- Log4J2 -->
diff --git a/commons/pom.xml b/commons/pom.xml
index ddef5cdbb7a574bf4820c9a96fc1f7d706ad8b84..e6f14fcc11859fefee1f8d900d4d2998cfd81d5f 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>lcsb.mapviewer</groupId>
 		<artifactId>parent</artifactId>
-		<version>17.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Mapviewer commons</name>
diff --git a/converter-CellDesigner/pom.xml b/converter-CellDesigner/pom.xml
index 8f6e65f0f971038e6ca25e0c614142b7f80170b3..f7928409ef236f9587074927e5be3b79dd4b76c1 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.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 	<artifactId>converter-CellDesigner</artifactId>
 	<name>CellDesigner converter</name>
@@ -17,13 +17,13 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- Log4J2 -->
diff --git a/converter-SBGNML/pom.xml b/converter-SBGNML/pom.xml
index e7c66bcda74245f5f4d6ffdc39ca6d195df549c4..d2afce40115f512de33a34b2cd155a299e654d66 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.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 	<artifactId>converter-SBGNML</artifactId>
 
@@ -20,26 +20,26 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>persist</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter-CellDesigner</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter-graphics</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/converter-graphics/pom.xml b/converter-graphics/pom.xml
index 8b77ca66a71978b529dd1dc3d25da35b7c2d81f9..2f6013be71d07073e782a06b9ea8eb311d3602a2 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.1.0</version>
+		<version>17.1.1</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.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model-command</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- Log4J2 -->
diff --git a/converter-sbml/pom.xml b/converter-sbml/pom.xml
index de6b7d476d01a6160547504e06f9bc41e5861122..9c20cb13815a7cb5e638e54644fe213c54e7f89a 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.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 	<artifactId>converter-sbml</artifactId>
 	<name>converter-sbml</name>
@@ -40,22 +40,22 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model-command</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter-CellDesigner</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- Log4J2 -->
@@ -167,7 +167,7 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter-graphics</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/converter/pom.xml b/converter/pom.xml
index d69a4b09124d420ae78e9a8943b584d9a5c8bbae..131e80d7249d91d60446302b150ff13cdb41f738 100644
--- a/converter/pom.xml
+++ b/converter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>lcsb.mapviewer</groupId>
     <artifactId>parent</artifactId>
-    <version>17.1.0</version>
+    <version>17.1.1</version>
   </parent>
   
   <artifactId>converter</artifactId>
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
       <artifactId>model</artifactId>
-      <version>17.1.0</version>
+      <version>17.1.1</version>
     </dependency>
 		<dependency>
 			<groupId>xerces</groupId>
diff --git a/frontend-js/pom.xml b/frontend-js/pom.xml
index 5bd97ae4414f22baa716e9c02e26cd8f7c88236e..ec5d8e0a1fd000caea4df38eb5a21c1700e2d4b8 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.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 	<artifactId>frontend-js</artifactId>
 	<name>frontend-js</name>
diff --git a/model-command/pom.xml b/model-command/pom.xml
index 0bb694f02687ab670477188c538472b74c1781ca..c59505c996603cb0452cbe2186ace3a9902403bc 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.1.0</version>
+    <version>17.1.1</version>
   </parent>
   <artifactId>model-command</artifactId>
   <name>Model commands</name>
@@ -16,7 +16,7 @@
 		<dependency>
     	<groupId>lcsb.mapviewer</groupId>
       <artifactId>model</artifactId>
-      <version>17.1.0</version>
+      <version>17.1.1</version>
     </dependency>
     
 
@@ -24,7 +24,7 @@
 		<dependency>
       <groupId>lcsb.mapviewer</groupId>
       <artifactId>converter-CellDesigner</artifactId>
-      <version>17.1.0</version>
+      <version>17.1.1</version>
     </dependency>
 
 		<!-- Log4J2-->
diff --git a/model/pom.xml b/model/pom.xml
index e5f15286b35ad29e78b435022f993bc668804e8f..ac6d49db43e964d0d820db4b6c8f8b024916187b 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>lcsb.mapviewer</groupId>
 		<artifactId>parent</artifactId>
-		<version>17.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 	<artifactId>model</artifactId>
 	<name>model MapViewer</name>
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>commons</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- Java xml serialization -->
diff --git a/pathvisio/pom.xml b/pathvisio/pom.xml
index 97ea99b0d414c5d16b5b4b64755fb78878610a0b..e0bb5e020f268a70fabe8d2ec52bae7f8152f099 100644
--- a/pathvisio/pom.xml
+++ b/pathvisio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>lcsb.mapviewer</groupId>
 		<artifactId>parent</artifactId>
-		<version>17.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 	<artifactId>pathvisio</artifactId>
 	<name>Pathvisio plugin</name>
@@ -77,26 +77,26 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter-CellDesigner</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter-graphics</artifactId>
 			<scope>test</scope>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model-command</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- Log4J2 -->
diff --git a/persist/pom.xml b/persist/pom.xml
index b7b4648513e72b72eac0b3221c837da62b60ddc3..ab652879069b04c879d0113dd5b102b568e4a0da 100644
--- a/persist/pom.xml
+++ b/persist/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>lcsb.mapviewer</groupId>
 		<artifactId>parent</artifactId>
-		<version>17.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 
 	<artifactId>persist</artifactId>
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- Hibernate -->
diff --git a/pom.xml b/pom.xml
index 3b26d9816004063629dda49cc28d8a9e39fc55cb..84aa63f6e139d5eee0c2e507b8bf51ded992a48e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>lcsb.mapviewer</groupId>
 	<artifactId>parent</artifactId>
-	<version>17.1.0</version>
+	<version>17.1.1</version>
 	<packaging>pom</packaging>
 
     <name>parent MapViewer</name>
diff --git a/rest-api/pom.xml b/rest-api/pom.xml
index 426d2b9dbd316e57391d6ed5b763e64ea6a04d69..ca69ab18bd95921aa64e7922fd17bf4fc691c268 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.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 	<artifactId>rest-api</artifactId>
 	<name>rest-api</name>
@@ -19,19 +19,19 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>service</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>pathvisio</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/service/pom.xml b/service/pom.xml
index d2b62f9cf1ef27f7340ea4747ddb5e36721e72ed..f18dfa8796b8255173cba04a9dc5e49926ca0fab 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>lcsb.mapviewer</groupId>
 		<artifactId>parent</artifactId>
-		<version>17.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 
 	<artifactId>service</artifactId>
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- dependency from the MapViewer dao -->
@@ -28,47 +28,47 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>persist</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>model-command</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>annotation</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- dependency from the MapViewer cell designer parser -->
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter-CellDesigner</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- dependency from the MapViewer SBGN-ML parser -->
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter-SBGNML</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- dependency from the MapViewer graphics converter -->
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter-graphics</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- dependency from the SBML parser -->
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>converter-sbml</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<!-- Log4J2 -->
diff --git a/web/pom.xml b/web/pom.xml
index bb9c1becabe3029bcb157cc01fbc18a34b177535..e9856a891bf0dc654162832ac162bfe8f3853b98 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>lcsb.mapviewer</groupId>
 		<artifactId>parent</artifactId>
-		<version>17.1.0</version>
+		<version>17.1.1</version>
 	</parent>
 	<artifactId>web</artifactId>
 	<packaging>jar</packaging>
@@ -36,19 +36,19 @@
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>service</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>rest-api</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>lcsb.mapviewer</groupId>
 			<artifactId>frontend-js</artifactId>
-			<version>17.1.0</version>
+			<version>17.1.1</version>
 		</dependency>
 
 		<dependency>