Index: lams_build/build_base.xml
===================================================================
diff -u -rd810074f4b97a88de977bbb34d6362910ea06044 -rbe86c0bc220914398d3ce8ec9ae9cab91b47353a
--- lams_build/build_base.xml	(.../build_base.xml)	(revision d810074f4b97a88de977bbb34d6362910ea06044)
+++ lams_build/build_base.xml	(.../build_base.xml)	(revision be86c0bc220914398d3ce8ec9ae9cab91b47353a)
@@ -30,17 +30,16 @@
 			<include name="io/undertow/servlet/main/undertow-servlet-*.jar" />
 			<include name="javax/servlet/api/main/jboss-servlet-api*.jar" />
 			<include name="javax/servlet/jsp/api/main/jboss-jsp-api*.jar" />
-			<include name="javax/servlet/jstl/api/main/jboss-jstl-api*.jar" />
+			<include name="javax/servlet/jstl/api/main/*.jar" />
 			<include name="javax/transaction/api/main/jboss-transaction-*.jar" />
 			<include name="org/javassist/main/javassist-*.jar" />
-			<include name="org/hibernate/main/hibernate-core-*.jar" />
 			<include name="org/picketbox/main/picketbox-*.jar" />
 			<include name="org/jboss/logging/main/jboss-logging-*.jar" />
 			<include name="org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-*.jar" />
 			<include name="org/jboss/logmanager/main/jboss-logmanager-*.jar" />
 			<include name="org/slf4j/main/slf4j-api-*.jar" />
 			<include name="org/slf4j/impl/main/slf4j-jboss-logmanager-*.jar" />
-			<include name="org/slf4j/jcl-over-slf4j/main/jcl-over-slf4j-*.jar" /> <!-- Alias for Commons Logging -->
+			<include name="org/jboss/logging/commons/logging/main/commons-logging-jboss-logging-*.jar" /> <!-- Alias for Commons Logging -->
 			<include name="javax/xml/rpc/api/main/jboss-jaxrpc-api*.jar" />
 			<include name="javax/mail/api/main/javax.mail-*.jar" />
 			<include name="org/jboss/remoting-jmx/main/remoting-jmx-*.jar" />
@@ -49,8 +48,8 @@
 			<include name="org/apache/commons/io/main/commons-io-*.jar" />
 			<include name="org/apache/commons/lang/main/commons-lang-*.jar" />
 			<include name="org/apache/commons/codec/main/commons-codec-*.jar" />
-			<include name="org/apache/httpcomponents/main/httpclient-*.jar" />
-			<include name="org/apache/httpcomponents/main/httpcore-*.jar" />
+			<include name="org/apache/httpcomponents/core/main/httpclient-*.jar" />
+			<include name="org/apache/httpcomponents/core/main/httpcore-*.jar" />
 			<include name="javax/websocket/api/main/jboss-websocket-api*.jar" />
 			<include name="org/jboss/as/controller-client/main/wildfly-controller-client-*.jar" />
 			<include name="org/jboss/dmr/main/jboss-dmr-*.jar" />