From 33cbfa2e47e5bb009a424a35da5b25f0df90b98c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 19 Jul 2017 17:54:29 +0200
Subject: Fix mysql connector after lib upgrade

---
 src/main/java/org/openslx/imagemaster/db/Database.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/openslx/imagemaster/db/Database.java b/src/main/java/org/openslx/imagemaster/db/Database.java
index 765f782..cdc6fb5 100644
--- a/src/main/java/org/openslx/imagemaster/db/Database.java
+++ b/src/main/java/org/openslx/imagemaster/db/Database.java
@@ -75,7 +75,7 @@ public class Database
 		Util.notNullFatal( password, "password not set in mysql properties" );
 
 		try {
-			Class.forName( "com.mysql.jdbc.Driver" ).newInstance();
+			Class.forName( "com.mysql.cj.jdbc.Driver" ).newInstance();
 		} catch ( InstantiationException | IllegalAccessException | ClassNotFoundException e ) {
 			LOGGER.fatal( "Cannot get mysql JDBC driver!", e );
 			System.exit( 1 );
@@ -112,7 +112,7 @@ public class Database
 		try {
 			// Create fresh connection
 			String uri = "jdbc:mysql://" + host + "/" + dbname
-					+ "?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"
+					+ "?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC"
 					+ "&characterSetResults=utf8&connectionCollation=utf8mb4_unicode_ci";
 			Connection rawConnection = DriverManager.getConnection( uri,
 					user, password );
-- 
cgit v1.2.3-55-g7522