Merge 1.2.0 changes back to master.
This commit is contained in:
commit
f94e7046ff
1 file changed
+1
-3
+1
-3
@@ -87,11 +87,9 @@ public class MySQLAuthenticationProviderModule implements Module {
|
||||
MySQLSSLMode sslMode = environment.getMySQLSSLMode();
|
||||
driverProperties.setProperty("sslMode", sslMode.getDriverValue());
|
||||
|
||||
// Set legacy properties
|
||||
// For compatibility, set legacy useSSL property when SSL is disabled.
|
||||
if (sslMode == MySQLSSLMode.DISABLED)
|
||||
driverProperties.setProperty("useSSL", "false");
|
||||
else
|
||||
driverProperties.setProperty("useSSL", "true");
|
||||
|
||||
// Check other SSL settings and set as required
|
||||
File trustStore = environment.getMySQLSSLTrustStore();
|
||||
|
||||
Reference in new issue
Block a user