Index: lams_build/build_base.xml
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/build_base.xml	(.../build_base.xml)	(revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_build/build_base.xml	(.../build_base.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -29,39 +29,44 @@
 		<fileset dir="${server.home}/modules/system/layers/base">
 			<include name="io/undertow/core/main/undertow-core-*.jar" />
 			<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/*.jar" />
-			<include name="javax/transaction/api/main/jboss-transaction-*.jar" />
+			<include name="jakarta/servlet/api/main/jakarta.servlet-api-*.jar" />
+			<include name="jakarta/servlet/jsp/api/main/jakarta.servlet.jsp-api-*.jar" />
+			<include name="jakarta/servlet/jstl/api/main/*.jar" />
+			<include name="jakarta/transaction/api/main/jakarta.transaction-api-*.jar" />
 			<include name="org/javassist/main/javassist-*.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/apache/logging/log4j/api/main/log4j-api-*.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/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="jakarta/mail/api/main/jakarta.mail-api-*.jar" />
 			<include name="org/jboss/remoting-jmx/main/remoting-jmx-*.jar" />
 			<include name="org/apache/commons/beanutils/main/commons-beanutils-*.jar" />
 			<include name="org/apache/commons/collections/main/commons-collections-*.jar" />
 			<include name="org/apache/httpcomponents/core/main/httpclient-*.jar" />
 			<include name="org/apache/httpcomponents/core/main/httpcore-*.jar" />
 			<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/lang3/main/commons-lang3-*.jar" />
 			<include name="org/apache/commons/codec/main/commons-codec-*.jar" />
-			<include name="jakarta/websocket/api/main/jboss-websocket-api*.jar" />
+			<include name="jakarta/websocket/api/main/jakarta.websocket-*.jar" />
 			<include name="org/jboss/as/controller-client/main/wildfly-controller-client-*.jar" />
 			<include name="org/jboss/dmr/main/jboss-dmr-*.jar" />
 			<include name="com/fasterxml/jackson/core/jackson-core/main/jackson-core-*.jar" />
 			<include name="com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-*.jar" />
 			<include name="com/fasterxml/jackson/core/jackson-annotations/main/jackson-annotations-*.jar" />
-			<include name="javax/activation/api/main/activation-*.jar" />
-			<include name="jakarta/persistence/api/main/javax.persistence-api-*.jar" />
+			<include name="jakarta/activation/api/main/jakarta.activation-api-*.jar" />
+			<include name="jakarta/persistence/api/main/jakarta.persistence-api-*.jar" />
 			<include name="org/hibernate/main/hibernate-core-*.Final.jar" />
-			<include name="org/bouncycastle/main/bcprov-*.jar" />
+			<include name="org/bouncycastle/bcprov/main/bcprov-*.jar" />
 			<include name="org/codehaus/woodstox/main/*.jar" />
+			<include name="org/wildfly/security/elytron-base/main/wildfly-elytron-realm-*.jar" />
+			<include name="org/wildfly/security/elytron-base/main/wildfly-elytron-auth-*.jar" />
+			<include name="org/wildfly/security/elytron-base/main/wildfly-elytron-auth-server-*.jar" />
+			<include name="org/wildfly/security/elytron-base/main/wildfly-elytron-credential-*.jar" />
+			<include name="org/wildfly/security/elytron-base/main/wildfly-elytron-permission-*.jar" />
 		</fileset>
 		<!-- Optional project own libraries -->
 		<fileset dir="lib" erroronmissingdir="false">
@@ -182,6 +187,7 @@
                destdir="${basedir}/build/classes/java">
                <compilerarg line="-encoding utf-8"/>
 			   <compilerarg line="--add-exports java.base/sun.net.www.protocol.https=ALL-UNNAMED"/>
+			   <compilerarg line="--add-opens java.base/java.util=ALL-UNNAMED"/>
         </javac>
         
 		<echo>${ant.project.name}: Copying additional non-Java resources</echo>