Merge branch 'hotfix/2.6.1'

Author: LEDfan

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>eu.openanalytics</groupId>
 	<artifactId>shinyproxy</artifactId>
-	<version>2.6.0</version>
+	<version>2.6.1</version>
 	<packaging>jar</packaging>
 
 	<name>ShinyProxy</name>
@@ -19,14 +19,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.12.RELEASE</version>
+		<version>2.5.12</version>
 		<relativePath />
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<containerproxy.version>0.8.10</containerproxy.version>
+		<containerproxy.version>0.8.11</containerproxy.version>
 		<resource.delimiter>&amp;</resource.delimiter>
 	</properties>