diff --git a/http/whiteboard/pom.xml b/http/whiteboard/pom.xml
index 820732f..b58dbe7 100644
--- a/http/whiteboard/pom.xml
+++ b/http/whiteboard/pom.xml
@@ -36,22 +36,16 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-Activator>
                             org.apache.felix.http.whiteboard.internal.WhiteboardActivator
                         </Bundle-Activator>
-                        <Private-Package>
-                            org.apache.felix.http.api,
-                            org.apache.felix.http.base.*,
-                            org.apache.felix.http.whiteboard.*
-                        </Private-Package>
-                        <Import-Package>
-                            javax.servlet.*,
-                            org.osgi.service.http.*,
-                            org.apache.felix.http.api;resolution:=optional,
-                            *;resolution:=optional
-                        </Import-Package>
+                        <Embed-Dependency>
+                            org.apache.felix.http.base;inline=org/apache/felix/http/base/internal/AbstractActivator*.class|
+                                org/apache/felix/http/base/internal/logger/*
+                        </Embed-Dependency>
                     </instructions>
                 </configuration>
             </plugin>
@@ -62,27 +56,40 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.http.api</artifactId>
+            <version>2.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>org.apache.felix.http.api</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.http.base</artifactId>
+            <version>2.2.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>org.apache.felix.http.base</artifactId>
-            <version>${pom.version}</version>
+            <groupId>biz.aQute</groupId>
+            <artifactId>bndlib</artifactId>
+            <version>1.50.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>