Merge branch 'issue-374' of https://github.com/iNikem/testcontainers-java into iNikem-issue-374

Author: rnorth

CHANGELOG.md

@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 - Environment variables are now stored as Map instead of List ([\#550](https://github.com/testcontainers/testcontainers-java/pull/550))
 - Added `withEnv(String name, Function<Optional<String>, String> mapper)` with optional previous value ([\#550](https://github.com/testcontainers/testcontainers-java/pull/550))
 - Added `withFileSystemBind` overloaded method with `READ_WRITE` file mode by default ([\#550](https://github.com/testcontainers/testcontainers-java/pull/550))
+- All connections to JDBC containers (e.g. MySQL) don't use SSL anymore. ([\#374](https://github.com/testcontainers/testcontainers-java/issues/374))
 
 ## [1.5.1] - 2017-12-19
 

modules/jdbc-test/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.35</version>
+            <version>5.1.45</version>
             <scope>test</scope>
         </dependency>
         <dependency>

modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java

@@ -136,7 +136,7 @@ public Connection createConnection(String queryString) throws SQLException {
         final Properties info = new Properties();
         info.put("user", this.getUsername());
         info.put("password", this.getPassword());
-        final String url = this.getJdbcUrl() + queryString;
+        final String url = appendDisableSslConfig(this.getJdbcUrl() + queryString);
 
         final Driver jdbcDriverInstance = getJdbcDriverInstance();
 
@@ -147,6 +147,11 @@ public Connection createConnection(String queryString) throws SQLException {
         }
     }
 
+    private String appendDisableSslConfig(String connectionString){
+      String separator = connectionString.contains("?") ? "&" : "?";
+      return connectionString + separator + "useSSL=false";
+    }
+
     protected void optionallyMapResourceParameterAsVolume(@NotNull String paramName, @NotNull String pathNameInContainer, @NotNull String defaultResource) {
         String resourceName = parameters.getOrDefault(paramName, defaultResource);