diff --git a/http/api/pom.xml b/http/api/pom.xml
index 4b35f48..cd53c16 100644
--- a/http/api/pom.xml
+++ b/http/api/pom.xml
@@ -53,7 +53,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/http/base/pom.xml b/http/base/pom.xml
index 16580c6..9899f6e 100644
--- a/http/base/pom.xml
+++ b/http/base/pom.xml
@@ -56,7 +56,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml
index 073eb3b..a657334 100644
--- a/http/bridge/pom.xml
+++ b/http/bridge/pom.xml
@@ -65,7 +65,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/http/bundle/pom.xml b/http/bundle/pom.xml
index a9948d5..c20773e 100644
--- a/http/bundle/pom.xml
+++ b/http/bundle/pom.xml
@@ -70,7 +70,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 96c4c50..e252259 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -65,7 +65,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/http/pom.xml b/http/pom.xml
index 523e730..f950530 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -114,25 +114,14 @@
                 <version>2.5</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.felix</groupId>
+                <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.core</artifactId>
-                <version>1.0.0</version>
+                <version>4.0.0</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.osgi.foundation</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
+                <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.compendium</artifactId>
-                <version>1.0.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>javax.servlet</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>4.0.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/http/proxy/pom.xml b/http/proxy/pom.xml
index be7eb0c..c6ed995 100644
--- a/http/proxy/pom.xml
+++ b/http/proxy/pom.xml
@@ -56,7 +56,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/http/samples/bridge/pom.xml b/http/samples/bridge/pom.xml
index 4b7b905..c101aef 100644
--- a/http/samples/bridge/pom.xml
+++ b/http/samples/bridge/pom.xml
@@ -106,7 +106,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
         <dependency>
diff --git a/http/samples/filter/pom.xml b/http/samples/filter/pom.xml
index 5fd9b7d..f75004e 100644
--- a/http/samples/filter/pom.xml
+++ b/http/samples/filter/pom.xml
@@ -72,7 +72,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index e301b8c..c384a7e 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -72,7 +72,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/http/whiteboard/pom.xml b/http/whiteboard/pom.xml
index 27ea929..292f0a9 100644
--- a/http/whiteboard/pom.xml
+++ b/http/whiteboard/pom.xml
@@ -64,7 +64,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>