Index: idea_project/.idea/libraries/3rdParty.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- idea_project/.idea/libraries/3rdParty.xml	(.../3rdParty.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ idea_project/.idea/libraries/3rdParty.xml	(.../3rdParty.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -10,27 +10,19 @@
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/apache-poi/commons-compress-1.23.0.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/apache-poi/poi-ooxml-full-5.2.3.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/autopatch/discovery-1.0.5-lams.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/basiclti-util-1.2.0.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/oauth-20100527.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/oauth-provider-20100527.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/signpost-commonshttp4-1.2.1.2.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/signpost-core-1.2.1.2.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/googleauth/googleauth-1.1.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/fckeditor/fckeditor-java-core-2.6.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/json-simple-1.1.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/quartz/quartz-2.2.3.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/jakarta-commons/commons-validator-1.6.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/jakarta-commons/commons-fileupload-1.3.3.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/jlatexmath/jlatexmath-1.0.8.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/json-simple-1.1.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/mysql/mysql-connector-java-8.0.11.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/quartz/quartz-2.2.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/xstream/xstream-1.4.11.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/clamav/clamav-client-2.0.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-dom.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-svggen.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-awt-util.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-util.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/etherpad/etherpad_lite_client-1.2.13.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/passpol/passpol-0.7.1-SNAPSHOT.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/jjwt-api-0.11.2.jar!/" />
@@ -52,6 +44,18 @@
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-webflux-6.1.4.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-webmvc-6.1.4.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/csrfguard/csrfguard-4.3.0-jakarta-custom.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/basiclti-util-1.2.0-jakarta.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/jakarta-commons/commons-fileupload2-core-2.0.0-M2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/jakarta-commons/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-xml-1.17.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-util-1.17.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-dom-1.17.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-constants-1.17.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-awt-util-1.17.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/fckeditor/fckeditor-java-core-2.6-jakarta.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/xstream/xstream-1.4.20.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-svggen-1.17.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/jakarta-commons/commons-io-2.15.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -reb8dbc6fb2297f5e7347f33e322f856a3dbab658 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision eb8dbc6fb2297f5e7347f33e322f856a3dbab658)
+++ lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -11,17 +11,19 @@
         <archive path="/lams_build/lib/apache-tika/tika-parsers-standard-package-2.7.0.jar"/>
         <archive path="/lams_build/lib/autopatch/autopatch-1.4.2-lams-jakarta.jar"/>
         <archive path="/lams_build/lib/autopatch/discovery-1.0.5-lams.jar"/>
-        <archive path="/lams_build/lib/basiclti-util/basiclti-util-1.2.0.jar" source="/3rdParty_sources/basiclti-util/src/main/java"/>
+        <archive path="/lams_build/lib/basiclti-util/basiclti-util-1.2.0-jakarta.jar" source="/3rdParty_sources/basiclti-util/src/main/java"/>
         <archive path="/lams_build/lib/basiclti-util/oauth-20100527.jar" source="/3rdParty_sources/oauth"/>
         <archive path="/lams_build/lib/basiclti-util/oauth-provider-20100527.jar"/>
         <archive path="/lams_build/lib/basiclti-util/signpost-commonshttp4-1.2.1.2.jar"/>
         <archive path="/lams_build/lib/basiclti-util/signpost-core-1.2.1.2.jar"/>
         <archive path="/lams_build/lib/googleauth/googleauth-1.1.1.jar"/>
-        <archive path="/lams_build/lib/fckeditor/fckeditor-java-core-2.6.jar" source="/3rdParty_sources/ckeditor"/>
+        <archive path="/lams_build/lib/fckeditor/fckeditor-java-core-2.6-jakarta.jar" source="/3rdParty_sources/ckeditor"/>
         <archive javadoc="http://alex-public-doc.s3.amazonaws.com/json_simple-1.1/index.html" path="/lams_build/lib/json/json-simple-1.1.1.jar"/>
         <archive path="/lams_build/lib/quartz/quartz-2.2.3.jar" source="/3rdParty_sources/quartz"/>
         <archive path="/lams_build/lib/jakarta-commons/commons-validator-1.6.jar" source="/3rdParty_sources/commons-validator"/>
-        <archive path="/lams_build/lib/jakarta-commons/commons-fileupload-1.3.3.jar" source="/3rdParty_sources/commons-fileupload"/>
+        <archive path="/lams_build/lib/jakarta-commons/commons-fileupload2-core-2.0.0-M2.jar" source="/3rdParty_sources/commons-fileupload"/>
+        <archive path="/lams_build/lib/jakarta-commons/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar" source="/3rdParty_sources/commons-fileupload"/>
+        <archive path="/lams_build/lib/jakarta-commons/commons-io-2.15.1.jar"/>
         <archive path="/lams_build/lib/jlatexmath/jlatexmath-1.0.8.jar" source="/3rdParty_sources/jlatexmath"/>
         <archive javadoc="http://alex-public-doc.s3.amazonaws.com/json_simple-1.1/index.html" path="/lams_build/lib/json/json-simple-1.1.1.jar"/>
         <archive path="/lams_build/lib/mysql/mysql-connector-java-8.0.11.jar" source="/3rdParty_sources/mysql-connector"/>
@@ -38,11 +40,11 @@
         <archive path="/lams_build/lib/spring/spring-tx-6.1.4.jar" source="/3rdParty_sources/spring"/>
         <archive path="/lams_build/lib/spring/spring-web-6.1.4.jar" source="/3rdParty_sources/spring"/>
         <archive path="/lams_build/lib/spring/spring-webmvc-6.1.4.jar" source="/3rdParty_sources/spring"/>
-        <archive path="/lams_build/lib/xstream/xstream-1.4.11.jar" source="/3rdParty_sources/xstream"/>
+        <archive path="/lams_build/lib/xstream/xstream-1.4.20.jar" source="/3rdParty_sources/xstream"/>
         <archive javadoc="https://jar-download.com/artifacts/xyz.capybara/clamav-client/2.0.2/documentation" path="/lams_build/lib/clamav/clamav-client-2.0.2.jar"/>
-        <archive path="/lams_build/lib/batik/batik-dom.jar" source="/3rdParty_sources/basiclti-util/src/main/java/org"/>
-        <archive path="/lams_build/lib/batik/batik-svggen.jar" source="/3rdParty_sources/basiclti-util/src/main/java/org"/>
-        <archive path="/lams_build/lib/batik/batik-awt-util.jar" source="/3rdParty_sources/basiclti-util/src/main/java/org"/>
+        <archive path="/lams_build/lib/batik/batik-dom-1.17.jar" source="/3rdParty_sources/basiclti-util/src/main/java/org"/>
+        <archive path="/lams_build/lib/batik/batik-svggen-1.17.jar" source="/3rdParty_sources/basiclti-util/src/main/java/org"/>
+        <archive path="/lams_build/lib/batik/batik-awt-util-1.17.jar" source="/3rdParty_sources/basiclti-util/src/main/java/org"/>
         <archive path="/lams_build/lib/etherpad/etherpad_lite_client-1.2.13.jar" source="/3rdParty_sources/etherpad"/>
         <archive path="/lams_build/lib/passpol/passpol-0.7.1-SNAPSHOT.jar" source="/3rdParty_sources/passpol"/>
         <archive path="/lams_build/lib/json/jjwt-api-0.11.2.jar" source="/3rdParty_sources/jsonwebtoken"/>
Index: lams_build/build.xml
===================================================================
diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/build.xml	(.../build.xml)	(revision cb01d2d8c064728cb0e2ac524d2f89622a534e39)
+++ lams_build/build.xml	(.../build.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -576,7 +576,35 @@
 		</copy>
 		<copy tofile="${server.home}/modules/system/layers/base/org/apache/commons/fileupload/main/module.xml"
 			  file="lib/jakarta-commons/fileupload.module.xml" overwrite="true" verbose="true" />
+		<copy todir="${server.home}/modules/system/layers/base/org/apache/commons/fileupload2/main" overwrite="true" verbose="true">
+			<fileset dir="lib/jakarta-commons">
+				<include name="commons-fileupload2-*.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${server.home}/modules/system/layers/base/org/apache/commons/fileupload2/main/module.xml"
+			  file="lib/jakarta-commons/fileupload2.module.xml" overwrite="true" verbose="true" />
 
+		<delete>
+			<fileset dir="${server.home}/modules/system/layers/base/org/apache/commons/io/main"
+					 includes="*.jar" />
+		</delete>
+		<copy todir="${server.home}/modules/system/layers/base/org/apache/commons/io/main" overwrite="true" verbose="true">
+			<fileset dir="lib/jakarta-commons">
+				<include name="commons-io-*.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${server.home}/modules/system/layers/base/org/apache/commons/io/main/module.xml"
+			  file="lib/jakarta-commons/io.module.xml" overwrite="true" verbose="true" />
+
+
+		<copy todir="${server.home}/modules/system/layers/base/org/apache/commons/lang/main" overwrite="true" verbose="true">
+			<fileset dir="lib/jakarta-commons">
+				<include name="commons-lang-*.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${server.home}/modules/system/layers/base/org/apache/commons/lang/main/module.xml"
+			  file="lib/jakarta-commons/lang.module.xml" overwrite="true" verbose="true" />
+
 		<copy todir="${server.home}/modules/system/layers/base/org/apache/commons/validator/main" overwrite="true" verbose="true">
 			<fileset dir="lib/jakarta-commons">
 				<include name="commons-validator-*.jar" />
@@ -614,16 +642,27 @@
 		<copy tofile="${server.home}/modules/system/layers/base/io/jsonwebtoken/main/module.xml"
 			  file="lib/json/jjwt.module.xml" overwrite="true" verbose="true" />
 		
-		
+
+
+		<copy todir="${server.home}/modules/system/layers/base/io/micrometer/main" overwrite="true" verbose="true">
+			<fileset dir="lib/micrometer">
+				<include name="micrometer-*.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${server.home}/modules/system/layers/base/io/micrometer/main/module.xml"
+			  file="lib/micrometer/micrometer.module" overwrite="true" verbose="true" />
+
+
+
 		<copy todir="${server.home}/modules/system/layers/base/com/mysql/main" overwrite="true" verbose="true">
 			<fileset dir="lib/mysql">
 				<include name="mysql-connector-java-*.jar" />
 			</fileset>
 		</copy>
 		<copy tofile="${server.home}/modules/system/layers/base/com/mysql/main/module.xml"
 			  file="lib/mysql/mysql-connector-java.module.xml" overwrite="true" verbose="true" />
+
 		
-		
 
 		<copy todir="${server.home}/modules/system/layers/base/org/quartz/main" overwrite="true" verbose="true">
 			<fileset dir="lib/quartz">
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>
Index: lams_build/conf/j2ee/jboss-deployment-structure.xml
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -18,6 +18,7 @@
     <!-- This allows you to define additional dependencies, it is the same as using the Dependencies: manifest attribute -->
     <dependencies>
 <!--      <module name="org.javassist" export="true" />-->
+      <module name="java.desktop" export="true" />
       <module name="org.apache.poi" export="true" />
       <module name="org.apache.tika" export="true" />
       <module name="net.fckeditor" export="true" />
@@ -26,8 +27,10 @@
       <module name="org.apache.commons.collections4" export="true" />
       <module name="org.apache.commons.io" export="true" />
       <module name="org.apache.commons.lang" export="true" />
+      <module name="org.apache.commons.lang3" export="true" />
       <module name="org.apache.commons.codec" export="true" />
       <module name="org.apache.commons.fileupload" export="true" />
+      <module name="org.apache.commons.fileupload2" export="true" />
       <module name="org.apache.httpcomponents.core" export="true" />
       <module name="org.apache.commons.validator" export="true" />
       <module name="org.apache.xmlcommons" export="true" />
@@ -49,7 +52,7 @@
       <module name="io.undertow.core" export="true" />
   	  <module name="io.undertow.servlet" export="true" />
   	  <module name="org.joda.time" export="true" />
-  	  <module name="javax.mail.api" export="true" />
+  	  <module name="jakarta.mail.api" export="true" />
   	  <module name="com.fasterxml.jackson.core.jackson-core" export="true" />
       <module name="com.fasterxml.jackson.core.jackson-databind" export="true" />
       <module name="com.fasterxml.jackson.core.jackson-annotations" export="true" />
Index: lams_build/deploy-tool/deploy.bat
===================================================================
diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/deploy-tool/deploy.bat	(.../deploy.bat)	(revision e98540848441375f30de49a3557a5c9b0e7bea99)
+++ lams_build/deploy-tool/deploy.bat	(.../deploy.bat)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -1 +1 @@
-java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.6.jar;lib/commons-collections-3.2.2.jar;lib/commons-logging-1.2.jar;lib/commons-io-2.11.0.jar;lib/commons-dbutils-1.7.jar;lib/mysql-connector-java-8.0.11.jar;lib/xstream-1.4.10.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
\ No newline at end of file
+java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.6.jar;lib/commons-collections-3.2.2.jar;lib/commons-logging-1.2.jar;lib/commons-io-2.15.1.jar;lib/commons-dbutils-1.7.jar;lib/mysql-connector-java-8.0.11.jar;lib/xstream-1.4.20.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
\ No newline at end of file
Index: lams_build/deploy-tool/deploy.sh
===================================================================
diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/deploy-tool/deploy.sh	(.../deploy.sh)	(revision e98540848441375f30de49a3557a5c9b0e7bea99)
+++ lams_build/deploy-tool/deploy.sh	(.../deploy.sh)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -classpath lib/lams-tool-deploy.jar:lib/commons-configuration-1.1.jar:lib/commons-lang-2.6.jar:lib/commons-collections-3.2.2.jar:lib/commons-logging-1.2.jar:lib/commons-io-2.11.0.jar:lib/commons-dbutils-1.7.jar:lib/mysql-connector-java-8.0.11.jar:lib/xstream-1.4.10.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
\ No newline at end of file
+java -classpath lib/lams-tool-deploy.jar:lib/commons-configuration-1.1.jar:lib/commons-lang-2.6.jar:lib/commons-collections-3.2.2.jar:lib/commons-logging-1.2.jar:lib/commons-io-2.15.1.jar:lib/commons-dbutils-1.7.jar:lib/mysql-connector-java-8.0.11.jar:lib/xstream-1.4.20.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
\ No newline at end of file
Index: lams_build/deploy-tool/lib/xstream-1.4.10.jar
===================================================================
diff -u -rd137d82d992c9aad7a4e55ee95ee5319d55dfb2b -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
Binary files differ
Index: lams_build/deploy-tool/lib/xstream-1.4.20.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/apache-poi/poi.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/apache-poi/poi.module.xml	(.../poi.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/apache-poi/poi.module.xml	(.../poi.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -34,15 +34,12 @@
     <resource-root path="graphics2d-0.42.jar"/>
   </resources>
   <dependencies>
-    <module name="javax.api"/>
     <module name="org.apache.xmlbeans"/>
     <module name="org.apache.commons.collections4"/>
     <module name="org.apache.commons.compress"/>
     <module name="org.apache.commons.math3"/>
     <module name="org.apache.commons.io"/>
     <module name="org.apache.commons.logging"/>
-    <module name="org.apache.logging.log4j"/>
-    <module name="org.dom4j"/>
     <module name="com.zaxxer.sparsebits" />
   </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/apache-poi/xmlbeans.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/apache-poi/xmlbeans.module.xml	(.../xmlbeans.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/apache-poi/xmlbeans.module.xml	(.../xmlbeans.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -26,8 +26,4 @@
   <resources>
     <resource-root path="xmlbeans-5.1.1.jar"/>
   </resources>
-  <dependencies>
-    <module name="javax.api" />
-    <module name="org.apache.logging.log4j"/>
-  </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/apache-tika/tika.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/apache-tika/tika.module.xml	(.../tika.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/apache-tika/tika.module.xml	(.../tika.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -35,7 +35,6 @@
     <module name="org.apache.commons.collections4"/>
     <module name="org.apache.commons.compress"/>
     <module name="org.apache.commons.io"/>
-    <module name="org.dom4j"/>
     <module name="org.apache.poi"/>
     <module name="org.apache.xerces"/>
     <module name="org.slf4j"/>
Index: lams_build/lib/basiclti-util/basiclti-util-1.2.0-jakarta.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/basiclti-util/basiclti-util.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/basiclti-util/basiclti-util.module.xml	(.../basiclti-util.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/basiclti-util/basiclti-util.module.xml	(.../basiclti-util.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -24,20 +24,9 @@
 
 <module xmlns="urn:jboss:module:1.9" name="org.imsglobal">
   <resources>
-    <resource-root path="basiclti-util-1.2.0.jar"/>
+    <resource-root path="basiclti-util-1.2.0-jakarta.jar"/>
   </resources>
   <dependencies>
-    <system>
-  		<paths>
-  			<path name="org/xml/sax"/>
-  			<path name="org/w3c/dom"/>
-  			<path name="javax/xml/parsers"/>
-  			<path name="javax/xml/transform"/>
-  			<path name="javax/xml/xpath"/>  	
-  			<path name="javax/naming"/>
-  		</paths>
-  	</system>  
-    <module name="javax.servlet.api" />
     <module name="org.apache.commons.lang"/>
     <module name="org.apache.commons.codec"/>
     <module name="net.oauth.core"/>
Index: lams_build/lib/basiclti-util/oauth.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/basiclti-util/oauth.module.xml	(.../oauth.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/basiclti-util/oauth.module.xml	(.../oauth.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -28,17 +28,6 @@
     <resource-root path="oauth-provider-20100527.jar"/>
   </resources>
   <dependencies>
-    <system>
-  		<paths>
-  			<path name="org/xml/sax"/>
-  			<path name="org/xml/sax/helpers"/>
-  			<path name="org/w3c/dom"/>
-  			<path name="javax/crypto"/>
-  			<path name="javax/crypto/spec"/>
-  			<path name="javax/xml/parsers"/>
-  		</paths>
-  	</system>   
-    <module name="javax.servlet.api" />
     <module name="org.apache.log4j" />
   </dependencies>    
 </module>
\ No newline at end of file
Index: lams_build/lib/basiclti-util/signpost.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/basiclti-util/signpost.module.xml	(.../signpost.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/basiclti-util/signpost.module.xml	(.../signpost.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -28,16 +28,6 @@
     <resource-root path="signpost-core-1.2.1.2.jar"/>
   </resources>
   <dependencies>
-    <system>
-  		<paths>
-  			<path name="org/xml/sax"/>
-  			<path name="org/xml/sax/helpers"/>
-  			<path name="org/w3c/dom"/>
-  			<path name="javax/crypto"/>
-  			<path name="javax/crypto/spec"/>
-  			<path name="javax/xml/parsers"/>
-  		</paths>
-  	</system>  
     <module name="org.apache.commons.codec"/>
     <module name="org.apache.httpcomponents"/>
   </dependencies>  
Index: lams_build/lib/batik/batik-awt-util-1.17.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/batik/batik-awt-util.jar
===================================================================
diff -u -r4a45cbf36ac175c3de074d288530a1f9b20117cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
Binary files differ
Index: lams_build/lib/batik/batik-constants-1.17.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/batik/batik-dom-1.17.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/batik/batik-dom.jar
===================================================================
diff -u -r4a45cbf36ac175c3de074d288530a1f9b20117cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
Binary files differ
Index: lams_build/lib/batik/batik-i18n-1.17.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/batik/batik-svggen-1.17.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/batik/batik-svggen.jar
===================================================================
diff -u -r4a45cbf36ac175c3de074d288530a1f9b20117cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
Binary files differ
Index: lams_build/lib/batik/batik-util-1.17.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/batik/batik-util.jar
===================================================================
diff -u -r4a45cbf36ac175c3de074d288530a1f9b20117cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
Binary files differ
Index: lams_build/lib/batik/batik-xml-1.17.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/batik/batik-xml.jar
===================================================================
diff -u -r4a45cbf36ac175c3de074d288530a1f9b20117cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
Binary files differ
Index: lams_build/lib/batik/batik.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/batik/batik.module.xml	(.../batik.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/batik/batik.module.xml	(.../batik.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -24,13 +24,16 @@
 
 <module xmlns="urn:jboss:module:1.9" name="org.apache.batik">
   <resources>
-    <resource-root path="batik-dom.jar"/>
-    <resource-root path="batik-svggen.jar"/>
-    <resource-root path="batik-xml.jar"/>
-    <resource-root path="batik-util.jar"/>
-    <resource-root path="batik-awt-util.jar"/>
+    <resource-root path="batik-constants-1.17.jar"/>
+    <resource-root path="batik-dom-1.17.jar"/>
+    <resource-root path="batik-svggen-1.17.jar"/>
+    <resource-root path="batik-xml-1.17.jar"/>
+    <resource-root path="batik-util-1.17.jar"/>
+    <resource-root path="batik-awt-util-1.17.jar"/>
+    <resource-root path="batik-i18n-1.17.jar"/>
   </resources>
   <dependencies>
   	<module name="org.apache.xmlcommons" />
+  	<module name="java.desktop" />
   </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/csrfguard/csrf.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/csrfguard/csrf.module.xml	(.../csrf.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/csrfguard/csrf.module.xml	(.../csrf.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -31,7 +31,7 @@
   
   <dependencies>
   	<module name="javax.servlet.api" />
-  	<module name="javax.servlet.jsp.api" />
+  	<module name="jakarta.servlet.jsp.api" />
   	<module name="org.slf4j"/>
   	<module name="org.apache.commons.lang3"/>
   </dependencies>
Index: lams_build/lib/fckeditor/fckeditor-java-core-2.6-jakarta.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/fckeditor/fckeditor-java-core-2.6.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
Binary files differ
Index: lams_build/lib/fckeditor/fckeditor.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/fckeditor/fckeditor.module.xml	(.../fckeditor.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/fckeditor/fckeditor.module.xml	(.../fckeditor.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -24,10 +24,10 @@
 
 <module xmlns="urn:jboss:module:1.9" name="net.fckeditor">
   <resources>
-    <resource-root path="fckeditor-java-core-2.6.jar"/>
+    <resource-root path="fckeditor-java-core-2.6-jakarta.jar"/>
   </resources>
   <dependencies>
-  	<module name="javax.servlet.api" />
+  	<module name="jakarta.servlet.api" />
   	<module name="org.slf4j" />
     <module name="org.apache.commons.fileupload" />
   </dependencies>
Index: lams_build/lib/googleauth/googleauth.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/googleauth/googleauth.module.xml	(.../googleauth.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/googleauth/googleauth.module.xml	(.../googleauth.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -30,15 +30,5 @@
   <dependencies>
   	<module name="org.apache.commons.codec"/>
   	<module name="org.apache.httpcomponents"/>
-    <system>
-  		<paths>
-  			<path name="org/xml/sax"/>
-  			<path name="org/xml/sax/helpers"/>
-  			<path name="org/w3c/dom"/>
-  			<path name="javax/crypto"/>
-  			<path name="javax/crypto/spec"/>
-  			<path name="javax/xml/parsers"/>
-  		</paths>
-  	</system>
   </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/jakarta-commons/commons-fileupload2-core-2.0.0-M2.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/jakarta-commons/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/jakarta-commons/commons-io-2.11.0.jar
===================================================================
diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
Binary files differ
Index: lams_build/lib/jakarta-commons/commons-io-2.15.1.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/jakarta-commons/commons-lang-2.6.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/jakarta-commons/fileupload.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/jakarta-commons/fileupload.module.xml	(.../fileupload.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/jakarta-commons/fileupload.module.xml	(.../fileupload.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -25,10 +25,9 @@
 <module xmlns="urn:jboss:module:1.9" name="org.apache.commons.fileupload">
   <resources>
     <resource-root path="commons-fileupload-1.3.3.jar"/>
-  </resources>  
-  
+  </resources>
+
   <dependencies>
-  	<module name="javax.servlet.api" />
   	<module name="org.apache.commons.io" />
   </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/jakarta-commons/fileupload2.module.xml
===================================================================
diff -u
--- lams_build/lib/jakarta-commons/fileupload2.module.xml	(revision 0)
+++ lams_build/lib/jakarta-commons/fileupload2.module.xml	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.9" name="org.apache.commons.fileupload2">
+  <resources>
+    <resource-root path="commons-fileupload2-core-2.0.0-M2.jar"/>
+    <resource-root path="commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar"/>
+  </resources>
+  
+  <dependencies>
+  	<module name="org.apache.commons.io"  />
+  </dependencies>
+</module>
\ No newline at end of file
Fisheye: Tag cb01d2d8c064728cb0e2ac524d2f89622a534e39 refers to a dead (removed) revision in file `lams_build/lib/jakarta-commons/io.module.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/lib/jakarta-commons/lang.module.xml
===================================================================
diff -u
--- lams_build/lib/jakarta-commons/lang.module.xml	(revision 0)
+++ lams_build/lib/jakarta-commons/lang.module.xml	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<module  xmlns="urn:jboss:module:1.9" name="org.apache.commons.lang">
+    <resources>
+        <resource-root path="commons-lang-2.6.jar"/>
+    </resources>
+</module>
\ No newline at end of file
Index: lams_build/lib/jakarta-commons/validator.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/jakarta-commons/validator.module.xml	(.../validator.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/jakarta-commons/validator.module.xml	(.../validator.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -23,10 +23,5 @@
 		<module name="org.apache.commons.logging" />
 		<module name="org.apache.commons.collections" />
 		<module name="org.apache.commons.digester" />
-		<system export="true">
-			<paths>
-				<path name="org/xml/sax" />
-			</paths>
-		</system>
 	</dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/micrometer/micrometer-observation-1.12.0.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/micrometer/micrometer.module.xml
===================================================================
diff -u
--- lams_build/lib/micrometer/micrometer.module.xml	(revision 0)
+++ lams_build/lib/micrometer/micrometer.module.xml	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<module name="io.micrometer" xmlns="urn:jboss:module:1.9">
+
+    <resources>
+        <resource-root path="micrometer-commons-1.12.0.jar"/>
+        <resource-root path="micrometer-core-1.12.0.jar"/>
+        <resource-root path="micrometer-registry-otlp-1.12.0.jar"/>
+
+        <resource-root path="micrometer-observation-1.12.0.jar"/>
+    </resources>
+
+    <dependencies>
+        <module name="io.opentelemetry.otlp"/>
+        <module name="io.opentelemetry.proto"/>
+        <module name="com.google.protobuf"/>
+
+        <module name="jakarta.servlet.api"/>
+        <module name="java.management"/>
+        <module name="java.logging"/>
+    </dependencies>
+</module>
\ No newline at end of file
Index: lams_build/lib/quartz/quartz.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/quartz/quartz.module.xml	(.../quartz.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/quartz/quartz.module.xml	(.../quartz.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -28,6 +28,10 @@
   </resources>
   
   <dependencies>
+  	<module name="java.desktop" />
+    <module name="java.sql" />
+    <module name="java.rmi" />
+
   	<module name="org.slf4j" />
   </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/reactor/reactor.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/reactor/reactor.module.xml	(.../reactor.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/reactor/reactor.module.xml	(.../reactor.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -28,6 +28,8 @@
   </resources>
   
   <dependencies>
+  	<module name="java.logging" />
+
   	<module name="org.reactivestreams" />
   </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/spring/spring.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/spring/spring.module.xml	(.../spring.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/spring/spring.module.xml	(.../spring.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -36,24 +36,21 @@
     <resource-root path="spring-web-6.1.4.jar"/>
     <resource-root path="spring-webmvc-6.1.4.jar"/>
   </resources>
-  
-<!--  <dependencies>-->
-<!--    <system>-->
-<!--  		<paths>-->
-<!--  			<path name="org/xml/sax"/>-->
-<!--  			<path name="org/w3c/dom"/>-->
-<!--  			<path name="javax/xml/parsers"/>-->
-<!--  			<path name="javax/naming"/>-->
-<!--  		</paths>-->
-<!--  	</system>-->
-<!--  	<module name="javax.servlet.api" />-->
-<!--  	<module name="javaee.api" />-->
-<!--  	<module name="org.apache.commons.logging" />-->
-<!--  	<module name="org.apache.commons.fileupload" />-->
-<!--  	<module name="org.hibernate" />-->
-<!--  	<module name="org.jboss.vfs" />-->
-<!--  	<module name="org.quartz" />-->
-<!--  	<module name="reactor" />-->
-<!--  	<module name="org.reactivestreams" />-->
-<!--  </dependencies>-->
+  <dependencies>
+    <module name="java.desktop" />
+    <module name="java.naming" />
+    <module name="java.sql" />
+
+    <module name="jakarta.servlet.api" />
+    <module name="jakarta.servlet.jsp.api" />
+    <module name="jakarta.persistence.api" />
+    <module name="jakarta.transaction.api" />
+    <module name="io.micrometer" />
+    <module name="org.hibernate" />
+    <module name="org.apache.commons.logging" />
+    <module name="org.jboss.vfs" />
+    <module name="org.quartz" />
+    <module name="reactor" />
+    <module name="org.reactivestreams" />
+  </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/urlrewritefilter/urlrewritefilter-4.0.3.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
Binary files differ
Index: lams_build/lib/urlrewritefilter/urlrewritefilter-5.1.3.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/urlrewritefilter/urlrewritefilter.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/urlrewritefilter/urlrewritefilter.module.xml	(.../urlrewritefilter.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/urlrewritefilter/urlrewritefilter.module.xml	(.../urlrewritefilter.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -23,19 +23,10 @@
   -->
 
 <module xmlns="urn:jboss:module:1.9" name="org.tuckey.urlrewritefilter">
-  <resources>
-    <resource-root path="urlrewritefilter-4.0.3.jar"/>
-  </resources>
-  
-  <dependencies>
-  	<module name="javax.servlet.api" />
-    <system>
-  		<paths>
-  			<path name="org/xml/sax"/>
-  			<path name="org/xml/sax/helpers"/>
-  			<path name="org/w3c/dom"/>
-  			<path name="javax/xml/parsers"/>
-  		</paths>
-  	</system>
-  </dependencies>
+    <resources>
+        <resource-root path="urlrewritefilter-5.1.3.jar"/>
+    </resources>
+    <dependencies>
+        <module name="jakarta.servlet.api"/>
+    </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/xml-commons/xmlcommons.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/xml-commons/xmlcommons.module.xml	(.../xmlcommons.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/xml-commons/xmlcommons.module.xml	(.../xmlcommons.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -36,14 +36,4 @@
   	</resource-root>
     <resource-root path="xml-apis-ext.jar"/>
   </resources>
-  <dependencies>
-     <system export="true">
-		<paths>
-			<path name="javax/xml/parsers" />
-			<path name="org/xml/sax" />
-			<path name="org/w3c/dom" />
-			<path name="org/w3c/dom/stylesheets" />
-		</paths>
-	</system>
-  </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/xstream/xstream-1.4.11.jar
===================================================================
diff -u -r508bb15034047f2d9af5049f88ed12ed6cf7a418 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
Binary files differ
Index: lams_build/lib/xstream/xstream-1.4.20.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/xstream/xstream.module.xml
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/lib/xstream/xstream.module.xml	(.../xstream.module.xml)	(revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_build/lib/xstream/xstream.module.xml	(.../xstream.module.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -24,15 +24,9 @@
 
 <module xmlns="urn:jboss:module:1.9" name="com.thoughtworks.xstream">
   <resources>
-    <resource-root path="xstream-1.4.11.jar"/>
+    <resource-root path="xstream-1.4.20.jar"/>
   </resources>
-  <dependencies>
-  	<system>
-  		<paths>
-  			<path name="javax/xml/stream" />
-  			<path name="javax/xml/transform" />
-  			<path name="javax/xml/namespace" />
-  		</paths>
-  	</system>
-  </dependencies>
+   <dependencies>
+      <module name="java.xml"/>
+   </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/liblist.txt
===================================================================
diff -u -r1b6b84b218055aab82004edfbe5f545b2c0eee0b -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_build/liblist.txt	(.../liblist.txt)	(revision 1b6b84b218055aab82004edfbe5f545b2c0eee0b)
+++ lams_build/liblist.txt	(.../liblist.txt)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -43,7 +43,7 @@
                   commons-validator-1.6.jar             1.6	                   Apache License 2.0            The Apache Software Foundation   Commons Validator
                   commons-discovery-0.5.jar             0.5	                   Apache License 2.0            The Apache Software Foundation
                   commons-compress-1.23.jar             1.23                   Apache License 2.0            The Apache Software Foundation   Defines an API for working with ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE, lz4, Brotli, Zstandard, DEFLATE64 and Z files
-                  commons-io-2.11.0.jar                 2.11                   Apache License 2.0            The Apache Software Foundation
+                  commons-io-2.15.1.jar                 2.11                   Apache License 2.0            The Apache Software Foundation
 
 jlatexmath		  jlatexmath-1.0.8.jar                  1.0.8                  GPL                           scilab.org                       A Java API to render LaTeX
 
Index: lams_central/.classpath
===================================================================
diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_central/.classpath	(.../.classpath)	(revision cb01d2d8c064728cb0e2ac524d2f89622a534e39)
+++ lams_central/.classpath	(.../.classpath)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -18,7 +18,7 @@
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/jakarta/servlet/jstl/api/main/jakarta.servlet.jsp.jstl-api-3.0.0.jar"/>
 	<!-- <classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-1.0.2.Final.jar"/> -->
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.9.4.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.11.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.15.1.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/lang3/main/commons-lang3-3.14.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-lang">
 		<attributes>
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
@@ -38,5 +38,9 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/hibernate/main/hibernate-core-6.4.2.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/hibernate-core"/>
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/wildfly/security/elytron-base/main/wildfly-elytron-realm-2.2.3.Final.jar" />
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/wildfly/security/elytron-base/main/wildfly-elytron-auth-2.2.3.Final.jar" />
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/wildfly/security/elytron-base/main/wildfly-elytron-auth-server-2.2.3.Final.jar" />
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/wildfly/security/elytron-base/main/wildfly-elytron-credential-2.2.3.Final.jar" />
 	<classpathentry kind="output" path="bin"/>
 </classpath>
\ No newline at end of file
Index: lams_central/lams_central.eml
===================================================================
diff -u -r1b6b84b218055aab82004edfbe5f545b2c0eee0b -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_central/lams_central.eml	(.../lams_central.eml)	(revision 1b6b84b218055aab82004edfbe5f545b2c0eee0b)
+++ lams_central/lams_central.eml	(.../lams_central.eml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -5,7 +5,7 @@
 		<excludeFolder url="file://$MODULE_DIR$/bin"/>
 		<excludeFolder url="file://$MODULE_DIR$/.sass-cache"/>
 	</contentEntry>
-	<lib name="commons-io-2.11.0.jar" scope="COMPILE">
+	<lib name="commons-io-2.15.1.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/commons-io"/>
 		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/commons-io"/>
 	</lib>
Index: lams_common/.classpath
===================================================================
diff -u -r1b6b84b218055aab82004edfbe5f545b2c0eee0b -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_common/.classpath	(.../.classpath)	(revision 1b6b84b218055aab82004edfbe5f545b2c0eee0b)
+++ lams_common/.classpath	(.../.classpath)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -22,15 +22,14 @@
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/slf4j/main/slf4j-api-2.0.11.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/slf4j/impl/main/slf4j-jboss-logmanager-2.0.1.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/jboss/logging/main/jboss-logging-3.5.3.Final.jar"/>
-	<!-- <classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/javassist/main/javassist-3.23.1-GA.jar"/> -->
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/jakarta/servlet/jstl/api/main/jakarta.servlet.jsp.jstl-api-3.0.0.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/jakarta/mail/api/main/jakarta.mail-api-2.1.2.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/jakarta/transaction/api/main/jakarta.transaction-api-2.0.1.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.9.4.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/collections/main/commons-collections-3.2.2.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/httpcomponents/core/main/httpclient-4.5.14.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/httpcomponents/core/main/httpcore-4.4.16.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.11.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.15.1.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/lang3/main/commons-lang3-3.14.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-lang">
 		<attributes>
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
@@ -46,10 +45,14 @@
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/jakarta/activation/api/main/jakarta.activation-api-2.1.2.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/jakarta/persistence/api/main/jakarta.persistence-api-3.1.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/persistence-api"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/jboss/logging/commons/logging/main/commons-logging-jboss-logging-1.0.0.Final.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/hibernate/main/hibernate-core-6.4.2.Final.jar" />
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/hibernate/main/hibernate-core-6.4.2.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/jakarta/websocket/api/main/jakarta.websocket-api-2.1.0-jbossorg-2.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/websocket"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/jakarta/websocket/api/main/jakarta.websocket-client-api-2.1.0-jbossorg-2.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/websocket"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/codehaus/woodstox/main/woodstox-core-6.4.0.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/codehaus/woodstox/main/stax2-api-4.2.2.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/wildfly/security/elytron-base/main/wildfly-elytron-realm-2.2.3.Final.jar" />
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/wildfly/security/elytron-base/main/wildfly-elytron-auth-2.2.3.Final.jar" />
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/wildfly/security/elytron-base/main/wildfly-elytron-auth-server-2.2.3.Final.jar" />
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/wildfly/security/elytron-base/main/wildfly-elytron-credential-2.2.3.Final.jar" />
 	<classpathentry kind="output" path="bin"/>
 </classpath>
\ No newline at end of file
Index: lams_common/lams_common.eml
===================================================================
diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_common/lams_common.eml	(.../lams_common.eml)	(revision cb01d2d8c064728cb0e2ac524d2f89622a534e39)
+++ lams_common/lams_common.eml	(.../lams_common.eml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -4,39 +4,50 @@
 		<excludeFolder url="file://$MODULE_DIR$/bin"/>
 		<excludeFolder url="file://$MODULE_DIR$/build"/>
 	</contentEntry>
-	<lib name="jboss-servlet-api_4.0_spec-1.0.0.Final.jar" scope="COMPILE">
+	<lib name="jakarta.servlet-api-6.0.0.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/servlet-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/servlet-api"/>
 	</lib>
-	<lib name="jboss-jsp-api_2.3_spec-1.0.3.Final.jar" scope="COMPILE">
+	<lib name="jakarta.servlet.jsp-api-3.1.1.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/jsp-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/jsp-api"/>
 	</lib>
-	<lib name="commons-io-2.11.0.jar" scope="COMPILE">
+	<lib name="commons-io-2.15.1.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/commons-io"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/commons-io"/>
 	</lib>
-	<lib name="commons-lang-2.6.jar" scope="COMPILE">
+	<lib name="commons-lang3-3.14.0.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/commons-lang"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/commons-lang"/>
 	</lib>
 	<lib name="undertow-core-2.3.10.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/undertow"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/undertow"/>
 	</lib>
 	<lib name="undertow-servlet-2.3.10.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/undertow"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/undertow"/>
 	</lib>
 	<lib name="jackson-core-2.15.3.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/jackson"/>
 	</lib>
 	<lib name="jackson-databind-2.15.3.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/jackson"/>
 	</lib>
 	<lib name="jakarta.persistence-api-3.1.0.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/persistence-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/persistence-api"/>
 	</lib>
-	<lib name="hibernate-core-6.4.2.Final.jar" scope="COMPILE">
-		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/hibernate-core"/>
-	</lib>
 	<lib name="jakarta.websocket-api-2.1.0-jbossorg-2.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/websocket"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/websocket"/>
 	</lib>
+	<lib name="jakarta.websocket-client-api-2.1.0-jbossorg-2.jar" scope="COMPILE">
+		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/websocket"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/websocket"/>
+	</lib>
 	<levels>
 		<level name="3rdParty" value="project"/>
 	</levels>
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -rcb84acde58155494dc2cdf1bae82eac746dadfe2 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision cb84acde58155494dc2cdf1bae82eac746dadfe2)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -60,7 +60,7 @@
 		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
 	</bean>
 	
-	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
+	<bean id="multipartResolver" class="org.springframework.web.multipart.support.StandardServletMultipartResolver" />
 	
 	<bean id="transactionRetryService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean ="transactionManager"/></property>
Index: lams_contentrepository/.classpath
===================================================================
diff -u -r1b6b84b218055aab82004edfbe5f545b2c0eee0b -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_contentrepository/.classpath	(.../.classpath)	(revision 1b6b84b218055aab82004edfbe5f545b2c0eee0b)
+++ lams_contentrepository/.classpath	(.../.classpath)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -21,6 +21,6 @@
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/jakarta/persistence/api/main/jakarta.persistence-api-3.1.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/persistence-api"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/hibernate/main/hibernate-core-6.4.2.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/hibernate-core"/>
-	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.11.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.15.1.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
\ No newline at end of file
Index: lams_learning/.classpath
===================================================================
diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_learning/.classpath	(.../.classpath)	(revision cb01d2d8c064728cb0e2ac524d2f89622a534e39)
+++ lams_learning/.classpath	(.../.classpath)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -8,7 +8,7 @@
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/logging/log4j/api/main/log4j-api-2.22.1.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.9.4.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/collections/main/commons-collections-3.2.2.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.11.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.15.1.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/lang3/main/commons-lang3-3.14.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-lang">
 		<attributes>
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
Index: lams_learning/lams_learning.eml
===================================================================
diff -u -r1b6b84b218055aab82004edfbe5f545b2c0eee0b -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_learning/lams_learning.eml	(.../lams_learning.eml)	(revision 1b6b84b218055aab82004edfbe5f545b2c0eee0b)
+++ lams_learning/lams_learning.eml	(.../lams_learning.eml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -5,7 +5,7 @@
         <excludeFolder url="file://$MODULE_DIR$/build"/>
         <excludeFolder url="file://$MODULE_DIR$/.sass-cache"/>
     </contentEntry>
-    <lib name="commons-io-2.11.0.jar" scope="COMPILE">
+    <lib name="commons-io-2.15.1.jar" scope="COMPILE">
         <srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/commons-io"/>
         <relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/commons-io"/>
     </lib>
Index: lams_tool_deploy/.classpath
===================================================================
diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_tool_deploy/.classpath	(.../.classpath)	(revision e98540848441375f30de49a3557a5c9b0e7bea99)
+++ lams_tool_deploy/.classpath	(.../.classpath)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -15,6 +15,6 @@
 	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-dbutils-1.7.jar"/>
 	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-lang-2.6.jar"/>
 	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-logging-1.2.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/xstream-1.4.10.jar" sourcepath="/3rdParty_sources/xstream"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/xstream-1.4.20.jar" sourcepath="/3rdParty_sources/xstream"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
\ No newline at end of file
Index: lams_tool_deploy/build.xml
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_tool_deploy/build.xml	(.../build.xml)	(revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_tool_deploy/build.xml	(.../build.xml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -41,9 +41,10 @@
 			   includeantruntime="false"
 			   debuglevel="lines,vars,source"
                classpathref="libs.classpath"
-               destdir="${basedir}/build/classes/java"
-		>
-        <compilerarg line="-encoding utf-8"/>
+               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 sources</echo>
Index: lams_tool_imscc/.classpath
===================================================================
diff -u -r1b6b84b218055aab82004edfbe5f545b2c0eee0b -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_tool_imscc/.classpath	(.../.classpath)	(revision 1b6b84b218055aab82004edfbe5f545b2c0eee0b)
+++ lams_tool_imscc/.classpath	(.../.classpath)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -6,7 +6,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/logging/log4j/api/main/log4j-api-2.22.1.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.9.4.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.11.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.15.1.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/lang3/main/commons-lang3-3.14.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-lang">
 		<attributes>
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
Index: lams_tool_imscc/lams_tool_imscc.eml
===================================================================
diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_tool_imscc/lams_tool_imscc.eml	(.../lams_tool_imscc.eml)	(revision cb01d2d8c064728cb0e2ac524d2f89622a534e39)
+++ lams_tool_imscc/lams_tool_imscc.eml	(.../lams_tool_imscc.eml)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component inheritJdk="true">
 	<contentEntry url="file://$MODULE_DIR$"/>
-	<lib name="commons-io-2.11.0.jar" scope="COMPILE">
+	<lib name="commons-io-2.15.1.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/commons-io"/>
 	</lib>
 	<lib name="commons-lang-2.6.jar" scope="COMPILE">
Index: lams_tool_zoom/.classpath
===================================================================
diff -u -r1b6b84b218055aab82004edfbe5f545b2c0eee0b -r5661c79b661c18221c0eb5e32fe7ec54110e5a65
--- lams_tool_zoom/.classpath	(.../.classpath)	(revision 1b6b84b218055aab82004edfbe5f545b2c0eee0b)
+++ lams_tool_zoom/.classpath	(.../.classpath)	(revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65)
@@ -15,7 +15,7 @@
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/logging/log4j/api/main/log4j-api-2.22.1.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.9.4.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.11.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
+	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.15.1.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-io"/>
 	<classpathentry kind="var" path="WILDFLY_HOME_50/modules/system/layers/base/org/apache/commons/lang3/main/commons-lang3-3.14.0.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT_48/commons-lang">
 		<attributes>
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>