Index: lams_build/build.xml
===================================================================
diff -u -rbe86c0bc220914398d3ce8ec9ae9cab91b47353a -rf60235ded67c56b954dd0fec9f72d3e95de0e98e
--- lams_build/build.xml	(.../build.xml)	(revision be86c0bc220914398d3ce8ec9ae9cab91b47353a)
+++ lams_build/build.xml	(.../build.xml)	(revision f60235ded67c56b954dd0fec9f72d3e95de0e98e)
@@ -453,14 +453,16 @@
 		<copy tofile="${server.home}/modules/system/layers/base/net/fckeditor/main/module.xml"
 			  file="lib/fckeditor/fckeditor.module.xml" overwrite="true" verbose="true" />
 		
+
 		
-		
-		<copy todir="${server.home}/modules/system/layers/base/org/hibernate/5.0.10" overwrite="true" verbose="true">
+		<delete dir="${server.home}/modules/system/layers/base/org/hibernate/main" />
+		<mkdir  dir="${server.home}/modules/system/layers/base/org/hibernate/main" />
+		<copy todir="${server.home}/modules/system/layers/base/org/hibernate/main" overwrite="true" verbose="true">
 			<fileset dir="lib/hibernate">
 				<include name="*.jar" />
 			</fileset>
 		</copy>
-		<copy tofile="${server.home}/modules/system/layers/base/org/hibernate/5.0.10/module.xml"
+		<copy tofile="${server.home}/modules/system/layers/base/org/hibernate/main/module.xml"
 			  file="lib/hibernate/hibernate.module.xml" overwrite="true" verbose="true" />
 			
 			
@@ -506,13 +508,7 @@
 			  file="lib/jakarta-commons/validator.module.xml" overwrite="true" verbose="true" />
 		
 		
-		<!-- WildFly does not load all classes from JDK that LAMS needs (com/sun/org/apache/xerces/internal)
-		     We need our own, extended list -->
-		<copy tofile="${server.home}/modules/system/layers/base/sun/jdk/main/module.xml"
-			  file="lib/jdk/jdk.module.xml" overwrite="true" verbose="true" />
 		
-		
-		
 		<copy todir="${server.home}/modules/system/layers/base/org/scilab/forge/jlatexmath/main" overwrite="true" verbose="true">
 			<fileset dir="lib/jlatexmath">
 				<include name="jlatexmath-*.jar" />
@@ -614,21 +610,6 @@
 		<antcall target="_deploy-standalone-config" />
 		<antcall target="_deploy-standalone-config-slimmed" />
 		
-		<!-- Backup and DELETE org/wildfly/clustering/web/undertow module. This module is used by default
-		 (no reconfiguration possible) by Wildfly shared-session (LAMS SSO) to store web sessions as
-		 DistributableSessions with Infinispan cache. When this module is not present - InMemorySessionManager
-		 is used instead. DistributableSessions for shared-session are buggy under wildfly 8.2.0, we don't
-		 use them till migration to Wildfly 9.x
-		 It will be placed back if deploy-cluster is run. -->
-		<copy todir="${server.home}/backup/undertow"
-			  overwrite="false" verbose="true" failonerror="false">
-			<fileset dir="${server.home}/modules/system/layers/base/org/wildfly/clustering/web/undertow" />
-		</copy>
-		
-		<delete failonerror="false">
-			<fileset dir="${server.home}/modules/system/layers/base/org/wildfly/clustering/web/undertow" />
-		</delete>
-		
 		<!-- Mark EAR for WildFly deployment -->
 		<delete >
 			<fileset dir="${server.home}/standalone/deployments" includes="lams.ear.*"/>
@@ -747,11 +728,6 @@
 	
 	<!-- cruise control task : build lams -->
 	<target name="deploy-cluster" description="Prepare cluster environment">
-		<echo>${ant.project.name}: Restoring clustering library</echo>
-		<copy todir="${server.home}/modules/system/layers/base/org/wildfly/clustering/web/undertow"
-			  overwrite="false" verbose="true">
-			<fileset dir="${server.home}/backup/undertow" />
-		</copy>
 		
 		<echo>${ant.project.name}: Copying configuration files</echo>
 		<copy todir="${server.home}/domain/configuration" overwrite="true" verbose="true">
Index: lams_build/lib/hibernate/hibernate.module.xml
===================================================================
diff -u -rbe86c0bc220914398d3ce8ec9ae9cab91b47353a -rf60235ded67c56b954dd0fec9f72d3e95de0e98e
--- lams_build/lib/hibernate/hibernate.module.xml	(.../hibernate.module.xml)	(revision be86c0bc220914398d3ce8ec9ae9cab91b47353a)
+++ lams_build/lib/hibernate/hibernate.module.xml	(.../hibernate.module.xml)	(revision f60235ded67c56b954dd0fec9f72d3e95de0e98e)
@@ -23,7 +23,7 @@
   -->
 
 <!-- Represents the Hibernate 5.0.x module-->
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate" slot="5.0.10">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate">
     <resources>
         <resource-root path="hibernate-core-5.0.10.Final.jar"/>
         <resource-root path="hibernate-envers-5.0.10.Final.jar"/>