Index: appserver/paas/console/pom.xml
===================================================================
--- appserver/paas/console/pom.xml	(revision 50722)
+++ appserver/paas/console/pom.xml	(working copy)
@@ -104,6 +104,12 @@
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.enterprise</artifactId>
                 <version>${version.osgi}</version>
+								<exclusions>
+									<exclusion>
+										<groupId>org.apache.felix</groupId>
+										<artifactId>javax.servlet</artifactId>
+									</exclusion>
+								</exclusions>
                 <scope>provided</scope>
             </dependency>
             <dependency>
Index: appserver/admingui/dataprovider/pom.xml
===================================================================
--- appserver/admingui/dataprovider/pom.xml	(revision 50722)
+++ appserver/admingui/dataprovider/pom.xml	(working copy)
@@ -141,7 +141,7 @@
         <dependency>
             <groupId>com.sun.woodstock.dependlibs</groupId>
             <artifactId>dataprovider</artifactId>
-            <scope>optional</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 </project>
Index: pom.xml
===================================================================
--- pom.xml	(revision 50722)
+++ pom.xml	(working copy)
@@ -350,7 +350,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version> 2.0 </version>
+                    <version> 2.2 </version>
                 </plugin>
 
                 <plugin>
@@ -901,6 +901,12 @@
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.compendium</artifactId>
                 <version>4.2.0</version>
+								<exclusions>
+									<exclusion>
+										<groupId>org.apache.felix</groupId>
+										<artifactId>javax.servlet</artifactId>
+									</exclusion>
+								</exclusions>
                 <!-- This jar should never be part of runtime. -->
                 <scope>provided</scope>
             </dependency>
@@ -915,6 +921,12 @@
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.enterprise</artifactId>
                 <version>4.2.0</version>
+								<exclusions>
+									<exclusion>
+										<groupId>org.apache.felix</groupId>
+										<artifactId>javax.servlet</artifactId>
+									</exclusion>
+								</exclusions>
                 <!-- This jar should never be part of runtime. -->
                 <scope>provided</scope>
             </dependency>
@@ -1295,11 +1307,23 @@
                 <groupId>javax.servlet.jsp.jstl</groupId>
                 <artifactId>jstl-api</artifactId>
                 <version>${jstl-api.version}</version>
+								<exclusions>
+									<exclusion>
+										<groupId>javax.servlet</groupId>
+										<artifactId>servlet-api</artifactId>
+									</exclusion>
+								</exclusions>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.web</groupId>
                 <artifactId>jstl-impl</artifactId>
                 <version>${jstl-impl.version}</version>
+								<exclusions>
+									<exclusion>
+										<groupId>javax.servlet</groupId>
+										<artifactId>servlet-api</artifactId>
+									</exclusion>
+								</exclusions>
             </dependency>
             <dependency>
                 <groupId>javax.xml</groupId>