Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gcf-merge-on-green merged 2 commits into from
May 10, 2022
+6 −2
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ead704b
fix(deps): update dependency com.microsoft.sqlserver:mssql-jdbc to v10
renovate-bot May 10, 2022
51b9b3b
add encrypt=false flag to SQL Server Client-side Encryption samples
shubha-rajan May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloud-sql/sqlserver/client-side-encryption/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 5 additions & 1 deletion .../sqlserver/client-side-encryption/src/main/java/cloudsql/tink/CloudSqlConnectionPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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]