diff --git a/jaas/pom.xml b/jaas/pom.xml
index 7dca5d1..a8dedd2 100644
--- a/jaas/pom.xml
+++ b/jaas/pom.xml
@@ -94,6 +94,9 @@
                         <Bundle-Vendor>
                             The Apache Software Foundation
                         </Bundle-Vendor>
+                        <Bundle-DocURL>
+                          http://felix.apache.org/documentation/subprojects/apache-felix-jaas.html
+                        </Bundle-DocURL>
                         <Bundle-Activator>
                             org.apache.felix.jaas.internal.Activator
                         </Bundle-Activator>
@@ -185,35 +188,48 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <version>4.2.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <version>4.2.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>biz.aQute</groupId>
-            <artifactId>bndlib</artifactId>
-            <version>1.50.0</version>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>bnd</artifactId>
+            <version>2.1.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
             <version>1.6.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.3</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
           <groupId>org.apache.sling</groupId>
           <artifactId>org.apache.sling.commons.osgi</artifactId>
           <version>2.2.0</version>
+          <scope>provided</scope>
         </dependency>
 
         <!-- testing -->
         <dependency>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>org.apache.felix.framework</artifactId>
+          <version>4.0.2</version>
+          <scope>test</scope>
+        </dependency>
+
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
@@ -241,7 +257,7 @@
       <dependency>
         <groupId>org.ops4j.pax.tinybundles</groupId>
         <artifactId>tinybundles</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
         <scope>test</scope>
       </dependency>
         <dependency>
@@ -283,17 +299,15 @@
                         <artifactId>maven-antrun-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>scr-file-create</id>
+                                <id>jaas-file-create</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>run</goal>
                                 </goals>
                                 <configuration>
                                     <target>
-                                        <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                              tofile="${project.build.directory}/jaas.jar" />
-                                        <copy file="${project.build.directory}/${project.build.finalName}-boot.jar"
-                                              tofile="${project.build.directory}/jaas-boot.jar" />
+                                        <copy file="${project.build.directory}/${project.build.finalName}.jar"                                               tofile="${project.build.directory}/jaas.jar" />
+                                        <copy file="${project.build.directory}/${project.build.finalName}-boot.jar"                                               tofile="${project.build.directory}/jaas-boot.jar" />
                                     </target>
                                 </configuration>
                             </execution>
@@ -339,6 +353,7 @@
                       <goal>check</goal>
                     </goals>
                     <configuration>
+                      <skip>true</skip>
                       <check>
                         <classRatio>100</classRatio>
                         <instructionRatio>90</instructionRatio>
@@ -354,31 +369,5 @@
             </plugins>
           </build>
         </profile>
-
-        <profile>
-            <id>felix</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.apache.felix.framework</artifactId>
-                    <version>4.0.2</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>equinox</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse</groupId>
-                    <artifactId>org.eclipse.osgi</artifactId>
-                    <version>3.8.0.v20120529-1548</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
 </project>