Index: data/hibernate/src/main/resources/applicationContext-dao.xml
===================================================================
--- data/hibernate/src/main/resources/applicationContext-dao.xml	(revision 3589)
+++ data/hibernate/src/main/resources/applicationContext-dao.xml	(working copy)
@@ -8,7 +8,7 @@
     <bean class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
 
     <!-- Hibernate SessionFactory -->
-    <bean id="sessionFactory" class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
+    <bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
         <property name="dataSource" ref="dataSource"/>
         <property name="configLocation" value="classpath:hibernate.cfg.xml"/>
         <property name="hibernateProperties">
@@ -24,9 +24,13 @@
     </bean>
 
     <!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
-    <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+    <bean id="transactionManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
         <property name="sessionFactory" ref="sessionFactory"/>
     </bean>
+
+    <bean class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
+
+    <bean id="hibernateExceptionTranslator" class="org.springframework.orm.hibernate4.HibernateExceptionTranslator"/>
     
     <!-- Activates scanning of @Autowired -->
     <context:annotation-config/>
Index: data/hibernate/pom.xml
===================================================================
--- data/hibernate/pom.xml	(revision 3589)
+++ data/hibernate/pom.xml	(working copy)
@@ -127,24 +127,11 @@
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
-        <!-- Use Javassist as Hibernate's bytecode provider -->
-        <dependency>
-            <groupId>javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.12.1.GA</version>
-        </dependency>
         <!-- Enable EhCache support -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-ehcache</artifactId>
             <version>${hibernate.version}</version>
-            <!-- Exclude old EhCache (artifactId changed) -->
-            <exclusions>
-                <exclusion>
-                    <groupId>net.sf.ehcache</groupId>
-                    <artifactId>ehcache</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.sf.ehcache</groupId>
Index: pom.xml
===================================================================
--- pom.xml	(revision 3589)
+++ pom.xml	(working copy)
@@ -553,12 +553,12 @@
         <cxf.version>2.3.3</cxf.version>
         <displaytag.version>1.2</displaytag.version>
         <dwr.version>2.0.3</dwr.version>
-        <ehcache.version>2.3.1</ehcache.version>
-        <ehcache.web.version>2.0.3</ehcache.web.version>
+        <ehcache.version>2.5.0</ehcache.version>
+        <ehcache.web.version>2.0.4</ehcache.web.version>
         <el.version>1.2</el.version>
         <facelets.version>1.1.14</facelets.version>
-        <hibernate.version>3.6.1.Final</hibernate.version>
-        <hibernate.entitymanager.version>3.6.1.Final</hibernate.entitymanager.version>
+        <hibernate.version>4.0.1.Final</hibernate.version>
+        <hibernate.entitymanager.version>4.0.1.Final</hibernate.entitymanager.version>
         <ibatis.version>2.3.4.726</ibatis.version>
         <javamail.version>1.4.1</javamail.version>
         <jetty.version>6.1.26</jetty.version>