diff --git a/http/api/pom.xml b/http/api/pom.xml
index 17e4f41..1293428 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>3</version>
+        <version>4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Api</name>
     <artifactId>org.apache.felix.http.api</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/api</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/api</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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 62dc609..04f9c89 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>3</version>
+        <version>4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Base</name>
     <artifactId>org.apache.felix.http.base</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/base</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/base</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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 894616c..71165b7 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>3</version>
+        <version>4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Bridge</name>
     <artifactId>org.apache.felix.http.bridge</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/bridge</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/bridge</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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 d7d533d..b57d3f5 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>3</version>
+        <version>4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Bundle</name>
     <artifactId>org.apache.felix.http.bundle</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/bundle</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/bundle</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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 bba6915..cc5e489 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>3</version>
+        <version>4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Cometd</name>
     <artifactId>org.apache.felix.http.cometd</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/cometd</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/cometd</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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/itest/pom.xml b/http/itest/pom.xml
index d8e3ef6..c82b5b4 100644
--- a/http/itest/pom.xml
+++ b/http/itest/pom.xml
@@ -22,19 +22,19 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>3</version>
+        <version>4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Integration Tests</name>
     <artifactId>org.apache.felix.http.itest</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/sslfilter</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/sslfilter</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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>
@@ -65,17 +65,17 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.api</artifactId>
-            <version>2.3.0</version>
+            <version>2.4.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.servlet-api</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.jetty</artifactId>
-            <version>2.3.0</version>
+            <version>2.4.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 104b156..77336b1 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>3</version>
+        <version>4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Jetty</name>
     <artifactId>org.apache.felix.http.jetty</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/jetty</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/jetty</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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 5256da8..eb6394d 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>3</version>
+    <version>4-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-5/parent</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/parent</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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 72cd4e9..ef6af8e 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>5</version>
+    <version>6-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5</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 76c5aec..e27de04 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>3</version>
+        <version>4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Proxy</name>
     <artifactId>org.apache.felix.http.proxy</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/proxy</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/proxy</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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 c647612..f0d0bd7 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>3</version>
+        <version>4-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.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/samples/bridge</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/samples/bridge</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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 89e8da7..ba8c3f4 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>3</version>
+        <version>4-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.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/samples/cometd</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/samples/cometd</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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 3e31658..01ff0a0 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>3</version>
+        <version>4-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.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/samples/filter</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/samples/filter</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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 2469d61..61ba958 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>3</version>
+        <version>4-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.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/samples/whiteboard</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/samples/whiteboard</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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/servlet-api/pom.xml b/http/servlet-api/pom.xml
index cadc25e..13d6b54 100644
--- a/http/servlet-api/pom.xml
+++ b/http/servlet-api/pom.xml
@@ -14,20 +14,20 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>3</version>
+        <version>4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Servlet API</name>
     <description>Provides the Servlet API for use by applications</description>
     <artifactId>org.apache.felix.http.servlet-api</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/servlet-api</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/servlet-api</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/servlet-api</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/servlet-api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/servlet-api</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/http/servlet-api/</url>
     </scm>
 
     <build>
diff --git a/http/sslfilter/pom.xml b/http/sslfilter/pom.xml
index 5ec1837..ff7d8f6 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>3</version>
+        <version>4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http SSL Filter</name>
     <artifactId>org.apache.felix.http.sslfilter</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/sslfilter</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/sslfilter</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.api</artifactId>
-            <version>2.3.0</version>
+            <version>2.4.0-SNAPSHOT</version>
         </dependency>
 
         <!-- Test Dependencies -->
diff --git a/http/whiteboard/pom.xml b/http/whiteboard/pom.xml
index bc80091..ab0105a 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>3</version>
+        <version>4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Whiteboard</name>
     <artifactId>org.apache.felix.http.whiteboard</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/whiteboard</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http-5/whiteboard</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http-5/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>