Merge pull request #273 from Microsoft/dev

Merge Dev to Master for Release v6.1.7

CHANGELOG.md

@@ -3,6 +3,29 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 
+## [6.1.7]
+### Added
+- Added support for data type LONGVARCHAR, LONGNVARCHAR, LONGVARBINARY and SQLXML in TVP [#259](https://github.com/Microsoft/mssql-jdbc/pull/259)
+- Added new connection property to accept custom JAAS configuration for Kerberos [#254](https://github.com/Microsoft/mssql-jdbc/pull/254)
+- Added support for server cursor with TVP [#234](https://github.com/Microsoft/mssql-jdbc/pull/234) 
+- Experimental Feature: Added new connection property to support network timeout [#253](https://github.com/Microsoft/mssql-jdbc/pull/253)
+- Added support to authenticate Kerberos with principal and password [#163](https://github.com/Microsoft/mssql-jdbc/pull/163)
+- Added temporal types to BulkCopyCSVTestInput.csv [#262](https://github.com/Microsoft/mssql-jdbc/pull/262)
+- Added automatic detection of REALM in SPN needed for Cross Domain authentication [#40](https://github.com/Microsoft/mssql-jdbc/pull/40)
+
+### Changed
+- Updated minor semantics [#232](https://github.com/Microsoft/mssql-jdbc/pull/232)
+- Cleaned up Azure Active Directory (AAD) Authentication methods [#256](https://github.com/Microsoft/mssql-jdbc/pull/256)
+- Updated permission check before setting network timeout [#255](https://github.com/Microsoft/mssql-jdbc/pull/255)
+
+### Fixed Issues
+- Turn TNIR (TransparentNetworkIPResolution) off for Azure Active Directory (AAD) Authentication and changed TNIR multipliers [#240](https://github.com/Microsoft/mssql-jdbc/pull/240)
+- Wrapped ClassCastException in BulkCopy with SQLServerException [#260](https://github.com/Microsoft/mssql-jdbc/pull/260)
+- Initialized the XA transaction manager for each XAResource [#257](https://github.com/Microsoft/mssql-jdbc/pull/257)
+- Fixed BigDecimal scale rounding issue in BulkCopy [#230](https://github.com/Microsoft/mssql-jdbc/issues/230)
+- Fixed the invalid exception thrown when stored procedure does not exist is used with TVP [#265](https://github.com/Microsoft/mssql-jdbc/pull/265)
+
+
 ## [6.1.6]
 ### Added
 - Added constrained delegation to connection sample [#188](https://github.com/Microsoft/mssql-jdbc/pull/188)

README.md

@@ -15,9 +15,8 @@ SQL Server Team
 
 ## Take our survey
 
-Let us know more about how you think we should prioritize work in the JDBC Driver.
-
-<a href="https://www.surveymonkey.com/r/BJY7RK9"><img style="float: right;"  height="67" width="156" src="https://meetsstorenew.blob.core.windows.net/contianerhd/survey.png?st=2017-02-17T22%3A03%3A00Z&se=2100-02-18T22%3A03%3A00Z&sp=rl&sv=2015-12-11&sr=b&sig=DJSFoihBptSvO%2BjvWzwpHecf8o5yfAbJoD2qW5oB8tc%3D"></a>
+Let us know how you think we're doing.
+<a href="https://www.surveybuilder.com/s/9TQ1T"><img style="float: right;"  height="67" width="156" src="https://meetsstorenew.blob.core.windows.net/contianerhd/survey.png?st=2017-02-17T22%3A03%3A00Z&se=2100-02-18T22%3A03%3A00Z&sp=rl&sv=2015-12-11&sr=b&sig=DJSFoihBptSvO%2BjvWzwpHecf8o5yfAbJoD2qW5oB8tc%3D"></a>
 
 ## Status of Most Recent Builds
 | AppVeyor (Windows)       | Travis CI (Linux) |
@@ -36,20 +35,22 @@ What's coming next?  We will look into adding a more comprehensive set of tests,
 ## Build
 ### Prerequisites
 * Java 8
-* [Maven](http://maven.apache.org/download.cgi) or [Gradle](https://gradle.org/gradle-download/)
+* [Maven](http://maven.apache.org/download.cgi)
 * An instance of SQL Server or Azure SQL Database that you can connect to. 
 
 ### Build the JAR files
-Maven and Gradle builds automatically trigger a set of verification tests to run.  For these tests to pass, you will first need to add an environment variable in your system called `mssql_jdbc_test_connection_properties` to provide the [correct connection properties](https://msdn.microsoft.com/en-us/library/ms378428(v=sql.110).aspx) for your SQL Server or Azure SQL Database instance.
+Maven builds automatically trigger a set of verification tests to run.  For these tests to pass, you will first need to add an environment variable in your system called `mssql_jdbc_test_connection_properties` to provide the [correct connection properties](https://msdn.microsoft.com/en-us/library/ms378428(v=sql.110).aspx) for your SQL Server or Azure SQL Database instance.
 
-To build the jar files, you must use Java 8 with either Maven or Gradle.  You can choose to build a JDBC 4.1 compliant jar file (for use with JRE 7) and/or a JDBC 4.2 compliant jar file (for use with JRE 8).
+To build the jar files, you must use Java 8 with Maven.  You can choose to build a JDBC 4.1 compliant jar file (for use with JRE 7) and/or a JDBC 4.2 compliant jar file (for use with JRE 8).
 
 * Maven:
 	1. If you have not already done so, add the environment variable `mssql_jdbc_test_connection_properties` in your system with the connection properties for your SQL Server or SQL DB instance.
 	2. Run one of the commands below to build a JDBC 4.1 compliant jar or JDBC 4.2 compliant jar in the \target directory. 
     	* Run `mvn install -Pbuild41`. This creates JDBC 4.1 compliant jar in \target directory
     	* Run `mvn install -Pbuild42`. This creates JDBC 4.2 compliant jar in \target directory
 
+**NOTE**: Beginning release v6.1.7, we will no longer be maintaining the existing [Gradle build script](build.gradle) and it will be left in the repository for reference. Please refer to issue [#62](https://github.com/Microsoft/mssql-jdbc/issues/62) for this decision.
+
 * Gradle:
 	1. If you have not already done so, add the environment variable `mssql_jdbc_test_connection_properties` in your system with the connection properties for your SQL Server or SQL DB instance.
 	2. Run one of the commands below to build a JDBC 4.1 compliant jar or JDBC 4.2 compliant jar in the \build\libs directory. 
@@ -71,18 +72,27 @@ For some features (e.g. Integrated Authentication and Distributed Transactions),
 Don't want to compile anything?
 
 We're now on the Maven Central Repository. Add the following to your POM file:
-
-```
+```xml
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
 	<version>6.1.0.jre8</version>
 </dependency>
 ```
+The driver can be downloaded from the [Microsoft Download Center](https://www.microsoft.com/en-us/download/details.aspx?displaylang=en&id=11774).
+
+To get the latest preview version of the driver, add the following to your POM file: 
+```xml
+<dependency>
+	<groupId>com.microsoft.sqlserver</groupId>
+	<artifactId>mssql-jdbc</artifactId>
+	<version>6.1.7.jre8-preview</version>
+</dependency>
+```
+
 
-The driver can be downloaded from the [Microsoft Download Center](https://www.microsoft.com/en-us/download/details.aspx?displaylang=en&id=11774)
 
-##Dependencies
+## Dependencies
 This project has following dependencies: 
 
 Compile Time:
@@ -92,7 +102,7 @@ Compile Time:
 Test Time:
  - `junit:jar`   : For Unit Test cases.
 
-###Dependency Tree
+### Dependency Tree
 One can see all dependencies including Transitive Dependency by executing following command.
 ``` 
 mvn dependency:tree
@@ -102,7 +112,7 @@ mvn dependency:tree
 Projects that require either of the two features need to explicitly declare the dependency in their pom file.
 
 ***For Example:*** If you are using *Azure Key Vault feature* then you need to redeclare *azure-keyvault* dependency in your project's pom file. Please see the following snippet: 
-```
+```xml
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
@@ -128,7 +138,7 @@ We appreciate you taking the time to test the driver, provide feedback and repor
 - 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:
   * What you are seeing and what the expected behaviour is
-  *  Which jar file?
+  * Which jar file?
   * Environment details: e.g. Java version, client operating system?
   * Table schema (for some issues the data types make a big difference!)
   * Any other relevant information you want to share
@@ -159,8 +169,6 @@ Up-to-date list of contributors: https://github.com/Microsoft/mssql-jdbc/graphs/
 ## License
 The Microsoft JDBC Driver for SQL Server is licensed under the MIT license. See the [LICENSE](https://github.com/Microsoft/mssql-jdbc/blob/master/LICENSE) file for more details.
 
-
-
 ## Code of conduct
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.1.6</version>
+	<version>6.1.7</version>
 
 	<packaging>jar</packaging>
 

src/main/java/com/microsoft/sqlserver/jdbc/AuthenticationJNI.java

@@ -87,18 +87,6 @@ static FedAuthDllInfo getAccessTokenForWindowsIntegrated(String stsURL,
         return dllInfo;
     }
 
-    static FedAuthDllInfo getAccessToken(String userName,
-            String password,
-            String stsURL,
-            String servicePrincipalName,
-            String clientConnectionId,
-            String clientId,
-            long expirationFileTime) throws DLLException {
-        FedAuthDllInfo dllInfo = ADALGetAccessToken(userName, password, stsURL, servicePrincipalName, clientConnectionId, clientId,
-                expirationFileTime, authLogger);
-        return dllInfo;
-    }
-
     // InitDNSName should be called to initialize the DNSName before calling this function
     byte[] GenerateClientContext(byte[] pin,
             boolean[] done) throws SQLServerException {
@@ -184,15 +172,6 @@ private native static FedAuthDllInfo ADALGetAccessTokenForWindowsIntegrated(Stri
             long expirationFileTime,
             java.util.logging.Logger log);
 
-    private native static FedAuthDllInfo ADALGetAccessToken(String userName,
-            String password,
-            String stsURL,
-            String servicePrincipalName,
-            String clientConnectionId,
-            String clientId,
-            long expirationFileTime,
-            java.util.logging.Logger log);
-
     native static byte[] DecryptColumnEncryptionKey(String masterKeyPath,
             String encryptionAlgorithm,
             byte[] encryptedColumnEncryptionKey) throws DLLException;