From 09f5912211b74ad27eae553a77e72c8492fad122 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Thu, 15 Feb 2018 11:55:49 -0800 Subject: [PATCH 1/2] Update changelog and version number for RTW 6.4 release --- CHANGELOG.md | 17 ++++++++++++++++- README.md | 14 +++++++------- pom.xml | 2 +- .../sqlserver/jdbc/SQLJdbcVersion.java | 4 ++-- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8875a0e1c..06e5311d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,22 @@ # Change Log All notable changes to this project will be documented in this file. -The format is based on [Keep a Changelog](http://keepachangelog.com/) +The format is based on [Keep a Changelog](http://keepachangelog.com/) + +## [6.4.0] Stable Release +### Added +- Support added for AAD Integrated Authentication with ADAL4J on Windows/Linux/Mac OS [#603](https://github.com/Microsoft/mssql-jdbc/pull/603) +- Enable Recover after MSDTC is restarted [#581](https://github.com/Microsoft/mssql-jdbc/pull/581) +- Added Version Update configuration rules to project [#541](https://github.com/Microsoft/mssql-jdbc/pull/541) + +### Fixed Issues +- Re-introduced Retry Logic for Prepared Statement Caching implementation and remove detect change context function [#618](https://github.com/Microsoft/mssql-jdbc/pull/618) and [#620](https://github.com/Microsoft/mssql-jdbc/pull/620) +- Fixes for SonarQube Reported issues [#599](https://github.com/Microsoft/mssql-jdbc/pull/599) +- Fixes for Random Assertion Errors [#597](https://github.com/Microsoft/mssql-jdbc/pull/597) + +### Changed +- Updated Appveyor to use JDK9 building driver and running tests [#619](https://github.com/Microsoft/mssql-jdbc/pull/619) + ## [6.3.6] Preview Release ### Added diff --git a/README.md b/README.md index 088b6c278..27aa2d41f 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ We're now on the Maven Central Repository. Add the following to your POM file to com.microsoft.sqlserver mssql-jdbc - 6.2.2.jre8 + 6.4.0.jre8 ``` The driver can be downloaded from the [Microsoft Download Center](https://go.microsoft.com/fwlink/?linkid=852460). @@ -120,14 +120,14 @@ Projects that require either of the two features need to explicitly declare the com.microsoft.sqlserver mssql-jdbc - 6.3.6.jre8-preview + 6.4.0.jre8 compile com.microsoft.azure adal4j - 1.3.0 + 1.4.0 ``` @@ -136,14 +136,14 @@ Projects that require either of the two features need to explicitly declare the com.microsoft.sqlserver mssql-jdbc - 6.3.6.jre8-preview + 6.4.0.jre8 compile com.microsoft.azure adal4j - 1.3.0 + 1.4.0 @@ -155,12 +155,12 @@ Projects that require either of the two features need to explicitly declare the ***Please note*** as of the v6.2.2, the way to construct a `SQLServerColumnEncryptionAzureKeyVaultProvider` object has changed. Please refer to this [Wiki](https://github.com/Microsoft/mssql-jdbc/wiki/New-Constructor-Definition-for-SQLServerColumnEncryptionAzureKeyVaultProvider-after-6.2.2-Release) page for more information. ## Guidelines for Creating Pull Requests -We love contributions from the community. To help improve the quality of our code, we encourage you to use the mssql-jdbc_formatter.xml formatter provided on all pull requests. +We love contributions from the community. To help improve the quality of our code, we encourage you to use the mssql-jdbc_formatter.xml formatter provided on all pull requests. Thank you! ## Guidelines for Reporting Issues -We appreciate you taking the time to test the driver, provide feedback and report any issues. It would be extremely helpful if you: +We appreciate you taking the time to test the driver, provide feedback and report any issues. It would be extremely helpful if you: - Report each issue as a new issue (but check first if it's already been reported) - Try to be detailed in your report. Useful information for good bug reports include: diff --git a/pom.xml b/pom.xml index 870c5f341..18bcc65d1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.4.0-SNAPSHOT.${jreVersion} + 6.4.0.${jreVersion} jar Microsoft JDBC Driver for SQL Server diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java index 81ab1a603..9aaaa8f52 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java @@ -10,7 +10,7 @@ final class SQLJdbcVersion { static final int major = 6; - static final int minor = 3; - static final int patch = 6; + static final int minor = 4; + static final int patch = 0; static final int build = 0; } From 3d550c04a92fe221762c86e72572653957ac676c Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Thu, 15 Feb 2018 11:58:02 -0800 Subject: [PATCH 2/2] Removed appveyor update for jdk9 --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06e5311d9..783b302df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) - Fixes for SonarQube Reported issues [#599](https://github.com/Microsoft/mssql-jdbc/pull/599) - Fixes for Random Assertion Errors [#597](https://github.com/Microsoft/mssql-jdbc/pull/597) -### Changed -- Updated Appveyor to use JDK9 building driver and running tests [#619](https://github.com/Microsoft/mssql-jdbc/pull/619) - ## [6.3.6] Preview Release ### Added