Update dependency versions and POM structure.

acl/pom.xml

@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-acl</artifactId>
-    <name>Spring Security - ACL Module</name>
+    <name>Spring Security - ACL module</name>
     <version>2.0-SNAPSHOT</version>
 
     <dependencies>
@@ -36,13 +36,11 @@
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>1.3.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

captcha/pom.xml

@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-captcha</artifactId>
-    <name>Spring Security - Captcha Module</name>
+    <name>Spring Security - Captcha module</name>
     <version>2.0-SNAPSHOT</version>
 
     <dependencies>

cas/pom.xml

@@ -7,7 +7,7 @@
         <version>2.0-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-cas</artifactId>
-    <name>Spring Security - CAS Support</name>
+    <name>Spring Security - CAS support</name>
     <packaging>pom</packaging>
 
     <modules>

core-tiger/pom.xml

@@ -14,6 +14,11 @@
             <artifactId>spring-security-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>

core/pom.xml

@@ -47,38 +47,37 @@
             <artifactId>spring-mock</artifactId>
             <optional>true</optional>
         </dependency>
+	    <dependency>
+	        <groupId>aspectj</groupId>
+		    <artifactId>aspectjrt</artifactId>
+		    <optional>true</optional>
+	    </dependency>
         <dependency>
             <groupId>org.springframework.ldap</groupId>
             <artifactId>spring-ldap</artifactId>
-            <version>1.2.1</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>1.3.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>3.1</version>
         </dependency>
         <dependency>
-            <groupId>aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>1.2</version>
-            <optional>true</optional>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>jaxen</groupId>
@@ -91,12 +90,6 @@
             <artifactId>servlet-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>1.8.0.4</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.directory.server</groupId>
             <artifactId>apacheds-core</artifactId>
@@ -134,7 +127,7 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

ntlm/pom.xml

@@ -34,7 +34,6 @@
         <dependency>
             <groupId>org.springframework.ldap</groupId>
             <artifactId>spring-ldap</artifactId>
-            <version>1.2.1</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

portlet/pom.xml

@@ -44,7 +44,6 @@
         <dependency>
           <groupId>net.sf.ehcache</groupId>
           <artifactId>ehcache</artifactId>
-          <version>1.3.0</version>
         </dependency>
     </dependencies>
 

samples/pom.xml

@@ -18,4 +18,28 @@
         <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>aspectj</groupId>
+	    <artifactId>aspectjrt</artifactId>
+	</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>

taglibs/pom.xml

@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-taglibs</artifactId>
-    <name>Spring Security - JSP Taglibs</name>
+    <name>Spring Security - JSP taglibs</name>
     <version>2.0-SNAPSHOT</version>
     <packaging>jar</packaging>