diff --git a/deegree-client/deegree-jsf-core/pom.xml b/deegree-client/deegree-jsf-core/pom.xml
index 2b9577aefb..4dac1ac3b6 100644
--- a/deegree-client/deegree-jsf-core/pom.xml
+++ b/deegree-client/deegree-jsf-core/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-client/deegree-wps-webclient/pom.xml b/deegree-client/deegree-wps-webclient/pom.xml
index b204a98385..242233a9cb 100644
--- a/deegree-client/deegree-wps-webclient/pom.xml
+++ b/deegree-client/deegree-wps-webclient/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-client/deegree-wpsprinter-webclient/pom.xml b/deegree-client/deegree-wpsprinter-webclient/pom.xml
index 0518b4a211..26a143025e 100644
--- a/deegree-client/deegree-wpsprinter-webclient/pom.xml
+++ b/deegree-client/deegree-wpsprinter-webclient/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-client/pom.xml b/deegree-client/pom.xml
index 212cdae833..3e54fc88c2 100644
--- a/deegree-client/pom.xml
+++ b/deegree-client/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-core/deegree-connectionprovider-datasource/pom.xml b/deegree-core/deegree-connectionprovider-datasource/pom.xml
index abb802151a..0b91a82fb1 100644
--- a/deegree-core/deegree-connectionprovider-datasource/pom.xml
+++ b/deegree-core/deegree-connectionprovider-datasource/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-3d/pom.xml b/deegree-core/deegree-core-3d/pom.xml
index 23eba6f423..20e28a293d 100644
--- a/deegree-core/deegree-core-3d/pom.xml
+++ b/deegree-core/deegree-core-3d/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-annotations/pom.xml b/deegree-core/deegree-core-annotations/pom.xml
index 786df33399..ffee0864ed 100644
--- a/deegree-core/deegree-core-annotations/pom.xml
+++ b/deegree-core/deegree-core-annotations/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-base/pom.xml b/deegree-core/deegree-core-base/pom.xml
index cbf198abf5..11d0d7d202 100644
--- a/deegree-core/deegree-core-base/pom.xml
+++ b/deegree-core/deegree-core-base/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-commons/pom.xml b/deegree-core/deegree-core-commons/pom.xml
index e194f82207..3bb51661ad 100644
--- a/deegree-core/deegree-core-commons/pom.xml
+++ b/deegree-core/deegree-core-commons/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-coverage/pom.xml b/deegree-core/deegree-core-coverage/pom.xml
index 6ea180727a..543247538c 100644
--- a/deegree-core/deegree-core-coverage/pom.xml
+++ b/deegree-core/deegree-core-coverage/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-cs/pom.xml b/deegree-core/deegree-core-cs/pom.xml
index 706ff1e580..99a25c9779 100644
--- a/deegree-core/deegree-core-cs/pom.xml
+++ b/deegree-core/deegree-core-cs/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-db/pom.xml b/deegree-core/deegree-core-db/pom.xml
index bdec7d8e06..9a868993dd 100644
--- a/deegree-core/deegree-core-db/pom.xml
+++ b/deegree-core/deegree-core-db/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-featureinfo/pom.xml b/deegree-core/deegree-core-featureinfo/pom.xml
index df2d0995ac..1655173126 100644
--- a/deegree-core/deegree-core-featureinfo/pom.xml
+++ b/deegree-core/deegree-core-featureinfo/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-filterfunctions/pom.xml b/deegree-core/deegree-core-filterfunctions/pom.xml
index e83b43e0bf..d645a5c367 100644
--- a/deegree-core/deegree-core-filterfunctions/pom.xml
+++ b/deegree-core/deegree-core-filterfunctions/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-gdal/pom.xml b/deegree-core/deegree-core-gdal/pom.xml
index 75dbe4442f..32c028611f 100644
--- a/deegree-core/deegree-core-gdal/pom.xml
+++ b/deegree-core/deegree-core-gdal/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-geometry/pom.xml b/deegree-core/deegree-core-geometry/pom.xml
index 4fdcaab2a9..90f1022532 100644
--- a/deegree-core/deegree-core-geometry/pom.xml
+++ b/deegree-core/deegree-core-geometry/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-layer/pom.xml b/deegree-core/deegree-core-layer/pom.xml
index 97e02cf036..eefd406cff 100644
--- a/deegree-core/deegree-core-layer/pom.xml
+++ b/deegree-core/deegree-core-layer/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-metadata/pom.xml b/deegree-core/deegree-core-metadata/pom.xml
index 3842237c31..d9306f0b05 100644
--- a/deegree-core/deegree-core-metadata/pom.xml
+++ b/deegree-core/deegree-core-metadata/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-commons/pom.xml b/deegree-core/deegree-core-protocol/deegree-protocol-commons/pom.xml
index 8c9496a437..1994f8918b 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-commons/pom.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-commons/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-protocol</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-csw/pom.xml b/deegree-core/deegree-core-protocol/deegree-protocol-csw/pom.xml
index 1f5dc481eb..2cc0d37f96 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-csw/pom.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-csw/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-protocol</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/pom.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/pom.xml
index 37ebc5f75b..04a4266ebd 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/pom.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-protocol</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/pom.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wms/pom.xml
index 4e4dedde14..5f9a8d9624 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/pom.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-protocol</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wmts/pom.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wmts/pom.xml
index b5ba872950..7e2cec02c0 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wmts/pom.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wmts/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-protocol</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-protocol/pom.xml b/deegree-core/deegree-core-protocol/pom.xml
index 7d0236bd82..7b18cc4c15 100644
--- a/deegree-core/deegree-core-protocol/pom.xml
+++ b/deegree-core/deegree-core-protocol/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-commons/pom.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-commons/pom.xml
index 2911022922..5323dd24a2 100644
--- a/deegree-core/deegree-core-remoteows/deegree-remoteows-commons/pom.xml
+++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-commons/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-remoteows</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/pom.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/pom.xml
index 002baefd4a..3c8e3f7891 100644
--- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/pom.xml
+++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-remoteows</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/pom.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/pom.xml
index ffcb413e1f..e20451d991 100644
--- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/pom.xml
+++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-remoteows</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml
index 472dc1c35a..2d29d8bfa7 100644
--- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml
+++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-remoteows</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-remoteows/pom.xml b/deegree-core/deegree-core-remoteows/pom.xml
index 8dc9bb75aa..2a9bc22c6b 100644
--- a/deegree-core/deegree-core-remoteows/pom.xml
+++ b/deegree-core/deegree-core-remoteows/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-core/deegree-core-rendering-2d/pom.xml b/deegree-core/deegree-core-rendering-2d/pom.xml
index 97453bed7d..f2d81a0709 100644
--- a/deegree-core/deegree-core-rendering-2d/pom.xml
+++ b/deegree-core/deegree-core-rendering-2d/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-schema/pom.xml b/deegree-core/deegree-core-schema/pom.xml
index 53e9cccff6..592f92ec2e 100644
--- a/deegree-core/deegree-core-schema/pom.xml
+++ b/deegree-core/deegree-core-schema/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-commons/pom.xml b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-commons/pom.xml
index 705e84e6c5..c27b09b188 100644
--- a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-commons/pom.xml
+++ b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-commons/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-sqldialect</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-mssql/pom.xml b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-mssql/pom.xml
index 43069838ed..60e1d5f81e 100644
--- a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-mssql/pom.xml
+++ b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-mssql/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-sqldialect</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml
index 545bbd0ab8..42a0f0557b 100644
--- a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml
+++ b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-sqldialect</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-postgis/pom.xml b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-postgis/pom.xml
index ae6fe290a7..53529f77cc 100644
--- a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-postgis/pom.xml
+++ b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-postgis/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core-sqldialect</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-sqldialect/pom.xml b/deegree-core/deegree-core-sqldialect/pom.xml
index 7670fbb4f4..2f4f384a8d 100644
--- a/deegree-core/deegree-core-sqldialect/pom.xml
+++ b/deegree-core/deegree-core-sqldialect/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-core/deegree-core-style/pom.xml b/deegree-core/deegree-core-style/pom.xml
index 8b28847c9a..7b7efe7f2b 100644
--- a/deegree-core/deegree-core-style/pom.xml
+++ b/deegree-core/deegree-core-style/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-theme/pom.xml b/deegree-core/deegree-core-theme/pom.xml
index 40e6668484..31862272b6 100644
--- a/deegree-core/deegree-core-theme/pom.xml
+++ b/deegree-core/deegree-core-theme/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-core/deegree-core-tile/pom.xml b/deegree-core/deegree-core-tile/pom.xml
index 4457e8ac26..49a9b65173 100644
--- a/deegree-core/deegree-core-tile/pom.xml
+++ b/deegree-core/deegree-core-tile/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/deegree-core-workspace/pom.xml b/deegree-core/deegree-core-workspace/pom.xml
index e6503f54e2..baea37ad6f 100644
--- a/deegree-core/deegree-core-workspace/pom.xml
+++ b/deegree-core/deegree-core-workspace/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-core/pom.xml b/deegree-core/pom.xml
index 1ac065e21c..f12be17306 100644
--- a/deegree-core/pom.xml
+++ b/deegree-core/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml
index 802d29d13c..441a02944b 100644
--- a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml
+++ b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-coveragestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-coveragestores/pom.xml b/deegree-datastores/deegree-coveragestores/pom.xml
index 6c1b9acce1..27ec5f8ce5 100644
--- a/deegree-datastores/deegree-coveragestores/pom.xml
+++ b/deegree-datastores/deegree-coveragestores/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-datastores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <profiles>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-commons/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-commons/pom.xml
index 27387d4735..27d57d2478 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-commons/pom.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-commons/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-featurestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml
index af552a0eb3..0e93d640ba 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-featurestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/pom.xml
index 40b7765fbe..9576e4a20a 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/pom.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-featurestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/pom.xml
index 223858f625..e4c56db968 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/pom.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-featurestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/pom.xml
index f0d05bc416..c31e673177 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/pom.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-featurestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml
index 6d65b205a6..42841668f2 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-featurestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-featurestores/pom.xml b/deegree-datastores/deegree-featurestores/pom.xml
index 6ac1b8f41b..0bee0260eb 100644
--- a/deegree-datastores/deegree-featurestores/pom.xml
+++ b/deegree-datastores/deegree-featurestores/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-datastores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-commons/pom.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-commons/pom.xml
index b7b00b15cd..0b82d0c149 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-commons/pom.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-commons/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-mdstores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml
index 4dc0e481f3..5023fc9424 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-mdstores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml
index b0719813c7..68c1519d7f 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-mdstores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml
index e15d849d18..dcb799b5bc 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-mdstores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-mdstores/pom.xml b/deegree-datastores/deegree-mdstores/pom.xml
index ce4f7de8a9..11fdb0354b 100644
--- a/deegree-datastores/deegree-mdstores/pom.xml
+++ b/deegree-datastores/deegree-mdstores/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-datastores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/pom.xml
index e75c32c251..2fe36b07a5 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/pom.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tilestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml
index 4b4b0b1469..1b74727f6f 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tilestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml
index 68afecf5a5..51713b74db 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tilestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/pom.xml
index 913605a168..2e3823180c 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/pom.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tilestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/pom.xml
index 9eb28b9bc5..c409f8c2e7 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/pom.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tilestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/pom.xml
index 4bf9b0ce37..1302b33cc0 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/pom.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tilestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml
index 71b37f977d..e30c96df2e 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tilestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml
index c39e41dcb2..8976d2516a 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tilestores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-datastores/deegree-tilestores/pom.xml b/deegree-datastores/deegree-tilestores/pom.xml
index 3b83b7e46f..8cd7551a50 100644
--- a/deegree-datastores/deegree-tilestores/pom.xml
+++ b/deegree-datastores/deegree-tilestores/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-datastores</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-datastores/pom.xml b/deegree-datastores/pom.xml
index c16192465d..431b2614b8 100644
--- a/deegree-datastores/pom.xml
+++ b/deegree-datastores/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-layers/deegree-layers-coverage/pom.xml b/deegree-layers/deegree-layers-coverage/pom.xml
index 54fe8c5d15..5daabae00e 100644
--- a/deegree-layers/deegree-layers-coverage/pom.xml
+++ b/deegree-layers/deegree-layers-coverage/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-layers</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-layers/deegree-layers-feature/pom.xml b/deegree-layers/deegree-layers-feature/pom.xml
index 43dc00c0a9..a75b0728f2 100644
--- a/deegree-layers/deegree-layers-feature/pom.xml
+++ b/deegree-layers/deegree-layers-feature/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-layers</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-layers/deegree-layers-gdal/pom.xml b/deegree-layers/deegree-layers-gdal/pom.xml
index 5306b92d48..098181576e 100644
--- a/deegree-layers/deegree-layers-gdal/pom.xml
+++ b/deegree-layers/deegree-layers-gdal/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-layers</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-layers/deegree-layers-remotewms/pom.xml b/deegree-layers/deegree-layers-remotewms/pom.xml
index 68aec702a3..66653b3adc 100644
--- a/deegree-layers/deegree-layers-remotewms/pom.xml
+++ b/deegree-layers/deegree-layers-remotewms/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-layers</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-layers/deegree-layers-tile/pom.xml b/deegree-layers/deegree-layers-tile/pom.xml
index e10e2cf9e2..71a49eaa30 100644
--- a/deegree-layers/deegree-layers-tile/pom.xml
+++ b/deegree-layers/deegree-layers-tile/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-layers</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-layers/pom.xml b/deegree-layers/pom.xml
index 15b8442d26..838b01b246 100644
--- a/deegree-layers/pom.xml
+++ b/deegree-layers/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-processproviders/deegree-processprovider-example/pom.xml b/deegree-processproviders/deegree-processprovider-example/pom.xml
index 747d4e3919..569d23b21b 100644
--- a/deegree-processproviders/deegree-processprovider-example/pom.xml
+++ b/deegree-processproviders/deegree-processprovider-example/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-processproviders</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-processproviders/deegree-processprovider-fme/pom.xml b/deegree-processproviders/deegree-processprovider-fme/pom.xml
index 327dec8c2e..df1b8d525c 100644
--- a/deegree-processproviders/deegree-processprovider-fme/pom.xml
+++ b/deegree-processproviders/deegree-processprovider-fme/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-processproviders</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-processproviders/deegree-processprovider-style/pom.xml b/deegree-processproviders/deegree-processprovider-style/pom.xml
index 5d4cec51e7..52ff744e86 100644
--- a/deegree-processproviders/deegree-processprovider-style/pom.xml
+++ b/deegree-processproviders/deegree-processprovider-style/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-processproviders</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-processproviders/pom.xml b/deegree-processproviders/pom.xml
index 1252ad973d..50bcff81e1 100644
--- a/deegree-processproviders/pom.xml
+++ b/deegree-processproviders/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-services/deegree-services-commons/pom.xml b/deegree-services/deegree-services-commons/pom.xml
index 9a4f6ca585..c5e10a4249 100644
--- a/deegree-services/deegree-services-commons/pom.xml
+++ b/deegree-services/deegree-services-commons/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-services</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-services/deegree-services-config/pom.xml b/deegree-services/deegree-services-config/pom.xml
index 0ffb2c2a79..b307ffd3fe 100644
--- a/deegree-services/deegree-services-config/pom.xml
+++ b/deegree-services/deegree-services-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-services</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-services/deegree-services-csw/pom.xml b/deegree-services/deegree-services-csw/pom.xml
index fa13881597..921c636f16 100644
--- a/deegree-services/deegree-services-csw/pom.xml
+++ b/deegree-services/deegree-services-csw/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-services</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-services/deegree-services-wcs/pom.xml b/deegree-services/deegree-services-wcs/pom.xml
index 1758717b55..29cb11c632 100644
--- a/deegree-services/deegree-services-wcs/pom.xml
+++ b/deegree-services/deegree-services-wcs/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-services</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-services/deegree-services-wfs/pom.xml b/deegree-services/deegree-services-wfs/pom.xml
index 8946eac859..4ca55c6662 100644
--- a/deegree-services/deegree-services-wfs/pom.xml
+++ b/deegree-services/deegree-services-wfs/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-services</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-services/deegree-services-wms/pom.xml b/deegree-services/deegree-services-wms/pom.xml
index e71a8f1c46..2d2a4a627e 100644
--- a/deegree-services/deegree-services-wms/pom.xml
+++ b/deegree-services/deegree-services-wms/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-services</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-services/deegree-services-wmts/pom.xml b/deegree-services/deegree-services-wmts/pom.xml
index a2d72442cc..6814cb8ba5 100644
--- a/deegree-services/deegree-services-wmts/pom.xml
+++ b/deegree-services/deegree-services-wmts/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-services</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-services/deegree-services-wps/pom.xml b/deegree-services/deegree-services-wps/pom.xml
index a1977d925b..6169e94488 100644
--- a/deegree-services/deegree-services-wps/pom.xml
+++ b/deegree-services/deegree-services-wps/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-services</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-services/deegree-services-wpvs/pom.xml b/deegree-services/deegree-services-wpvs/pom.xml
index c448bb48d0..9813747663 100644
--- a/deegree-services/deegree-services-wpvs/pom.xml
+++ b/deegree-services/deegree-services-wpvs/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-services</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-services/deegree-webservices-handbook/pom.xml b/deegree-services/deegree-webservices-handbook/pom.xml
index b0b5a9c8a4..b45311ee5c 100644
--- a/deegree-services/deegree-webservices-handbook/pom.xml
+++ b/deegree-services/deegree-webservices-handbook/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-services</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/deegree-services/deegree-webservices/pom.xml b/deegree-services/deegree-webservices/pom.xml
index 8593999f82..966e24d834 100644
--- a/deegree-services/deegree-webservices/pom.xml
+++ b/deegree-services/deegree-webservices/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-services</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
   <build>
     <plugins>
diff --git a/deegree-services/pom.xml b/deegree-services/pom.xml
index c0335ce59e..9bd17b73af 100644
--- a/deegree-services/pom.xml
+++ b/deegree-services/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-tests/deegree-compliance-tests/pom.xml b/deegree-tests/deegree-compliance-tests/pom.xml
index 2c60075e78..5b3ee0f425 100644
--- a/deegree-tests/deegree-compliance-tests/pom.xml
+++ b/deegree-tests/deegree-compliance-tests/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tests</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-tests/deegree-integration-tests/pom.xml b/deegree-tests/deegree-integration-tests/pom.xml
index ac144d0adc..49743d9f28 100644
--- a/deegree-tests/deegree-integration-tests/pom.xml
+++ b/deegree-tests/deegree-integration-tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tests</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-tests/deegree-resource-deps-tests/pom.xml b/deegree-tests/deegree-resource-deps-tests/pom.xml
index 3422918aae..c9619f1193 100644
--- a/deegree-tests/deegree-resource-deps-tests/pom.xml
+++ b/deegree-tests/deegree-resource-deps-tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tests</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-tests/deegree-testservice/pom.xml b/deegree-tests/deegree-testservice/pom.xml
index 2947aa3c5d..6cf583eddf 100644
--- a/deegree-tests/deegree-testservice/pom.xml
+++ b/deegree-tests/deegree-testservice/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
     <relativePath>../../deegree-client</relativePath>
   </parent>
   <build>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/pom.xml b/deegree-tests/deegree-wms-remoteows-tests/pom.xml
index f731513f30..482e40bfd4 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/pom.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tests</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-tests/deegree-wms-similarity-tests/pom.xml b/deegree-tests/deegree-wms-similarity-tests/pom.xml
index c8874540dc..1c7f3baf9a 100644
--- a/deegree-tests/deegree-wms-similarity-tests/pom.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tests</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-tests/deegree-wms-tiling-tests/pom.xml b/deegree-tests/deegree-wms-tiling-tests/pom.xml
index 6e27834c93..f47980a4ae 100644
--- a/deegree-tests/deegree-wms-tiling-tests/pom.xml
+++ b/deegree-tests/deegree-wms-tiling-tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tests</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-tests/deegree-wmts-tests/pom.xml b/deegree-tests/deegree-wmts-tests/pom.xml
index ed955e3b01..1c378833da 100644
--- a/deegree-tests/deegree-wmts-tests/pom.xml
+++ b/deegree-tests/deegree-wmts-tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tests</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-tests/deegree-workspace-tests/pom.xml b/deegree-tests/deegree-workspace-tests/pom.xml
index b244db5cb3..5bf232d970 100644
--- a/deegree-tests/deegree-workspace-tests/pom.xml
+++ b/deegree-tests/deegree-workspace-tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tests</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-tests/pom.xml b/deegree-tests/pom.xml
index 20d67639e4..1e8f76baba 100644
--- a/deegree-tests/pom.xml
+++ b/deegree-tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-themes/deegree-themes-remotewms/pom.xml b/deegree-themes/deegree-themes-remotewms/pom.xml
index 2a4b5884a4..bb8125857c 100644
--- a/deegree-themes/deegree-themes-remotewms/pom.xml
+++ b/deegree-themes/deegree-themes-remotewms/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>deegree-themes-remotewms</artifactId>
   <packaging>jar</packaging>
-  <version>3.5.7</version>
+  <version>3.5.8-SNAPSHOT</version>
   <name>deegree-themes-remotewms</name>
   <description>Map layer theme implementation for remote Web Map Services</description>
 
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-themes</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-themes/pom.xml b/deegree-themes/pom.xml
index f24fb6b85c..4f6240f86e 100644
--- a/deegree-themes/pom.xml
+++ b/deegree-themes/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/deegree-tools/deegree-tools-3d/pom.xml b/deegree-tools/deegree-tools-3d/pom.xml
index d80bc996b5..0a1e4bce32 100644
--- a/deegree-tools/deegree-tools-3d/pom.xml
+++ b/deegree-tools/deegree-tools-3d/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tools</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-tools/deegree-tools-alkis/pom.xml b/deegree-tools/deegree-tools-alkis/pom.xml
index 4d307ad057..1e23ee9a83 100644
--- a/deegree-tools/deegree-tools-alkis/pom.xml
+++ b/deegree-tools/deegree-tools-alkis/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tools</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-tools/deegree-tools-base/pom.xml b/deegree-tools/deegree-tools-base/pom.xml
index 340529c6c1..53ad19e284 100644
--- a/deegree-tools/deegree-tools-base/pom.xml
+++ b/deegree-tools/deegree-tools-base/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tools</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-tools/deegree-tools-gml/pom.xml b/deegree-tools/deegree-tools-gml/pom.xml
index d4c3bb69d9..e135962901 100755
--- a/deegree-tools/deegree-tools-gml/pom.xml
+++ b/deegree-tools/deegree-tools-gml/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tools</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <inceptionYear>2016</inceptionYear>
diff --git a/deegree-tools/deegree-tools-migration/pom.xml b/deegree-tools/deegree-tools-migration/pom.xml
index c72c0b43fd..ba9db76d05 100644
--- a/deegree-tools/deegree-tools-migration/pom.xml
+++ b/deegree-tools/deegree-tools-migration/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-tools</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/deegree-tools/pom.xml b/deegree-tools/pom.xml
index 14b5f6643e..ff1c931c15 100644
--- a/deegree-tools/pom.xml
+++ b/deegree-tools/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-workspaces/deegree-workspace-aixm/pom.xml b/deegree-workspaces/deegree-workspace-aixm/pom.xml
index f478435dbe..032e252122 100644
--- a/deegree-workspaces/deegree-workspace-aixm/pom.xml
+++ b/deegree-workspaces/deegree-workspace-aixm/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-workspaces</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/pom.xml b/deegree-workspaces/deegree-workspace-compliance-tests/pom.xml
index b643187b72..1f56f6d2eb 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/pom.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-workspaces</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/pom.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/pom.xml
index 1b33acbecf..58d4acb8cd 100644
--- a/deegree-workspaces/deegree-workspace-csw-memory-tests/pom.xml
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-workspaces</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-workspaces/deegree-workspace-csw/pom.xml b/deegree-workspaces/deegree-workspace-csw/pom.xml
index 4e206f1039..fb5cdd642a 100644
--- a/deegree-workspaces/deegree-workspace-csw/pom.xml
+++ b/deegree-workspaces/deegree-workspace-csw/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-workspaces</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-workspaces/deegree-workspace-fme/pom.xml b/deegree-workspaces/deegree-workspace-fme/pom.xml
index c3a828001f..63de73af0d 100644
--- a/deegree-workspaces/deegree-workspace-fme/pom.xml
+++ b/deegree-workspaces/deegree-workspace-fme/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-workspaces</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-workspaces/deegree-workspace-geosciml/pom.xml b/deegree-workspaces/deegree-workspace-geosciml/pom.xml
index 6cd87f9ef1..b3075763f2 100644
--- a/deegree-workspaces/deegree-workspace-geosciml/pom.xml
+++ b/deegree-workspaces/deegree-workspace-geosciml/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-workspaces</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-workspaces/deegree-workspace-utah/pom.xml b/deegree-workspaces/deegree-workspace-utah/pom.xml
index e3fb022c14..dc1038936f 100644
--- a/deegree-workspaces/deegree-workspace-utah/pom.xml
+++ b/deegree-workspaces/deegree-workspace-utah/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-workspaces</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-workspaces/deegree-workspace-wcts/pom.xml b/deegree-workspaces/deegree-workspace-wcts/pom.xml
index e0eb7a17b4..933b406469 100644
--- a/deegree-workspaces/deegree-workspace-wcts/pom.xml
+++ b/deegree-workspaces/deegree-workspace-wcts/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-workspaces</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-workspaces/deegree-workspace-wps/pom.xml b/deegree-workspaces/deegree-workspace-wps/pom.xml
index fd56b51a91..1fa180fcf2 100644
--- a/deegree-workspaces/deegree-workspace-wps/pom.xml
+++ b/deegree-workspaces/deegree-workspace-wps/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-workspaces</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/deegree-workspaces/pom.xml b/deegree-workspaces/pom.xml
index c534565270..5127bc4d57 100644
--- a/deegree-workspaces/pom.xml
+++ b/deegree-workspaces/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.5.7</version>
+    <version>3.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/pom.xml b/pom.xml
index f6c31591a4..b9e5a9eee4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.deegree</groupId>
   <artifactId>deegree</artifactId>
   <packaging>pom</packaging>
-  <version>3.5.7</version>
+  <version>3.5.8-SNAPSHOT</version>
   <name>deegree</name>
   <description>Framework for OGC Web Service implementations and geospatial applications</description>
   <url>http://www.deegree.org/</url>
@@ -13,7 +13,7 @@
     <connection>scm:git:git@github.com:deegree/deegree3.git</connection>
     <developerConnection>scm:git:git@github.com:deegree/deegree3.git</developerConnection>
     <url>https://github.com/deegree/deegree3</url>
-    <tag>deegree-3.5.7</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <repositories>