Index: pom.xml
===================================================================
--- pom.xml	(revision 17428)
+++ pom.xml	(working copy)
@@ -169,8 +169,8 @@
         </dependency>
         <dependency>
             <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.2.3</version>
+            <artifactId>ehcache-core</artifactId>
+            <version>2.4.3</version>
         </dependency>
         <!--dependency>
             <groupId>jfree</groupId>
@@ -206,8 +206,8 @@
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
-            <artifactId>hibernate</artifactId>
-            <version>3.2.5.ga</version>
+            <artifactId>hibernate-core</artifactId>
+            <version>3.6.10.Final</version>
             <exclusions>
                 <exclusion>
                     <groupId>asm</groupId>
@@ -237,7 +237,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.6</version>
         </dependency>
         <dependency>
             <groupId>oro</groupId>
@@ -340,12 +340,12 @@
         </dependency>
         <dependency>
             <groupId>edu.mit.ist.es.csf</groupId>
-            <artifactId>csf-base-r1.0.18b1</artifactId>
+            <artifactId>csf-base</artifactId>
             <version>[0.0.0,999.999.999)</version>
         </dependency>
         <dependency>
             <groupId>edu.mit.ist.es.csf</groupId>
-            <artifactId>csf-email-r1.0.18b1</artifactId>
+            <artifactId>csf-email</artifactId>
             <version>[0.0.0,999.999.999)</version>
             <exclusions>
                 <exclusion>
@@ -360,7 +360,7 @@
         </dependency>
         <dependency>
             <groupId>edu.mit.ist.es.csf</groupId>
-            <artifactId>csf-security-r1.0.18b1</artifactId>
+            <artifactId>csf-security</artifactId>
             <version>[0.0.0,999.999.999)</version>
             <exclusions>
         <!--  Excluding spring-security modules since we are using Acegi -->
@@ -392,12 +392,12 @@
         </dependency>
         <dependency>
             <groupId>edu.mit.ist.es.csf</groupId>
-            <artifactId>csf-webservices-r1.0.18b1</artifactId>
+            <artifactId>csf-webservices</artifactId>
             <version>[0.0.0,999.999.999)</version>
         </dependency>
         <dependency>
             <groupId>edu.mit.ist.es.csf</groupId>
-            <artifactId>csf-common-legacy-r1.0.18b1</artifactId>
+            <artifactId>csf-common-legacy</artifactId>
             <version>[0.0.0,999.999.999)</version>
             <exclusions>
                 <!--exclusion>
@@ -454,7 +454,7 @@
 		</dependency>
         <dependency>
             <groupId>edu.mit.ist.es.csf</groupId>
-            <artifactId>csf-workflow-r1.0.18b1</artifactId>
+            <artifactId>csf-workflow</artifactId>
             <!-- this will resolve to the latest version of sais-common-workflow -->
             <version>[0.0.0,999.999.999)</version>
             <exclusions>
@@ -466,7 +466,7 @@
         </dependency>
         <dependency>
             <groupId>edu.mit.ist.es.csf</groupId>
-            <artifactId>csf-test-r1.0.18b1</artifactId>
+            <artifactId>csf-test</artifactId>
             <version>[0.0.0,999.999.999)</version>
             <scope>test</scope>
         </dependency>
Index: src/test/resources/applicationContext-test.xml
===================================================================
--- src/test/resources/applicationContext-test.xml	(revision 17428)
+++ src/test/resources/applicationContext-test.xml	(working copy)
@@ -33,7 +33,7 @@
                 <prop key="hibernate.cache.use_second_level_cache">true</prop>
                 <prop key="hibernate.generate_statistics">true</prop>
                 <prop key="hibernate.cache.use_structured_entries">true</prop>
-                <prop key="hibernate.cache.provider_class">org.hibernate.cache.EhCacheProvider</prop>
+                <prop key="hibernate.cache.region.factory_class">net.sf.ehcache.hibernate.EhCacheRegionFactory</prop>
                 <prop key="edu.mit.common.domain.student.hibernate.cache.use_query_cache">true</prop>
             </props>
         </property>