diff --git a/captcha/pom.xml b/captcha/pom.xml
index 8da8345311..991dd41083 100644
--- a/captcha/pom.xml
+++ b/captcha/pom.xml
@@ -27,8 +27,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/cas/cas-client/pom.xml b/cas/cas-client/pom.xml
index 4cdfcf4aa7..e256e32ca5 100644
--- a/cas/cas-client/pom.xml
+++ b/cas/cas-client/pom.xml
@@ -20,8 +20,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
@@ -32,7 +30,6 @@
             <groupId>org.jasig.cas</groupId>
             <artifactId>cas-client-core</artifactId>
             <version>3.1.1</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>net.sf.ehcache</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 7b675b1089..f1ead8537e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/ntlm/pom.xml b/ntlm/pom.xml
index 03a69a3f20..9360b3cc48 100755
--- a/ntlm/pom.xml
+++ b/ntlm/pom.xml
@@ -30,8 +30,6 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<optional>true</optional>
 		</dependency>
         <dependency>
             <groupId>org.springframework.ldap</groupId>
diff --git a/pom.xml b/pom.xml
index 64c5f894a2..4513bee3cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -654,6 +654,11 @@
                 <artifactId>spring-context</artifactId>
                 <version>${spring.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-webmvc</artifactId>
+                <version>${spring.version}</version>                
+            </dependency>            
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
@@ -661,12 +666,31 @@
                 <optional>true</optional>
                 <scope>runtime</scope>
             </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>2.4</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                <version>${jstl.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>taglibs</groupId>
+                <artifactId>standard</artifactId>
+                <version>${jstl.version}</version>
+                <scope>runtime</scope>
+            </dependency>                        
         </dependencies>
     </dependencyManagement>
     <properties>        
         <spring.version>2.0.8</spring.version>
         <felix.version>1.4.0</felix.version>
         <jstl.version>1.1.2</jstl.version>
+
         <docbook.source>${basedir}/src/docbkx</docbook.source>
         <docbook.target>${basedir}/target/site/guide</docbook.target>        
     </properties>
diff --git a/portlet/pom.xml b/portlet/pom.xml
index 9eacdb1be6..56d2414428 100644
--- a/portlet/pom.xml
+++ b/portlet/pom.xml
@@ -19,8 +19,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>javax.portlet</groupId>
@@ -31,7 +29,6 @@
         <dependency>
           <groupId>org.springframework</groupId>
           <artifactId>spring-dao</artifactId>
-          <version>${spring.version}</version>
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
@@ -42,7 +39,7 @@
           <groupId>org.springframework</groupId>
           <artifactId>spring-mock</artifactId>
           <version>${spring.version}</version>
-          <optional>true</optional>
+          <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>net.sf.ehcache</groupId>
diff --git a/samples/cas/client/pom.xml b/samples/cas/client/pom.xml
index 6bd7db1860..e50bf73d64 100644
--- a/samples/cas/client/pom.xml
+++ b/samples/cas/client/pom.xml
@@ -27,7 +27,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-	        <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -39,11 +38,6 @@
             <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>cas</groupId>
-            <artifactId>casclient</artifactId>
-            <version>2.1.1</version>
-        </dependency>
         <dependency>
           <groupId>net.sf.ehcache</groupId>
           <artifactId>ehcache</artifactId>
@@ -94,4 +88,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml
index 276472025b..7eeabedb44 100644
--- a/samples/contacts/pom.xml
+++ b/samples/contacts/pom.xml
@@ -28,7 +28,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>${spring.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -46,23 +45,27 @@
             <artifactId>spring-remoting</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
         </dependency>
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
             <version>1.3.0</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>hessian</groupId>
-            <artifactId>hessian</artifactId>
-            <version>3.0.1</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>hsqldb</groupId>
@@ -71,10 +74,9 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
+            <groupId>hessian</groupId>
+            <artifactId>hessian</artifactId>
+            <version>3.0.1</version>
         </dependency>
     </dependencies>
 
diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml
index 45f3c67aa7..b766babd81 100644
--- a/samples/dms/pom.xml
+++ b/samples/dms/pom.xml
@@ -22,6 +22,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
diff --git a/samples/openid/pom.xml b/samples/openid/pom.xml
index cb7235f1ec..e2d59439b0 100644
--- a/samples/openid/pom.xml
+++ b/samples/openid/pom.xml
@@ -23,11 +23,12 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-	        <version>${spring.version}</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -39,26 +40,14 @@
             <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.1.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.1.2</version>
-            <scope>runtime</scope>
-        </dependency>
-<!--         
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>1.1.1</version>
-            <optional>true</optional>
-        </dependency>
-  -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>taglibs</groupId>
+			<artifactId>standard</artifactId>
+		</dependency>        
     </dependencies>
 
     <build>
diff --git a/samples/pom.xml b/samples/pom.xml
index 4728221869..60248517a7 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,26 +18,4 @@
         <module>ldap</module>
         <module>portlet</module>        
     </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>        
-        <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.1.0</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.1.2</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
 </project>
diff --git a/samples/portlet/pom.xml b/samples/portlet/pom.xml
index abc7b89914..ed9d329142 100644
--- a/samples/portlet/pom.xml
+++ b/samples/portlet/pom.xml
@@ -33,8 +33,6 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -63,12 +61,10 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
-			<version>${jstl.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>taglibs</groupId>
 			<artifactId>standard</artifactId>
-			<version>${jstl.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml
index 4513e7643b..63a23d4b7b 100644
--- a/samples/preauth/pom.xml
+++ b/samples/preauth/pom.xml
@@ -27,7 +27,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-	        <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -74,4 +73,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index 0baa5cb0da..0125187a02 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -32,7 +32,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-	        <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -44,6 +43,21 @@
             <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>        
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/sandbox/other/pom.xml b/sandbox/other/pom.xml
index a51318c8c1..81d77c449f 100644
--- a/sandbox/other/pom.xml
+++ b/sandbox/other/pom.xml
@@ -31,13 +31,11 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-dao</artifactId>
-      <version>${spring.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/sandbox/webwork/pom.xml b/sandbox/webwork/pom.xml
index 44de8afb46..19c049a836 100644
--- a/sandbox/webwork/pom.xml
+++ b/sandbox/webwork/pom.xml
@@ -19,8 +19,6 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/taglibs/pom.xml b/taglibs/pom.xml
index fbe48c31d5..0941a1cc97 100644
--- a/taglibs/pom.xml
+++ b/taglibs/pom.xml
@@ -41,8 +41,7 @@
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
-            <version>1.0.6</version>
-            <optional>true</optional>
+            <scope>test</scope>
         </dependency>        
     </dependencies>
     <build>
@@ -59,4 +58,4 @@
             </resource>            
         </resources>
     </build>
-</project>
\ No newline at end of file
+</project>