Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -re53aa9f0010eb0f6fef7963e86add0a2555f9e50 -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision e53aa9f0010eb0f6fef7963e86add0a2555f9e50)
+++ lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -30,39 +30,6 @@
         <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"/>
+        <archive path="/lams_build/lib/mysql/mysql-connector-java-8.0.11.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"/>
-        <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/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/build.xml
===================================================================
diff -u -rcd93bf688381a78166f1fb44ac94d9c906984129 -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_build/build.xml	(.../build.xml)	(revision cd93bf688381a78166f1fb44ac94d9c906984129)
+++ lams_build/build.xml	(.../build.xml)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -380,7 +380,7 @@
 			dbPassword="${db.password}"
 			dbUsername="${db.username}"
 			dbDriverUrl="${db.url.build}"
-			dbDriverClass="com.mysql.jdbc.Driver"	
+			dbDriverClass="com.mysql.cj.jdbc.Driver"	
 		/>
 	
 		<echo>Deploying language files</echo>
@@ -675,6 +675,7 @@
 	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
+	        	<filter token="db.timezone" value="${db.timezone}"/>
 	        </filterset>
 		</copy>
 	</target>
@@ -688,6 +689,7 @@
 	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
+	        	<filter token="db.timezone" value="${db.timezone}"/>
 	        </filterset>
 		</copy>
 	</target>
@@ -761,6 +763,7 @@
 	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
+	        	<filter token="db.timezone" value="${db.timezone}"/>
 	        </filterset>
 		</copy>
 		
Index: lams_build/build_base.xml
===================================================================
diff -u -r999d7eabc9fab6a6831ee3d154dcc9a02ca3dc58 -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_build/build_base.xml	(.../build_base.xml)	(revision 999d7eabc9fab6a6831ee3d154dcc9a02ca3dc58)
+++ lams_build/build_base.xml	(.../build_base.xml)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -140,7 +140,7 @@
 	
 	<target name="_db-script">
 		<!-- Internal target: Runs SQL script given by call parameter. -->
-		<sql driver="com.mysql.jdbc.Driver"
+		<sql driver="com.mysql.cj.jdbc.Driver"
 		     url="${db.url.build}"
 			 userid="${db.username}"
 			 password="${db.password}"
Index: lams_build/build_tools_base.xml
===================================================================
diff -u -r87f1bf7b9682e38a4196005787b14967c4661d96 -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_build/build_tools_base.xml	(.../build_tools_base.xml)	(revision 87f1bf7b9682e38a4196005787b14967c4661d96)
+++ lams_build/build_tools_base.xml	(.../build_tools_base.xml)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -123,7 +123,7 @@
 			dbPassword="${db.password}" 
 			dbUsername="${db.username}" 
 			dbDriverUrl="${db.url.build}" 
-			dbDriverClass="com.mysql.jdbc.Driver" 
+			dbDriverClass="com.mysql.cj.jdbc.Driver" 
 			deployFiles="${basedir}/build/deploy/${product}.war,${basedir}/build/deploy/${product}.jar" 
 			toolJarFileName="${product}.jar"
 			toolSignature="${signature}"
Index: lams_build/common.properties
===================================================================
diff -u -r1b036cb2e23c7358b8b44b47c4a131853d2075d1 -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_build/common.properties	(.../common.properties)	(revision 1b036cb2e23c7358b8b44b47c4a131853d2075d1)
+++ lams_build/common.properties	(.../common.properties)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -66,14 +66,15 @@
 db.password=lamsdemo
 
 db.scripts=${basedir}/db/sql
+# you can set own timezone, for example "Europe/Warsaw"
+db.timezone=UTC
 
-
 # Basedir of embedded MySQL server. This is also the place where data is stored.
 # Set it if you use MXJ for running and/or building LAMS.
 db.location=C:/lams/database
 
 # To build LAMS using standalone MySQL server, use properties below
-db.url.build=jdbc:mysql://${db.host}:${db.port}/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true&useSSL=false
+db.url.build=jdbc:mysql://${db.host}:${db.port}/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&autoReconnect=true&useUnicode=true&useSSL=false=&useLegacyDatetimeCode=false&serverTimezone=${db.timezone}
 db.url.init.build=${db.url.build}
 
 # To build LAMS using embedded MySQL server, use properties below
Index: lams_build/conf/domain.xml
===================================================================
diff -u -rad8707a3e0b0501d651993f3da9dd0ba975f39fc -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_build/conf/domain.xml	(.../domain.xml)	(revision ad8707a3e0b0501d651993f3da9dd0ba975f39fc)
+++ lams_build/conf/domain.xml	(.../domain.xml)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -229,9 +229,11 @@
 				    <driver>MySQL</driver>
 				    <connection-property name="characterEncoding">utf8</connection-property>
 				    <connection-property name="useUnicode">true</connection-property>
-				    <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
+				    <connection-property name="zeroDateTimeBehavior">CONVERT_TO_NULL</connection-property>
 				    <connection-property name="useSSL">false</connection-property>
 				    <connection-property name="autoReconnect">true</connection-property>
+				    <connection-property name="useLegacyDatetimeCode">false</connection-property>
+				    <connection-property name="serverTimezone">@db.timezone@</connection-property>
 				    
 				    <!-- Properties below are used only for embedded MySQL server -->
 				    <connection-property name="server.basedir">@db.location@</connection-property>
Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -rf2c0865cbb95219b30d59d6152b20dff389dc7b0 -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision f2c0865cbb95219b30d59d6152b20dff389dc7b0)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -246,9 +246,11 @@
 				    <driver>MySQL</driver>
 				    <connection-property name="characterEncoding">utf8</connection-property>
 				    <connection-property name="useUnicode">true</connection-property>
-				    <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
+				    <connection-property name="zeroDateTimeBehavior">CONVERT_TO_NULL</connection-property>
 				    <connection-property name="useSSL">false</connection-property>
 				    <connection-property name="autoReconnect">true</connection-property>
+				    <connection-property name="useLegacyDatetimeCode">false</connection-property>
+				    <connection-property name="serverTimezone">@db.timezone@</connection-property>
 				    
 				    <!-- Properties below are used only for embedded MySQL server -->
 				    <connection-property name="server.basedir">@db.location@</connection-property>
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -rf2c0865cbb95219b30d59d6152b20dff389dc7b0 -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision f2c0865cbb95219b30d59d6152b20dff389dc7b0)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -264,9 +264,11 @@
 				    <driver>MySQL</driver>
 				    <connection-property name="characterEncoding">utf8</connection-property>
 				    <connection-property name="useUnicode">true</connection-property>
-				    <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
+				    <connection-property name="zeroDateTimeBehavior">CONVERT_TO_NULL</connection-property>
 				    <connection-property name="useSSL">false</connection-property>
 				    <connection-property name="autoReconnect">true</connection-property>
+				    <connection-property name="useLegacyDatetimeCode">false</connection-property>
+				    <connection-property name="serverTimezone">@db.timezone@</connection-property>
 				    
 				    <!-- Properties below are used only for embedded MySQL server -->
 				    <connection-property name="server.basedir">@db.location@</connection-property>
Index: lams_build/deploy-tool/deploy.bat
===================================================================
diff -u -re53aa9f0010eb0f6fef7963e86add0a2555f9e50 -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_build/deploy-tool/deploy.bat	(.../deploy.bat)	(revision e53aa9f0010eb0f6fef7963e86add0a2555f9e50)
+++ lams_build/deploy-tool/deploy.bat	(.../deploy.bat)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -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.1.46-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-8.0.11.jar;lib/xstream-1.1.3.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
Index: lams_build/deploy-tool/deploy.sh
===================================================================
diff -u -re53aa9f0010eb0f6fef7963e86add0a2555f9e50 -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_build/deploy-tool/deploy.sh	(.../deploy.sh)	(revision e53aa9f0010eb0f6fef7963e86add0a2555f9e50)
+++ lams_build/deploy-tool/deploy.sh	(.../deploy.sh)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -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.1.46-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-8.0.11.jar:lib/xstream-1.1.3.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar
===================================================================
diff -u -rb6159ecd849c58b23795d7b5eeb05cdeb5f532da -r65fbbe8890364e0ba2624f16794df18439af397a
Binary files differ
Index: lams_build/lib/mysql/mysql-connector-java.module.xml
===================================================================
diff -u -rccfe08930c8c33a8f96900a64475229049441f6c -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_build/lib/mysql/mysql-connector-java.module.xml	(.../mysql-connector-java.module.xml)	(revision ccfe08930c8c33a8f96900a64475229049441f6c)
+++ lams_build/lib/mysql/mysql-connector-java.module.xml	(.../mysql-connector-java.module.xml)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -24,7 +24,7 @@
 
 <module xmlns="urn:jboss:module:1.5" name="com.mysql">
   <resources>
-    <resource-root path="mysql-connector-java-5.1.46-bin.jar"/>
+    <resource-root path="mysql-connector-java-8.0.11.jar"/>
   </resources>
   <dependencies>
     <module name="javax.api"/>
Index: lams_common/build.xml
===================================================================
diff -u -r9a237de88d468b730a0f506a9166ea1a10e5bbdd -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_common/build.xml	(.../build.xml)	(revision 9a237de88d468b730a0f506a9166ea1a10e5bbdd)
+++ lams_common/build.xml	(.../build.xml)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -7,7 +7,7 @@
 	<target name="build-db" depends="_clean-dirs"
 		description="Rebuilds LAMS database.">
 		
-		<echo>Rebuilding LAMS database</echo>
+		<echo>Rebuilding LAMS database ${db.url.init.build} ${db.username} ${db.password}</echo>
 		<tstamp/>
 		<copy todir="${basedir}/build/sql" overwrite="true" verbose="true">
 			<fileset dir="${db.scripts}/">
@@ -24,7 +24,7 @@
 		</copy>
 		
 		<echo>Executing SQL scripts</echo>
-		<sql driver="com.mysql.jdbc.Driver"
+		<sql driver="com.mysql.cj.jdbc.Driver"
 		     url="${db.url.init.build}"
 			 userid="${db.username}"
 			 password="${db.password}"
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/AddCustomWebXmlContexts.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/AddCustomWebXmlContexts.java	(.../AddCustomWebXmlContexts.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/AddCustomWebXmlContexts.java	(.../AddCustomWebXmlContexts.java)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -132,7 +132,7 @@
 	System.out.println("Pass: " + dbPass);
 	System.out.println("Url: " + dbUrl);
 
-	Class.forName("com.mysql.jdbc.Driver");
+	Class.forName("com.mysql.cj.jdbc.Driver");
 	Connection conn = DriverManager.getConnection(dbUrl, dbUser, dbPass);
 	conn.setAutoCommit(false);
 
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/templateDeploy.properties
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/templateDeploy.properties	(.../templateDeploy.properties)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/templateDeploy.properties	(.../templateDeploy.properties)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -11,7 +11,7 @@
 dbDriverUrl=jdbc:mysql://localhost:3306/scratch
 
 #Classname of JDBC driver
-dbDriverClass=com.mysql.jdbc.Driver
+dbDriverClass=com.mysql.cj.jdbc.Driver
 
 #List of files to move to the deploy directory
 deployFiles=
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/templateDeployTool.xml
===================================================================
diff -u -rb6159ecd849c58b23795d7b5eeb05cdeb5f532da -r65fbbe8890364e0ba2624f16794df18439af397a
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/templateDeployTool.xml	(.../templateDeployTool.xml)	(revision b6159ecd849c58b23795d7b5eeb05cdeb5f532da)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/templateDeployTool.xml	(.../templateDeployTool.xml)	(revision 65fbbe8890364e0ba2624f16794df18439af397a)
@@ -1,8 +1,8 @@
 <Deploy>
 	<dbUsername></dbUsername>
 	<dbPassword></dbPassword>
-	<dbDriverClass>com.mysql.jdbc.Driver</dbDriverClass>
-	<dbDriverUrl>jdbc:mysql://localhost/lams?characterEncoding=utf8&amp;zeroDateTimeBehavior=convertToNull&amp;autoReconnect=true</dbDriverUrl>
+	<dbDriverClass>com.mysql.cj.jdbc.Driver</dbDriverClass>
+	<dbDriverUrl>jdbc:mysql://localhost/lams?characterEncoding=utf8&amp;zeroDateTimeBehavior=CONVERT_TO_NULL&amp;autoReconnect=true&amp;useUnicode=true&amp;useSSL=false</dbDriverUrl>
 	<toolSignature>lasbmt11</toolSignature>
 	<toolWebUri>test-dummy.war</toolWebUri>
 	<toolContext>/lams/tool/test</toolContext>