Push dev to master for v7.1.2

.travis.yml

@@ -2,7 +2,7 @@
 
 language: java
 jdk:
-  - oraclejdk10
+  - oraclejdk11
 
 services:
   - docker

CHANGELOG.md

@@ -3,11 +3,34 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 
+## [7.1.2] Preview Release
+### Added
+- Added support for JDK 11 [#824](https://github.com/Microsoft/mssql-jdbc/pull/824) [#837](https://github.com/Microsoft/mssql-jdbc/pull/837) [#807](https://github.com/Microsoft/mssql-jdbc/pull/807)
+- Updated SQL keywords in DatabaseMetaData [#829](https://github.com/Microsoft/mssql-jdbc/pull/829)
+- Improvements in DatabaseMetadata to prevent Statement leaks and enhance Statement caching [#806](https://github.com/Microsoft/mssql-jdbc/pull/806)
+
+### Fixed Issues
+- Fixed slf4j warning message in tests [#841](https://github.com/Microsoft/mssql-jdbc/pull/841)
+- Fixed potential NullPointerException in logException() [#844](https://github.com/Microsoft/mssql-jdbc/pull/844)
+- Fixed intermittent failures in JUnit - LobsTest [#827](https://github.com/Microsoft/mssql-jdbc/pull/827)
+- Fixed useBulkCopyForBatchInserts API to respect Statement timeout value [#817](https://github.com/Microsoft/mssql-jdbc/pull/817)
+
+### Changed
+- Updated JUnit tests to remove hard-coded names [#809](https://github.com/Microsoft/mssql-jdbc/pull/809)
+- Removed illegal reflection access in Kerberos Authentication [#839](https://github.com/Microsoft/mssql-jdbc/pull/839)
+- Enabled non-running JUnit tests [#847](https://github.com/Microsoft/mssql-jdbc/pull/847)
+- Updated Clobs to use StandardCharsets.US_ASCII instead of hard-coded string [#855](https://github.com/Microsoft/mssql-jdbc/pull/855)
+- Code cleanup [#821](https://github.com/Microsoft/mssql-jdbc/pull/821) [#825](https://github.com/Microsoft/mssql-jdbc/pull/825)
+
 ## [7.1.1] Preview Release
+### Added
+- Added streaming capabilities for Clob.getAsciiStream() [#799](https://github.com/Microsoft/mssql-jdbc/pull/799)
+
 ### Fixed Issues
 - Fixed a bug where calling length() after obtaining a stream would close the stream for Clobs/NClobs [#799](https://github.com/Microsoft/mssql-jdbc/pull/799)
+- Fixed Clob/NClob encoding issues [#799](https://github.com/Microsoft/mssql-jdbc/pull/799)
 - Fixed issues in Bulk Copy exception handling [#801](https://github.com/Microsoft/mssql-jdbc/pull/801)
-- Fixed closeable resource leaks in Junit tests [#797](https://github.com/Microsoft/mssql-jdbc/pull/797)
+- Fixed closeable resource leaks in JUnit tests [#797](https://github.com/Microsoft/mssql-jdbc/pull/797)
 - Fixed issues with apostrophe being passed in table name [#780](https://github.com/Microsoft/mssql-jdbc/pull/780)
 - Fixed statement leaks and improved exception handling in SQLServerParameterMetadata [#780](https://github.com/Microsoft/mssql-jdbc/pull/780)
 
@@ -67,7 +90,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 ### Added
 - Added removed constructor back to AKV Provider which supports authentication with a customized method to fetch accessToken [#675](https://github.com/Microsoft/mssql-jdbc/pull/675)
 - Added support for JDK 10 for both Maven and Gradle [#691](https://github.com/Microsoft/mssql-jdbc/pull/691)
-- Added a resource bundle to handle junit error strings [#698](https://github.com/Microsoft/mssql-jdbc/pull/698)
+- Added a resource bundle to handle JUnit error strings [#698](https://github.com/Microsoft/mssql-jdbc/pull/698)
 
 ### Fixed Issues
 - Fixed the driver disposing user created credentials when using Kerberos Constrained Delegation [#636](https://github.com/Microsoft/mssql-jdbc/pull/636)
@@ -202,7 +225,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 ## [6.3.1] Preview Release
 ### Added
 - Added support for datetime/smallDatetime in TVP [#435](https://github.com/Microsoft/mssql-jdbc/pull/435)
-- Added more Junit tests for Always Encrypted [#432](https://github.com/Microsoft/mssql-jdbc/pull/432)
+- Added more JUnit tests for Always Encrypted [#432](https://github.com/Microsoft/mssql-jdbc/pull/432)
 
 ### Fixed Issues 
 - Fixed getString issue for uniqueIdentifier [#423](https://github.com/Microsoft/mssql-jdbc/pull/423)
@@ -214,7 +237,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 ## [6.3.0] Preview Release
 ### Added
 - Added support for sql_variant datatype [#387](https://github.com/Microsoft/mssql-jdbc/pull/387)
-- Added more Junit tests for Always Encrypted [#404](https://github.com/Microsoft/mssql-jdbc/pull/404)
+- Added more JUnit tests for Always Encrypted [#404](https://github.com/Microsoft/mssql-jdbc/pull/404)
 
 ### Fixed Issues 
 - Fixed Turkey locale issue when lowercasing an "i" [#384](https://github.com/Microsoft/mssql-jdbc/pull/384)
@@ -318,7 +341,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 ### Added
 - Added socket timeout exception as cause[#180](https://github.com/Microsoft/mssql-jdbc/pull/180)
 - Added Constrained delegation support[#178](https://github.com/Microsoft/mssql-jdbc/pull/178)
-- Added junit test for Statement test[#174](https://github.com/Microsoft/mssql-jdbc/pull/174)
+- Added JUnit test for Statement test[#174](https://github.com/Microsoft/mssql-jdbc/pull/174)
 - Added test for statement.cancel() when MultiSubnetFailover is set to true[#173](https://github.com/Microsoft/mssql-jdbc/pull/173)
 - Added tests for lobs [#168](https://github.com/Microsoft/mssql-jdbc/pull/168)
 - Added badges for License, Maven Central, JavaDocs & gitter chat room [#184](https://github.com/Microsoft/mssql-jdbc/pull/184)
@@ -360,7 +383,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 ### Changed
  - Switched to clean rounding for bigDecimal [#118](https://github.com/Microsoft/mssql-jdbc/pull/118)
  - Updated BVT tests to use jUnit test framework [#120](https://github.com/Microsoft/mssql-jdbc/pull/120)
- - In case of socket timeout occurance, avoid connection retry [#122](https://github.com/Microsoft/mssql-jdbc/pull/122)
+ - In case of socket timeout occurrence, avoid connection retry [#122](https://github.com/Microsoft/mssql-jdbc/pull/122)
  - Changed ant build file to skip tests [#126](https://github.com/Microsoft/mssql-jdbc/pull/126)
 
 ### Fixed Issues

README.md

@@ -36,26 +36,26 @@ What's coming next?  We will look into adding a more comprehensive set of tests,
 
 ## Build
 ### Prerequisites
-* Java 10
+* Java 11
 * [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 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://docs.microsoft.com/en-us/sql/connect/jdbc/building-the-connection-url) for your SQL Server or Azure SQL Database instance.
 
-To build the jar files, you must use Java 10 with Maven.  You can choose to build a JDBC 4.3 compliant jar file (for use with JRE 10) and/or a JDBC 4.2 compliant jar file (for use with JRE 8).
+To build the jar files, you must use Java 11 with Maven.  You can choose to build a JDBC 4.3 compliant jar file (for use with JRE 11) 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.3 compliant jar or JDBC 4.2 compliant jar in the \target directory. 
-    	* Run `mvn install -Pbuild43`. This creates JDBC 4.3 compliant jar in \target directory
-    	* Run `mvn install -Pbuild42`. This creates JDBC 4.2 compliant jar in \target directory
+	2. Run one of the commands below to build a JDBC 4.3 compliant jar or JDBC 4.2 compliant jar in the `\target` directory. 
+    	* Run `mvn install -Pbuild43`. This creates JDBC 4.3 compliant jar in `\target` directory
+    	* Run `mvn install -Pbuild42`. This creates JDBC 4.2 compliant jar in `\target` directory
 
 * 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.3 compliant jar or JDBC 4.2 compliant jar in the \build\libs directory. 
-    	* Run `gradle build -PbuildProfile=build43`. This creates JDBC 4.3 compliant jar in \build\libs directory
-    	* Run `gradle build -PbuildProfile=build42`. This creates JDBC 4.2 compliant jar in \build\libs directory
+	2. Run one of the commands below to build a JDBC 4.3 compliant jar or JDBC 4.2 compliant jar in the `\build\libs` directory. 
+    	* Run `gradle build -PbuildProfile=build43`. This creates JDBC 4.3 compliant jar in `\build\libs` directory
+    	* Run `gradle build -PbuildProfile=build42`. This creates JDBC 4.2 compliant jar in `\build\libs` directory
 
 ## Resources
 
@@ -65,7 +65,7 @@ API reference documentation is available in [Javadocs](https://aka.ms/jdbcjavado
 This driver is documented on [Microsoft's Documentation web site](https://docs.microsoft.com/en-us/sql/connect/jdbc/getting-started-with-the-jdbc-driver).
 
 ### Sample Code
-For samples, please see the src\sample directory.
+For samples, please see the `src\sample` directory.
 
 ### Download the DLLs
 For some features (e.g. Integrated Authentication and Distributed Transactions), you may need to use the `sqljdbc_xa` and `sqljdbc_auth` DLLs. They can be downloaded from the [Microsoft Download Center](https://go.microsoft.com/fwlink/?linkid=868287)
@@ -90,7 +90,7 @@ To get the latest preview version of the driver, add the following to your POM f
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>7.1.1.jre10-preview</version>
+	<version>7.1.2.jre11-preview</version>
 </dependency>
 ```
 
@@ -123,7 +123,7 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>7.1.1.jre10-preview</version>
+	<version>7.1.2.jre11-preview</version>
 	<scope>compile</scope>
 </dependency>
 
@@ -140,7 +140,7 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>7.1.1.jre10-preview</version>
+	<version>7.1.2.jre11-preview</version>
 	<scope>compile</scope>
 </dependency>
 

appveyor.yml

@@ -27,13 +27,13 @@ install:
 cache:
   - C:\Users\appveyor\.m2 -> pom.xml
 
+# Disable build and test scripts till Java 11 is supported
 build_script:
-  - keytool -importkeystore -srckeystore cert.pfx -srcstoretype pkcs12 -destkeystore clientcert.jks -deststoretype JKS -srcstorepass password -deststorepass password  
-  - keytool -list -v -keystore clientcert.jks -storepass "password" > JavaKeyStore.txt
-  - cd..
-  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild43
-  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild42
-
-test_script:
-  - mvn test -B -Pbuild43
-  - mvn test -B -Pbuild42
+ - keytool -importkeystore -srckeystore cert.pfx -srcstoretype pkcs12 -destkeystore clientcert.jks -deststoretype JKS -srcstorepass password -deststorepass password  
+ - keytool -list -v -keystore clientcert.jks -storepass "password" > JavaKeyStore.txt
+#  - cd..
+#  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild43
+#  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild42
+# test_script:
+#  - mvn test -B -Pbuild43
+#  - mvn test -B -Pbuild42

build.gradle

@@ -10,7 +10,7 @@
 
 apply plugin: 'java'
 
-version = '7.1.1'
+version = '7.1.2'
 def jreVersion = ""
 def testOutputDir = file("build/classes/java/test")
 def archivesBaseName = 'mssql-jdbc'
@@ -27,15 +27,15 @@ allprojects {
 
 if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "build43")){
 
-	jreVersion = "jre10-preview"
+	jreVersion = "jre11-preview"
 	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
 	jar {
 		manifest {
 			attributes 'Automatic-Module-Name': 'com.microsoft.sqlserver.jdbc'
 		}
 	}
-	sourceCompatibility = 10
-	targetCompatibility = 10
+	sourceCompatibility = 11
+	targetCompatibility = 11
 }
 
 if((hasProperty('buildProfile') && buildProfile == "build42")) {
@@ -82,16 +82,19 @@ repositories {
 }
 
 dependencies {
-	compileOnly 'com.microsoft.azure:azure-keyvault:1.0.0',
-	'com.microsoft.azure:adal4j:1.6.0'
-	testCompile 'org.junit.platform:junit-platform-console:1.2.0',
-	'org.junit.platform:junit-platform-commons:1.2.0',
-	'org.junit.platform:junit-platform-engine:1.2.0',
-	'org.junit.platform:junit-platform-launcher:1.2.0',
-	'org.junit.platform:junit-platform-runner:1.2.0',
-	'org.junit.platform:junit-platform-surefire-provider:1.2.0',
-	'org.junit.jupiter:junit-jupiter-api:5.2.0',
-	'org.junit.jupiter:junit-jupiter-engine:5.2.0',
+	compileOnly 'com.microsoft.azure:azure-keyvault:1.1.1',
+	'com.microsoft.azure:azure-keyvault-webkey:1.1.1',
+	'com.microsoft.rest:client-runtime:1.6.2',
+	'com.microsoft.azure:adal4j:1.6.2'
+	testCompile 'org.junit.platform:junit-platform-console:1.3.1',
+	'org.junit.platform:junit-platform-commons:1.3.1',
+	'org.junit.platform:junit-platform-engine:1.3.1',
+	'org.junit.platform:junit-platform-launcher:1.3.1',
+	'org.junit.platform:junit-platform-runner:1.3.1',
+	'org.junit.platform:junit-platform-surefire-provider:1.3.1',
+	'org.junit.jupiter:junit-jupiter-api:5.3.1',
+	'org.junit.jupiter:junit-jupiter-engine:5.3.1',
 	'com.zaxxer:HikariCP:3.2.0',
-	'org.apache.commons:commons-dbcp2:5.0'
+	'org.apache.commons:commons-dbcp2:2.5.0',
+	'org.slf4j:slf4j-nop:1.7.25'
 }