Update dependency versions and POM structure.

pom.xml

@@ -654,6 +654,16 @@
                 <artifactId>spring-context</artifactId>
                 <version>${spring.version}</version>
             </dependency>
+	    <dependency>
+		<groupId>org.springframework.ldap</groupId>
+		<artifactId>spring-ldap</artifactId>
+		<version>1.2.1</version>
+	    </dependency>
+	    <dependency>
+	        <groupId>aspectj</groupId>
+	    	<artifactId>aspectjrt</artifactId>
+		<version>1.5.3</version>
+	    </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-webmvc</artifactId>
@@ -662,10 +672,35 @@
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
-                <version>1.2.13</version>
+                <version>1.2.14</version>  <!-- 1.2.15 has some JMX dependencies we don't want in its POM -->
                 <optional>true</optional>
                 <scope>runtime</scope>
             </dependency>
+	    <dependency>
+	        <groupId>net.sf.ehcache</groupId>
+	    	<artifactId>ehcache</artifactId>
+		<version>1.4.1</version>
+	    </dependency>
+	    <dependency>
+	        <groupId>commons-collections</groupId>
+	    	<artifactId>commons-collections</artifactId>
+		<version>3.2</version>
+	    </dependency>
+	    <dependency>
+	        <groupId>hsqldb</groupId>
+	    	<artifactId>hsqldb</artifactId>
+		<version>1.8.0.7</version>
+	    </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>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>