diff --git a/admin/command/pom.xml b/admin/command/pom.xml
index 26eb0ea..29c0e90 100644
--- a/admin/command/pom.xml
+++ b/admin/command/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.admin</groupId>
     <artifactId>org.apache.karaf.admin.command</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Admin Command</name>
 
     <properties>
diff --git a/admin/core/pom.xml b/admin/core/pom.xml
index 1034812..c5ba239 100644
--- a/admin/core/pom.xml
+++ b/admin/core/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.admin</groupId>
     <artifactId>org.apache.karaf.admin.core</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Admin Core</name>
 
     <properties>
diff --git a/admin/management/pom.xml b/admin/management/pom.xml
index b17b828..48dd986 100644
--- a/admin/management/pom.xml
+++ b/admin/management/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.admin</groupId>
     <artifactId>org.apache.karaf.admin.management</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Admin Management</name>
 
     <properties>
diff --git a/admin/pom.xml b/admin/pom.xml
index 11a6629..7e55f88 100644
--- a/admin/pom.xml
+++ b/admin/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.admin</groupId>
     <artifactId>admin</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Admin</name>
 
     <modules>
diff --git a/archetypes/command/pom.xml b/archetypes/command/pom.xml
index d495831..71902b3 100644
--- a/archetypes/command/pom.xml
+++ b/archetypes/command/pom.xml
@@ -21,12 +21,12 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>archetypes</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.archetypes</groupId>
     <artifactId>archetypes-command</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
 
     <name>Apache Karaf :: Command Archetype</name>
 
diff --git a/archetypes/itests/pom.xml b/archetypes/itests/pom.xml
index 4de6e6c..063a8d6 100644
--- a/archetypes/itests/pom.xml
+++ b/archetypes/itests/pom.xml
@@ -20,11 +20,11 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>org.apache.karaf</groupId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.karaf.archetypes</groupId>
     <artifactId>archetypes-itests</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Archetypes :: ITests</name>
 
     <dependencies>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index a52add6..2f52620 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
 
     <name>Apache Karaf :: Archetypes</name>
     <packaging>pom</packaging>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index bfda5c8..32a6641 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf</groupId>
     <artifactId>apache-karaf</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Assembly</name>
 
     <properties>
diff --git a/client/pom.xml b/client/pom.xml
index 20dcf84..2e276f7 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf</groupId>
     <artifactId>org.apache.karaf.client</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Client</name>
 
     <properties>
diff --git a/demos/branding/pom.xml b/demos/branding/pom.xml
index fc48b07..f48ee9f 100644
--- a/demos/branding/pom.xml
+++ b/demos/branding/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.karaf.demos</groupId>
         <artifactId>demos</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.demos</groupId>
diff --git a/demos/branding/shell/pom.xml b/demos/branding/shell/pom.xml
index e753b5a..94c4527 100644
--- a/demos/branding/shell/pom.xml
+++ b/demos/branding/shell/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.karaf.demos</groupId>
         <artifactId>org.apache.karaf.demos.branding</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.demos</groupId>
     <artifactId>org.apache.karaf.demos.branding.shell</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Demos :: Branding :: Shell</name>
 
     <build>
diff --git a/demos/pom.xml b/demos/pom.xml
index 62de20c..8ed07ef 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.demos</groupId>
     <artifactId>demos</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Demos</name>
 
     <modules>
diff --git a/demos/web/pom.xml b/demos/web/pom.xml
index ce475d6..c587c4d 100644
--- a/demos/web/pom.xml
+++ b/demos/web/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.karaf.demos</groupId>
     <artifactId>demos</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.karaf.demos</groupId>
diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml
index b662844..9d4fe50 100644
--- a/deployer/blueprint/pom.xml
+++ b/deployer/blueprint/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.deployer</groupId>
         <artifactId>deployer</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.deployer</groupId>
     <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Blueprint Deployer</name>
 
     <description>This deployer transforms a plain blueprint xml file to a deployable bundle</description>
diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml
index a022047..3e863d9 100644
--- a/deployer/features/pom.xml
+++ b/deployer/features/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.deployer</groupId>
         <artifactId>deployer</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.deployer</groupId>
     <artifactId>org.apache.karaf.deployer.features</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Features Deployer</name>
 
     <description>This deployer can deploy features descriptor on the fly</description>
diff --git a/deployer/pom.xml b/deployer/pom.xml
index e0ef5c6..2f2540f 100644
--- a/deployer/pom.xml
+++ b/deployer/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.deployer</groupId>
     <artifactId>deployer</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Deployer</name>
 
     <modules>
diff --git a/deployer/spring/pom.xml b/deployer/spring/pom.xml
index e53ea6f..677acbe 100644
--- a/deployer/spring/pom.xml
+++ b/deployer/spring/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.deployer</groupId>
         <artifactId>deployer</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.deployer</groupId>
     <artifactId>org.apache.karaf.deployer.spring</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Spring Deployer</name>
 
     <description>This deployer transforms a plain spring xml file to a deployable bundle</description>
diff --git a/deployer/war/pom.xml b/deployer/war/pom.xml
index c9f72a8..1d50227 100644
--- a/deployer/war/pom.xml
+++ b/deployer/war/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.deployer</groupId>
         <artifactId>deployer</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.deployer</groupId>
     <artifactId>org.apache.karaf.deployer.war</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: WAR Deployer</name>
 
     <description>This deployer transforms a plain war file to a deployable bundle</description>
diff --git a/exception/pom.xml b/exception/pom.xml
index f2913f6..de97aed 100644
--- a/exception/pom.xml
+++ b/exception/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf</groupId>
     <artifactId>org.apache.karaf.exception</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Exception</name>
 
     <properties>
diff --git a/features/command/pom.xml b/features/command/pom.xml
index 809d7aa..c040764 100644
--- a/features/command/pom.xml
+++ b/features/command/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.features</groupId>
         <artifactId>features</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.features</groupId>
     <artifactId>org.apache.karaf.features.command</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Features Command</name>
 
     <properties>
diff --git a/features/core/pom.xml b/features/core/pom.xml
index 4ef8752..c9db90a 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.features</groupId>
         <artifactId>features</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.features</groupId>
     <artifactId>org.apache.karaf.features.core</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Features Core</name>
 
     <properties>
diff --git a/features/management/pom.xml b/features/management/pom.xml
index 5587195..187b605 100644
--- a/features/management/pom.xml
+++ b/features/management/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.features</groupId>
         <artifactId>features</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.features</groupId>
     <artifactId>org.apache.karaf.features.management</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Features Management</name>
 
     <properties>
diff --git a/features/obr/pom.xml b/features/obr/pom.xml
index d9ac760..b65b3b8 100644
--- a/features/obr/pom.xml
+++ b/features/obr/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.features</groupId>
         <artifactId>features</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.features</groupId>
     <artifactId>org.apache.karaf.features.obr</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Features OBR Resolver</name>
 
     <properties>
diff --git a/features/pom.xml b/features/pom.xml
index fcdf3f3..9a5504a 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.features</groupId>
     <artifactId>features</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Features</name>
 
     <modules>
diff --git a/itests/dependencies/pom.xml b/itests/dependencies/pom.xml
index 8bcb17f..fb09f14 100644
--- a/itests/dependencies/pom.xml
+++ b/itests/dependencies/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.itests</groupId>
         <artifactId>itests</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.itests</groupId>
     <artifactId>dependencies</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Integration Tests Dependencies</name>
 
     <repositories>
diff --git a/itests/pom.xml b/itests/pom.xml
index 3424d08..0d061a2 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.itests</groupId>
     <artifactId>itests</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Integration Tests Parent</name>
 
     <modules>
diff --git a/itests/tests/pom.xml b/itests/tests/pom.xml
index f2172bb..038f0df 100644
--- a/itests/tests/pom.xml
+++ b/itests/tests/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.itests</groupId>
         <artifactId>itests</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf</groupId>
     <artifactId>tests</artifactId>
     <packaging>jar</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: ITests</name>
 
     <description>
diff --git a/jaas/boot/pom.xml b/jaas/boot/pom.xml
index 5331d48..8e11f06 100644
--- a/jaas/boot/pom.xml
+++ b/jaas/boot/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.jaas</groupId>
         <artifactId>jaas</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.jaas</groupId>
     <artifactId>org.apache.karaf.jaas.boot</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: JAAS Boot</name>
 
     <description>
diff --git a/jaas/config/pom.xml b/jaas/config/pom.xml
index c1c3457..cceb05c 100644
--- a/jaas/config/pom.xml
+++ b/jaas/config/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.jaas</groupId>
         <artifactId>jaas</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.jaas</groupId>
     <artifactId>org.apache.karaf.jaas.config</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: JAAS Config</name>
 
     <description>
diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml
index f72c23a..eb6fd79 100644
--- a/jaas/jasypt/pom.xml
+++ b/jaas/jasypt/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.karaf.jaas</groupId>
         <artifactId>jaas</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.karaf.jaas</groupId>
     <artifactId>org.apache.karaf.jaas.jasypt</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: JAAS Jasypt Encryption</name>
     
     <description>
diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index e9e794e..4f5a976 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.jaas</groupId>
         <artifactId>jaas</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.jaas</groupId>
     <artifactId>org.apache.karaf.jaas.modules</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: JAAS Modules</name>
 
     <description>
diff --git a/jaas/pom.xml b/jaas/pom.xml
index 1917c93..5d75c1d 100644
--- a/jaas/pom.xml
+++ b/jaas/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.jaas</groupId>
     <artifactId>jaas</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: JAAS</name>
 
     <modules>
diff --git a/main/pom.xml b/main/pom.xml
index 81777b4..cf04846 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf</groupId>
     <artifactId>org.apache.karaf.main</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Main</name>
 
     <properties>
diff --git a/management/pom.xml b/management/pom.xml
index 25121ce..702bdbf 100644
--- a/management/pom.xml
+++ b/management/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf</groupId>
     <artifactId>org.apache.karaf.management</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Management</name>
 
     <properties>
diff --git a/manual/pom.xml b/manual/pom.xml
index 68c78f0..fa06e59 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.apache.karaf</groupId>
     <artifactId>karaf</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.karaf</groupId>
   <artifactId>manual</artifactId>
-  <version>2.1.6</version>
+  <version>2.1.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache Karaf :: Manual</name>
   <description>The Karaf Manual which generates a HTML and PDF representation of the manual.</description>
diff --git a/pom.xml b/pom.xml
index 8f91dc5..64a33c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     <groupId>org.apache.karaf</groupId>
     <artifactId>karaf</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf</name>
     <inceptionYear>2007</inceptionYear>
 
@@ -55,9 +55,9 @@
     </modules>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/karaf/tags/karaf-2.1.6</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/karaf/tags/karaf-2.1.6</developerConnection>
-        <url>http://svn.apache.org/viewvc/karaf/tags/karaf-2.1.6</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/karaf/branches/karaf-2.1.x</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/karaf/branches/karaf-2.1.x</developerConnection>
+        <url>http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/</url>
     </scm>
 
     <issueManagement>
diff --git a/shell/commands/pom.xml b/shell/commands/pom.xml
index 5db76ee..d5b00e9 100644
--- a/shell/commands/pom.xml
+++ b/shell/commands/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.shell</groupId>
     <artifactId>org.apache.karaf.shell.commands</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Shell Various Commands</name>
 
     <description>
diff --git a/shell/config/pom.xml b/shell/config/pom.xml
index e0c629f..ccf0980 100644
--- a/shell/config/pom.xml
+++ b/shell/config/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.shell</groupId>
     <artifactId>org.apache.karaf.shell.config</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Shell ConfigAdmin Commands</name>
 
     <description>
diff --git a/shell/console/pom.xml b/shell/console/pom.xml
index b8c9f23..0d170d8 100644
--- a/shell/console/pom.xml
+++ b/shell/console/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.shell</groupId>
     <artifactId>org.apache.karaf.shell.console</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Shell Console</name>
 
     <description>
diff --git a/shell/dev/pom.xml b/shell/dev/pom.xml
index 5c07da2..2108487 100644
--- a/shell/dev/pom.xml
+++ b/shell/dev/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>shell</artifactId>
     <groupId>org.apache.karaf.shell</groupId>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/shell/log/pom.xml b/shell/log/pom.xml
index 99689e2..faea96a 100644
--- a/shell/log/pom.xml
+++ b/shell/log/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.shell</groupId>
     <artifactId>org.apache.karaf.shell.log</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Shell Log Commands</name>
 
     <description>
diff --git a/shell/obr/pom.xml b/shell/obr/pom.xml
index 73ccbc5..030ea88 100644
--- a/shell/obr/pom.xml
+++ b/shell/obr/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.shell</groupId>
     <artifactId>org.apache.karaf.shell.obr</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Shell OBR Commands</name>
 
     <description>
diff --git a/shell/osgi/pom.xml b/shell/osgi/pom.xml
index 48cc6d3..b65ebf5 100644
--- a/shell/osgi/pom.xml
+++ b/shell/osgi/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.shell</groupId>
     <artifactId>org.apache.karaf.shell.osgi</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Shell OSGi Commands</name>
 
     <description>
diff --git a/shell/packages/pom.xml b/shell/packages/pom.xml
index e84d09d..4339080 100644
--- a/shell/packages/pom.xml
+++ b/shell/packages/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.shell</groupId>
     <artifactId>org.apache.karaf.shell.packages</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Shell PackageAdmin Commands</name>
 
     <description>
diff --git a/shell/pom.xml b/shell/pom.xml
index f7106fd..d76fbfb 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.shell</groupId>
     <artifactId>shell</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Shell</name>
 
     <modules>
diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml
index b30af30..d8d569f 100644
--- a/shell/ssh/pom.xml
+++ b/shell/ssh/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.shell</groupId>
     <artifactId>org.apache.karaf.shell.ssh</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Shell SSH</name>
 
     <description>
diff --git a/shell/wrapper/pom.xml b/shell/wrapper/pom.xml
index 15c2e91..8fc884b 100644
--- a/shell/wrapper/pom.xml
+++ b/shell/wrapper/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>shell</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.shell</groupId>
     <artifactId>org.apache.karaf.shell.wrapper</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Shell Service Wrapper</name>
 
     <description>
diff --git a/tooling/cmdhelp-maven-plugin/pom.xml b/tooling/cmdhelp-maven-plugin/pom.xml
index 6d91878..58288a2 100644
--- a/tooling/cmdhelp-maven-plugin/pom.xml
+++ b/tooling/cmdhelp-maven-plugin/pom.xml
@@ -21,13 +21,13 @@
     <parent>
       <groupId>org.apache.karaf.tooling</groupId>
       <artifactId>tooling</artifactId>
-      <version>2.1.6</version>
+      <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.tooling</groupId>
     <artifactId>cmdhelp-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Maven2 Command Help plugin</name>
 
     <description>
diff --git a/tooling/features-maven-plugin/pom.xml b/tooling/features-maven-plugin/pom.xml
index 5eac851..883204c 100644
--- a/tooling/features-maven-plugin/pom.xml
+++ b/tooling/features-maven-plugin/pom.xml
@@ -21,13 +21,13 @@
     <parent>
       <groupId>org.apache.karaf.tooling</groupId>
       <artifactId>tooling</artifactId>
-      <version>2.1.6</version>
+      <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.tooling</groupId>
     <artifactId>features-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Maven2 Features plugin</name>
 
     <description>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 5b38fe2..a1825c3 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.tooling</groupId>
     <artifactId>tooling</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Tooling</name>
 
     <modules>
diff --git a/tooling/testing/pom.xml b/tooling/testing/pom.xml
index 9161aca..fbefd1e 100644
--- a/tooling/testing/pom.xml
+++ b/tooling/testing/pom.xml
@@ -21,13 +21,13 @@
     <parent>
       <groupId>org.apache.karaf.tooling</groupId>
       <artifactId>tooling</artifactId>
-      <version>2.1.6</version>
+      <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.tooling</groupId>
     <artifactId>org.apache.karaf.tooling.testing</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Testing environment</name>
 
     <description>
diff --git a/util/pom.xml b/util/pom.xml
index 9bb510e..9dfbd18 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.karaf</groupId>
     <artifactId>org.apache.karaf.util</artifactId>
     <packaging>jar</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Util</name>
     
     <description>
diff --git a/webconsole/admin/pom.xml b/webconsole/admin/pom.xml
index c644641..9445137 100644
--- a/webconsole/admin/pom.xml
+++ b/webconsole/admin/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.karaf.webconsole</groupId>
         <artifactId>webconsole</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.webconsole</groupId>
     <artifactId>org.apache.karaf.webconsole.admin</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Web Console :: Admin Plugin</name>
   
     <properties>
diff --git a/webconsole/branding/pom.xml b/webconsole/branding/pom.xml
index f0304bb..c532ef0 100644
--- a/webconsole/branding/pom.xml
+++ b/webconsole/branding/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.karaf.webconsole</groupId>
         <artifactId>webconsole</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.karaf.webconsole</groupId>
     <artifactId>org.apache.karaf.webconsole.branding</artifactId>
     <packaging>bundle</packaging>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>Apache Karaf :: Web Console :: Branding</name>
 
     <description>Apache Karaf branding for the Apache Felix Web Console. This fragment
diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml
index fac08d1..943ba85 100644
--- a/webconsole/features/pom.xml
+++ b/webconsole/features/pom.xml
@@ -24,13 +24,13 @@
   <parent>
       <groupId>org.apache.karaf.webconsole</groupId>
       <artifactId>webconsole</artifactId>
-      <version>2.1.6</version>
+      <version>2.1.7-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.karaf.webconsole</groupId>
   <artifactId>org.apache.karaf.webconsole.features</artifactId>
   <packaging>bundle</packaging>
-  <version>2.1.6</version>
+  <version>2.1.7-SNAPSHOT</version>
   <name>Apache Karaf :: Web Console :: Features Plugin</name>
   
   <properties>
diff --git a/webconsole/gogo/pom.xml b/webconsole/gogo/pom.xml
index 5d99ed5..4883c85 100644
--- a/webconsole/gogo/pom.xml
+++ b/webconsole/gogo/pom.xml
@@ -24,13 +24,13 @@
   <parent>
       <groupId>org.apache.karaf.webconsole</groupId>
       <artifactId>webconsole</artifactId>
-      <version>2.1.6</version>
+      <version>2.1.7-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.karaf.webconsole</groupId>
   <artifactId>org.apache.karaf.webconsole.gogo</artifactId>
   <packaging>bundle</packaging>
-  <version>2.1.6</version>
+  <version>2.1.7-SNAPSHOT</version>
   <name>Apache Karaf :: Web Console :: Gogo Plugin</name>
   
   <properties>
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 14ac488..e9ffeca 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.karaf</groupId>
     <artifactId>karaf</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.7-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.karaf.webconsole</groupId>
   <artifactId>webconsole</artifactId>
   <packaging>pom</packaging>
-  <version>2.1.6</version>
+  <version>2.1.7-SNAPSHOT</version>
   <name>Apache Karaf :: Web Console</name>
   
   <modules>