diff --git a/http/api/pom.xml b/http/api/pom.xml
index efbfc38..713536c 100644
--- a/http/api/pom.xml
+++ b/http/api/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Api</name>
     <artifactId>org.apache.felix.http.api</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/api</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/api</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/api</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/api</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/api/</url>
     </scm>
 
     <build>
diff --git a/http/base/pom.xml b/http/base/pom.xml
index bd66b96..a9c8c72 100644
--- a/http/base/pom.xml
+++ b/http/base/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Base</name>
     <artifactId>org.apache.felix.http.base</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/base</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/base</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/base</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/base</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/base</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/base/</url>
     </scm>
 
     <build>
diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml
index e8491e4..3268762 100644
--- a/http/bridge/pom.xml
+++ b/http/bridge/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Bridge</name>
     <artifactId>org.apache.felix.http.bridge</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/bridge</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/bridge</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/bridge</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/bridge</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/bridge</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/bridge/</url>
     </scm>
 
     <build>
diff --git a/http/bundle/pom.xml b/http/bundle/pom.xml
index 8c0979c..2a0ca00 100644
--- a/http/bundle/pom.xml
+++ b/http/bundle/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Bundle</name>
     <artifactId>org.apache.felix.http.bundle</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/bundle</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/bundle</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/bundle</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/bundle</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/bundle</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/bundle/</url>
     </scm>
 
     <build>
diff --git a/http/cometd/pom.xml b/http/cometd/pom.xml
index c8de409..9ce224e 100644
--- a/http/cometd/pom.xml
+++ b/http/cometd/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Cometd</name>
     <artifactId>org.apache.felix.http.cometd</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/cometd</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/cometd</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/cometd</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/cometd</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/cometd</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/cometd/</url>
     </scm>
 
     <build>
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 4dea25a..be63e21 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Jetty</name>
     <artifactId>org.apache.felix.http.jetty</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
     
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/jetty</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/jetty</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/jetty</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/jetty</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/jetty</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/jetty/</url>
     </scm>
     
     <properties>
diff --git a/http/parent/pom.xml b/http/parent/pom.xml
index c2eee02..4aaa7ab 100755
--- a/http/parent/pom.xml
+++ b/http/parent/pom.xml
@@ -30,7 +30,7 @@
     <name>Apache Felix Http Parent POM</name>
     <groupId>org.apache.felix</groupId>
     <artifactId>org.apache.felix.http.parent</artifactId>
-    <version>2</version>
+    <version>3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <prerequisites>
@@ -48,9 +48,9 @@
     </properties>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/parent</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/parent</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/parent</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/parent</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/parent</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/parent/</url>
     </scm>
 
     <build>
diff --git a/http/pom.xml b/http/pom.xml
index 1032905..3988c7c 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -29,13 +29,13 @@
     <name>Apache Felix Http Reactor</name>
     <groupId>org.apache.felix</groupId>
     <artifactId>org.apache.felix.http</artifactId>
-    <version>4</version>
+    <version>5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/</url>
     </scm>
 
     <modules>
diff --git a/http/proxy/pom.xml b/http/proxy/pom.xml
index 4611fab..3611fe1 100644
--- a/http/proxy/pom.xml
+++ b/http/proxy/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Proxy</name>
     <artifactId>org.apache.felix.http.proxy</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/proxy</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/proxy</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/proxy</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/proxy</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/proxy</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/proxy/</url>
     </scm>
 
     <build>
diff --git a/http/samples/bridge/pom.xml b/http/samples/bridge/pom.xml
index 6800dc8..4dc9607 100644
--- a/http/samples/bridge/pom.xml
+++ b/http/samples/bridge/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Samples - Bridge</name>
     <artifactId>org.apache.felix.http.samples.bridge</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/samples/bridge</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/samples/bridge</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/samples/bridge</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/samples/bridge</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/samples/bridge</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/samples/bridge/</url>
     </scm>
 
     <build>
diff --git a/http/samples/cometd/pom.xml b/http/samples/cometd/pom.xml
index 82e8192..5d70968 100644
--- a/http/samples/cometd/pom.xml
+++ b/http/samples/cometd/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Samples - Cometd</name>
     <artifactId>org.apache.felix.http.samples.cometd</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/samples/cometd</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/samples/cometd</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/samples/cometd</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/samples/cometd</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/samples/cometd</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/samples/cometd/</url>
     </scm>
 
     <build>
diff --git a/http/samples/filter/pom.xml b/http/samples/filter/pom.xml
index e837544..bf34cde 100644
--- a/http/samples/filter/pom.xml
+++ b/http/samples/filter/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Samples - Filter</name>
     <artifactId>org.apache.felix.http.samples.filter</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/samples/filter</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/samples/filter</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/samples/filter</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/samples/filter</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/samples/filter</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/samples/filter/</url>
     </scm>
 
     <build>
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index ba43ee5..ddb7869 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Samples - Whiteboard</name>
     <artifactId>org.apache.felix.http.samples.whiteboard</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/samples/whiteboard</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/samples/whiteboard</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/samples/whiteboard</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/samples/whiteboard</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/samples/whiteboard</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/samples/whiteboard/</url>
     </scm>
 
     <build>
diff --git a/http/sslfilter/pom.xml b/http/sslfilter/pom.xml
index f880529..4cb345a 100644
--- a/http/sslfilter/pom.xml
+++ b/http/sslfilter/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http SSL Filter</name>
     <artifactId>org.apache.felix.http.sslfilter</artifactId>
-    <version>0.0.2</version>
+    <version>0.0.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/sslfilter</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/sslfilter</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/sslfilter</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/sslfilter</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/sslfilter</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/sslfilter/</url>
     </scm>
     
     <properties>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.api</artifactId>
-            <version>2.2.2</version>
+            <version>2.2.3-SNAPSHOT</version>
         </dependency>
 
         <!-- Test Dependencies -->
diff --git a/http/whiteboard/pom.xml b/http/whiteboard/pom.xml
index 724fef9..1c01584 100644
--- a/http/whiteboard/pom.xml
+++ b/http/whiteboard/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>2</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Whiteboard</name>
     <artifactId>org.apache.felix.http.whiteboard</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/whiteboard</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-4/whiteboard</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-4/whiteboard</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/whiteboard</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/whiteboard</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/</url>
     </scm>
 
     <build>