Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -r9218936edd87260de73e773054cb605a336133b1 -re53aa9f0010eb0f6fef7963e86add0a2555f9e50
--- lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 9218936edd87260de73e773054cb605a336133b1)
+++ lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision e53aa9f0010eb0f6fef7963e86add0a2555f9e50)
@@ -23,6 +23,28 @@
         <archive javadoc="http://docs.spring.io/spring/docs/4.3.10.RELEASE/javadoc-api/" path="/lams_build/lib/spring/spring-aop-4.3.10.RELEASE.jar" source="/3rdParty_sources/spring"/>
         <archive path="/lams_build/lib/xstream/xstream-1.5.0-SNAPSHOT.jar" source="/3rdParty_sources/xstream"/>
         <archive path="/lams_build/lib/quartz/quartz-2.2.3.jar" source="/3rdParty_sources/quartz"/>
+        <archive path="/lams_build/lib/apache-poi/xmlbeans-2.6.0.jar"/>
+        <archive path="/lams_build/lib/apache-poi/poi-3.16.jar" source="/3rdParty_sources/poi"/>
+        <archive path="/lams_build/lib/apache-poi/poi-ooxml-3.16.jar" source="/3rdParty_sources/poi"/>
+        <archive path="/lams_build/lib/apache-poi/poi-ooxml-schemas-3.16.jar" source="/3rdParty_sources/poi"/>
+        <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/jlatexmath/jlatexmath-1.0.6.jar" source="/3rdParty_sources/jlatexmath"/>
+        <archive path="/lams_build/lib/mysql/mysql-connector-java-5.1.46-bin.jar" source="/3rdParty_sources/mysql-connector"/>
+    </library>
+    <library name="noStruts" systemlibrary="false">
+        <archive path="/lams_build/lib/autopatch/autopatch-1.4.2-lams.jar"/>
+        <archive path="/lams_build/lib/basiclti-util/basiclti-util-1.2.0.jar"/>
+        <archive path="/lams_build/lib/basiclti-util/oauth-20100527.jar"/>
+        <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/autopatch/discovery-1.0.5-lams.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 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/xstream/xstream-1.5.0-SNAPSHOT.jar" source="/3rdParty_sources/xstream"/>
+        <archive path="/lams_build/lib/quartz/quartz-2.2.3.jar" source="/3rdParty_sources/quartz"/>
         <archive path="/lams_build/lib/mysql/mysql-connector-java-5.1.43-bin.jar" source="/3rdParty_sources/mysql-connector"/>
         <archive path="/lams_build/lib/apache-poi/xmlbeans-2.6.0.jar"/>
         <archive path="/lams_build/lib/apache-poi/poi-3.16.jar" source="/3rdParty_sources/poi"/>
@@ -31,5 +53,16 @@
         <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/jlatexmath/jlatexmath-1.0.6.jar" source="/3rdParty_sources/jlatexmath"/>
+        <archive path="/lams_build/lib/spring/spring-aop-4.3.12.RELEASE.jar" source="/3rdParty_sources/spring"/>
+        <archive path="/lams_build/lib/spring/spring-beans-4.3.12.RELEASE.jar" source="/3rdParty_sources/spring"/>
+        <archive path="/lams_build/lib/spring/spring-context-4.3.12.RELEASE.jar" source="/3rdParty_sources/spring"/>
+        <archive path="/lams_build/lib/spring/spring-context-support-4.3.12.RELEASE.jar" source="/3rdParty_sources/spring"/>
+        <archive path="/lams_build/lib/spring/spring-core-4.3.12.RELEASE.jar" source="/3rdParty_sources/spring"/>
+        <archive path="/lams_build/lib/spring/spring-expression-4.3.12.RELEASE.jar" source="/3rdParty_sources/spring"/>
+        <archive path="/lams_build/lib/spring/spring-jdbc-4.3.12.RELEASE.jar" source="/3rdParty_sources/spring"/>
+        <archive path="/lams_build/lib/spring/spring-orm-4.3.12.RELEASE.jar" source="/3rdParty_sources/spring"/>
+        <archive path="/lams_build/lib/spring/spring-tx-4.3.12.RELEASE.jar" source="/3rdParty_sources/spring"/>
+        <archive path="/lams_build/lib/spring/spring-web-4.3.12.RELEASE.jar" source="/3rdParty_sources/spring"/>
+        <archive path="/lams_build/lib/spring/spring-webmvc-4.3.12.RELEASE.jar" source="/3rdParty_sources/spring"/>
     </library>
 </eclipse-userlibraries>
Index: lams_build/deploy-tool/deploy.bat
===================================================================
diff -u -rcb69f2265bc2857b84eb7c06039b1c14658cce86 -re53aa9f0010eb0f6fef7963e86add0a2555f9e50
--- lams_build/deploy-tool/deploy.bat	(.../deploy.bat)	(revision cb69f2265bc2857b84eb7c06039b1c14658cce86)
+++ lams_build/deploy-tool/deploy.bat	(.../deploy.bat)	(revision e53aa9f0010eb0f6fef7963e86add0a2555f9e50)
@@ -1 +1 @@
-java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.0.jar;lib/commons-collections.jar;lib/commons-logging.jar;lib/commons-io-1.0.jar;lib/commons-dbutils-1.0.jar;lib/mysql-connector-java-5.0.8-bin.jar;lib/xstream-1.1.3.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
+java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.0.jar;lib/commons-collections.jar;lib/commons-logging.jar;lib/commons-io-1.0.jar;lib/commons-dbutils-1.0.jar;lib/mysql-connector-java-5.1.46-bin.jar;lib/xstream-1.1.3.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
Index: lams_build/deploy-tool/deploy.sh
===================================================================
diff -u -rcb69f2265bc2857b84eb7c06039b1c14658cce86 -re53aa9f0010eb0f6fef7963e86add0a2555f9e50
--- lams_build/deploy-tool/deploy.sh	(.../deploy.sh)	(revision cb69f2265bc2857b84eb7c06039b1c14658cce86)
+++ lams_build/deploy-tool/deploy.sh	(.../deploy.sh)	(revision e53aa9f0010eb0f6fef7963e86add0a2555f9e50)
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -classpath lib/lams-tool-deploy.jar:lib/commons-configuration-1.1.jar:lib/commons-lang-2.0.jar:lib/commons-collections.jar:lib/commons-logging.jar:lib/commons-io-1.0.jar:lib/commons-dbutils-1.0.jar:lib/mysql-connector-java-5.0.8-bin.jar:lib/xstream-1.1.3.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
+java -classpath lib/lams-tool-deploy.jar:lib/commons-configuration-1.1.jar:lib/commons-lang-2.0.jar:lib/commons-collections.jar:lib/commons-logging.jar:lib/commons-io-1.0.jar:lib/commons-dbutils-1.0.jar:lib/mysql-connector-java-5.1.46-bin.jar:lib/xstream-1.1.3.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
Index: lams_build/deploy-tool/lib/mysql-connector-java-5.0.8-bin.jar
===================================================================
diff -u -rcb69f2265bc2857b84eb7c06039b1c14658cce86 -re53aa9f0010eb0f6fef7963e86add0a2555f9e50
Binary files differ
Index: lams_build/deploy-tool/lib/mysql-connector-java-5.1.46-bin.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/mysql/mysql-connector-java-5.1.43-bin.jar
===================================================================
diff -u -r0ab9309cccfdcf25489a69466dd3ef9243e9aad1 -re53aa9f0010eb0f6fef7963e86add0a2555f9e50
Binary files differ
Index: lams_build/lib/mysql/mysql-connector-java-5.1.46-bin.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/liblist.txt
===================================================================
diff -u -r2c03060b238558d183472f0066ba003c76d00fd0 -re53aa9f0010eb0f6fef7963e86add0a2555f9e50
--- lams_build/liblist.txt	(.../liblist.txt)	(revision 2c03060b238558d183472f0066ba003c76d00fd0)
+++ lams_build/liblist.txt	(.../liblist.txt)	(revision e53aa9f0010eb0f6fef7963e86add0a2555f9e50)
@@ -31,7 +31,7 @@
 
 json-simple       json-simple-1.1.1.jar                 1.1.1                  Apache License 2.0            fangyidong                       A simple Java toolkit for JSON
 
-mysql             mysql-connector-java-5.1.43-bin.jar	5.1.43				   GPL							 Oracle 						  Java connector for MySQL                                                                          
+mysql             mysql-connector-java-5.1.46-bin.jar	5.1.46				   GPL							 Oracle 						  Java connector for MySQL                                                                          
 
 odmg              odmg-3.0.jar                          3.0                                                                                   
 
Index: lams_tool_deploy/.classpath
===================================================================
diff -u -r5ff8b7c42da4e8115ac466f2d53492c7cf081169 -re53aa9f0010eb0f6fef7963e86add0a2555f9e50
--- lams_tool_deploy/.classpath	(.../.classpath)	(revision 5ff8b7c42da4e8115ac466f2d53492c7cf081169)
+++ lams_tool_deploy/.classpath	(.../.classpath)	(revision e53aa9f0010eb0f6fef7963e86add0a2555f9e50)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-configuration-1.1.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-dbutils-1.0.jar"/>
-	<classpathentry kind="lib" path="lib/ant/ant.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-collections.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-io-1.0.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-lang-2.0.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-logging.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/mysql-connector-java-5.0.8-bin.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/xstream-1.1.3.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-configuration-1.1.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-dbutils-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/ant/ant.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-collections.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-io-1.0.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-lang-2.0.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-logging.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/xstream-1.1.3.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/mysql-connector-java-5.1.46-bin.jar" sourcepath="/3rdParty_sources/mysql-connector"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>