fix(deps): update dependency com.microsoft.sqlserver:mssql-jdbc to v10 (GoogleCloudPlatform#7133)

renovate-bot · web-flow · commit 0919c59d7f6a · 2022-05-10T20:00:15.000Z
[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.microsoft.sqlserver:mssql-jdbc](https://togithub.com/Microsoft/mssql-jdbc) | `9.4.1.jre8` -> `10.2.0.jre8` | [![age](https://badges.renovateapi.com/packages/maven/com.microsoft.sqlserver:mssql-jdbc/10.2.0.jre8/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.microsoft.sqlserver:mssql-jdbc/10.2.0.jre8/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.microsoft.sqlserver:mssql-jdbc/10.2.0.jre8/compatibility-slim/9.4.1.jre8)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.microsoft.sqlserver:mssql-jdbc/10.2.0.jre8/confidence-slim/9.4.1.jre8)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/GoogleCloudPlatform/java-docs-samples).
diff --git a/cloud-sql/sqlserver/client-side-encryption/pom.xml b/cloud-sql/sqlserver/client-side-encryption/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
-      <version>9.4.1.jre8</version>
+      <version>10.2.0.jre8</version>
     </dependency>
     <dependency>
       <groupId>com.google.crypto.tink</groupId>
diff --git a/cloud-sql/sqlserver/client-side-encryption/src/main/java/cloudsql/tink/CloudSqlConnectionPool.java b/cloud-sql/sqlserver/client-side-encryption/src/main/java/cloudsql/tink/CloudSqlConnectionPool.java
@@ -35,6 +35,10 @@ public static DataSource createConnectionPool(String dbUser, String dbPass, Stri
     config.setPassword(dbPass); // e.g. "my-password"
     config.addDataSourceProperty("databaseName", dbName);
 
+    // The Cloud SQL Java Connector provides SSL encryption so 
+    // it should be disabled at the driver level
+    config.addDataSourceProperty("encrypt", "false");
+
     config.addDataSourceProperty("socketFactoryClass",
         "com.google.cloud.sql.sqlserver.SocketFactory");
     config.addDataSourceProperty("socketFactoryConstructorArg", instanceConnectionName);
@@ -60,4 +64,4 @@ public static void createTable(DataSource pool, String tableName) throws SQLExce
     }
   }
 }
-// [END cloud_sql_sqlserver_cse_db]
+// [END cloud_sql_sqlserver_cse_db]

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,10 @@ public static DataSource createConnectionPool(String dbUser, String dbPass, Stri`
`35`	`35`	`config.setPassword(dbPass); // e.g. "my-password"`
`36`	`36`	`config.addDataSourceProperty("databaseName", dbName);`
`37`	`37`
	`38`	`+ // The Cloud SQL Java Connector provides SSL encryption so`
	`39`	`+ // it should be disabled at the driver level`
	`40`	`+ config.addDataSourceProperty("encrypt", "false");`
	`41`	`+`
`38`	`42`	`config.addDataSourceProperty("socketFactoryClass",`
`39`	`43`	`"com.google.cloud.sql.sqlserver.SocketFactory");`
`40`	`44`	`config.addDataSourceProperty("socketFactoryConstructorArg", instanceConnectionName);`
`@@ -60,4 +64,4 @@ public static void createTable(DataSource pool, String tableName) throws SQLExce`
`60`	`64`	`}`
`61`	`65`	`}`
`62`	`66`	`}`
`63`		`-// [END cloud_sql_sqlserver_cse_db]`
	`67`	`+// [END cloud_sql_sqlserver_cse_db]`