Index: lams_build/conf/domain.xml
===================================================================
diff -u -re57c5f124d643991b5d13901d32bc686acabe706 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_build/conf/domain.xml	(.../domain.xml)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
+++ lams_build/conf/domain.xml	(.../domain.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -178,7 +178,7 @@
                 <logger category="org.springframework.transaction.jta">
                     <level name="INFO"/>
                 </logger>
-                <logger category="org.springframework.orm.hibernate4">
+                <logger category="org.springframework.orm.hibernate5">
                     <level name="INFO"/>
                 </logger>
                 <logger category="org.springframework.beans.factory.annotation">
Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -r87b6dd451f89e2b103a6d111802fc2d7005946b6 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -252,7 +252,7 @@
                 <level name="INFO"/>
             </logger>
             
-            <logger category="org.springframework.orm.hibernate4">
+            <logger category="org.springframework.orm.hibernate5">
                 <level name="INFO"/>
             </logger>
                         
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r87b6dd451f89e2b103a6d111802fc2d7005946b6 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -261,7 +261,7 @@
                 <level name="INFO"/>
             </logger>
             
-            <logger category="org.springframework.orm.hibernate4">
+            <logger category="org.springframework.orm.hibernate5">
                 <level name="INFO"/>
             </logger>
             
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -14,7 +14,7 @@
  	<!-- Hibernate SessionFactory. Since LAMS 2.3 it is used in all tools and other parts of LAMS,
  		 rather than several local Session Factiories.
  	-->
-	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
+	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
 		<property name="dataSource"><ref bean="dataSource"/></property>
 		<property name="mappingLocations">
 			<list>
Index: lams_common/src/java/org/lamsfoundation/lams/util/CustomizedOpenSessionInViewFilter.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_common/src/java/org/lamsfoundation/lams/util/CustomizedOpenSessionInViewFilter.java	(.../CustomizedOpenSessionInViewFilter.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/util/CustomizedOpenSessionInViewFilter.java	(.../CustomizedOpenSessionInViewFilter.java)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -28,8 +28,8 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.orm.hibernate4.SessionFactoryUtils;
-import org.springframework.orm.hibernate4.support.OpenSessionInViewFilter;
+import org.springframework.orm.hibernate5.SessionFactoryUtils;
+import org.springframework.orm.hibernate5.support.OpenSessionInViewFilter;
 
 /**
  *
@@ -55,7 +55,7 @@
      * @return the Session to use
      * @throws DataAccessResourceFailureException
      *             if the Session could not be created
-     * @see org.springframework.orm.hibernate4.SessionFactoryUtils#getSession(SessionFactory, boolean)
+     * @see org.springframework.orm.hibernate5.SessionFactoryUtils#getSession(SessionFactory, boolean)
      * @see org.hibernate.FlushMode#NEVER
      */
     @Override
Index: lams_common/src/java/org/lamsfoundation/lams/util/hibernate/HibernateSessionManager.java
===================================================================
diff -u -r8714ac689fdad46746bbb7f28005ec080d1d4ba6 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_common/src/java/org/lamsfoundation/lams/util/hibernate/HibernateSessionManager.java	(.../HibernateSessionManager.java)	(revision 8714ac689fdad46746bbb7f28005ec080d1d4ba6)
+++ lams_common/src/java/org/lamsfoundation/lams/util/hibernate/HibernateSessionManager.java	(.../HibernateSessionManager.java)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -5,7 +5,7 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.context.internal.ManagedSessionContext;
 import org.lamsfoundation.lams.web.session.SessionManager;
-import org.springframework.orm.hibernate4.SessionHolder;
+import org.springframework.orm.hibernate5.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
Index: lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java	(.../TransactionAwareSessionContext.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java	(.../TransactionAwareSessionContext.java)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -14,7 +14,7 @@
 import org.hibernate.context.spi.CurrentSessionContext;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
-import org.springframework.orm.hibernate4.SpringSessionContext;
+import org.springframework.orm.hibernate5.SpringSessionContext;
 import org.springframework.transaction.jta.JtaAfterCompletionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationAdapter;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/RepopulateProgressMarksServlet.java
===================================================================
diff -u -r8033905f61b3c293f92b5c9c468dd22606ab9a42 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/RepopulateProgressMarksServlet.java	(.../RepopulateProgressMarksServlet.java)	(revision 8033905f61b3c293f92b5c9c468dd22606ab9a42)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/RepopulateProgressMarksServlet.java	(.../RepopulateProgressMarksServlet.java)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -63,7 +63,7 @@
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.springframework.orm.hibernate4.SessionHolder;
+import org.springframework.orm.hibernate5.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r453898dc3e1802c2280217b914be130fd19fe4d5 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 453898dc3e1802c2280217b914be130fd19fe4d5)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -34,7 +34,7 @@
 
 	<filter>
 		<filter-name>HibernateFilter</filter-name>
-		<filter-class>org.springframework.orm.hibernate4.support.OpenSessionInViewFilter</filter-class>
+		<filter-class>org.springframework.orm.hibernate5.support.OpenSessionInViewFilter</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
 			<param-value>coreSessionFactory</param-value>
Index: lams_tool_assessment/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -34,7 +34,7 @@
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
-			org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
+			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
Index: lams_tool_daco/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -34,7 +34,7 @@
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
-			org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
+			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
Index: lams_tool_doku/web/WEB-INF/web.xml
===================================================================
diff -u -re3d57ab2873cf1297c1f3b0a0291b43039c77d7e -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision e3d57ab2873cf1297c1f3b0a0291b43039c77d7e)
+++ lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -34,7 +34,7 @@
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
-			org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
+			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
Index: lams_tool_images/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -34,7 +34,7 @@
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
-			org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
+			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
Index: lams_tool_imscc/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -34,7 +34,7 @@
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
-			org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
+			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -34,7 +34,7 @@
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
-			org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
+			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -26,7 +26,7 @@
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
-			org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
+			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
Index: lams_tool_scratchie/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -34,7 +34,7 @@
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
-			org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
+			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
Index: lams_tool_spreadsheet/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -34,7 +34,7 @@
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
-			org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
+			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
Index: lams_tool_survey/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -34,7 +34,7 @@
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
-			org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
+			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
Index: lams_tool_task/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -rac280c8fb2043ec90a0b7756ede0c7ab64c089d8
--- lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision ac280c8fb2043ec90a0b7756ede0c7ab64c089d8)
@@ -34,7 +34,7 @@
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
-			org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
+			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>