diff --git a/pom.xml b/pom.xml index 989f483794ab32527f15ec9c3090204619bba771..236a31297110b3c7d5acf2362ad1025121ddccb1 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>6.0.6</version> + <version>8.0.19</version> </dependency> <dependency> <groupId>org.xerial</groupId> diff --git a/src/main/java/caosdb/server/database/backend/implementation/MySQL/DatabaseConnectionPool.java b/src/main/java/caosdb/server/database/backend/implementation/MySQL/DatabaseConnectionPool.java index 9700daf3a99b30e42baf8580f863998d7efe67a1..86918e37c279f4ab5decb9c59c5311e1747f1a0f 100644 --- a/src/main/java/caosdb/server/database/backend/implementation/MySQL/DatabaseConnectionPool.java +++ b/src/main/java/caosdb/server/database/backend/implementation/MySQL/DatabaseConnectionPool.java @@ -85,7 +85,9 @@ class DatabaseConnectionPool { + CaosDBServer.getServerProperty(ServerProperties.KEY_MYSQL_PORT) + "/" + CaosDBServer.getServerProperty(ServerProperties.KEY_MYSQL_DATABASE_NAME) - + "?noAccessToProcedureBodies=true&cacheCallableStmts=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&connectionCollation=utf8_unicode_ci&characterSetResults=utf8&serverTimezone=CET"; + + "?noAccessToProcedureBodies=true&autoReconnect=true&serverTimezone=UTC&characterEncoding=UTF-8"; + // + + // "?noAccessToProcedureBodies=true&cacheCallableStmts=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&connectionCollation=utf8_unicode_ci&characterSetResults=utf8&serverTimezone=CET"; // + "?profileSQL=true&characterSetResults=utf8"; final String user = CaosDBServer.getServerProperty(ServerProperties.KEY_MYSQL_USER_NAME); final String pwd = CaosDBServer.getServerProperty(ServerProperties.KEY_MYSQL_USER_PASSWORD);