Merge pull request #693 from Microsoft/dev

Merge 6.5.2-preview into master
microsoft · May 4, 2018 · 6815b08 · 6815b08
2 parents 6f46660 + c2b4020
commit 6815b08
Show file tree

Hide file tree

Showing 49 changed files with 548 additions and 455 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 
+## [6.5.2] Preview Release
+### Added
+- Added new connection property "cancelQueryTimeout" to cancel QueryTimeout on Connection and Statement [#674](https://github.com/Microsoft/mssql-jdbc/pull/674)
+
+### Fixed Issues
+- Improved performance degradation while maintaining JDBC compliance with results from sp_fkeys [#677](https://github.com/Microsoft/mssql-jdbc/pull/677)
+- Fixed an issue where ResultSetMetaData instances created by a ResultSet that has been closed were not persisting [#685](https://github.com/Microsoft/mssql-jdbc/pull/685)
+- Fixed an issue with PreparedStatement.setBigDecimal when no scale is passed [#684](https://github.com/Microsoft/mssql-jdbc/pull/684)
+- Fixed an issue with Clobs/NClobs not persisting after ResultSet/Connection closes [#682](https://github.com/Microsoft/mssql-jdbc/pull/682)
+
+### Changed
+- Updated the samples to be usable with Eclipse directly, and updated the driver version used by the samples to 6.4.0.jre9 [#679](https://github.com/Microsoft/mssql-jdbc/pull/679)
+- Updated Gradle script for building JDBC Driver [#689](https://github.com/Microsoft/mssql-jdbc/pull/689)
+- Updated Maven dependencies for test suite [#676](https://github.com/Microsoft/mssql-jdbc/pull/676)
+- Updated multiple Maven dependency and plugin versions [#688](https://github.com/Microsoft/mssql-jdbc/pull/688)
+
 ## [6.5.1] Preview Release
 ### Added
 - Test cases for Date, Time, and Datetime2 data types. [#558](https://github.com/Microsoft/mssql-jdbc/pull/558)

diff --git a/README.md b/README.md
@@ -51,13 +51,11 @@ To build the jar files, you must use Java 9 with Maven.  You can choose to build
     	* 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
 
-**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. 
-    	* Run `gradle build -Pbuild=build41`. This creates JDBC 4.1 compliant jar in \build\libs directory
-    	* Run `gradle build -Pbuild=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
 
@@ -90,7 +88,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>6.5.1.jre9-preview</version>
+	<version>6.5.2.jre9-preview</version>
 </dependency>
 ```
 
@@ -120,14 +118,14 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.5.1.jre9-preview</version>
+	<version>6.5.2.jre9-preview</version>
 	<scope>compile</scope>
 </dependency>
 
 <dependency>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>adal4j</artifactId>
-	<version>1.4.0</version>
+	<version>1.5.0</version>
 </dependency>
 ```
 
@@ -136,14 +134,14 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.5.1.jre9-preview</version>
+	<version>6.5.2.jre9-preview</version>
 	<scope>compile</scope>
 </dependency>
 
 <dependency>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>adal4j</artifactId>
-	<version>1.4.0</version>
+	<version>1.5.0</version>
 </dependency>
 
 <dependency>

diff --git a/build.gradle b/build.gradle
@@ -1,36 +1,49 @@
+/****************************************************************
+ * Gradle Scipt for Building Microsoft JDBC Driver for SQL Server
+ ****************************************************************
+ * Instruction for Building JDBC Driver:
+ * For building jre9 version of the driver,
+ * use command 'gradle build' or 'gradle build -PbuildProfile=build43'
+ * Whereas, for building jre8 version of the driver,
+ * use command 'gradle build -PbuildProfile=build42'
+ ****************************************************************/
+
 apply plugin: 'java'
 
-archivesBaseName = 'mssql-jdbc'
-version = '6.1.6'
+version = '6.5.2'
+def jreVersion = ""
+def testOutputDir = file("build/classes/java/test")
+def archivesBaseName = 'mssql-jdbc'
+def excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
 
 allprojects {
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
     }
-
     tasks.withType(Test) {
        systemProperty "file.encoding", "UTF-8"
     }
 }
 
-def excludedFile = ''
-
-if(build == "build41") {
-	jar.archiveName = "${archivesBaseName}-${version}.jre7.jar"
+if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "build43")){
+
+	jreVersion = "jre9"
 	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
 
-	sourceCompatibility = 1.7
-	targetCompatibility = 1.7
+	sourceCompatibility = 9
+	targetCompatibility = 9
 }
 
-if(build == "build42") {
-	jar.archiveName = "${archivesBaseName}-${version}.jre8.jar"
-	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc41.java'
+if((hasProperty('buildProfile') && buildProfile == "build42")) {
+
+	jreVersion = "jre8"
+	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java'
 
 	sourceCompatibility = 1.8
 	targetCompatibility = 1.8
 }
 
+jar.archiveName = "${archivesBaseName}-${version}.${jreVersion}-preview.jar"
 jar {
 	manifest {
         attributes 'Title': "Microsoft JDBC Driver ${version} for SQL Server",
@@ -45,7 +58,6 @@ sourceSets {
             srcDirs 'src/main/java'
 			exclude excludedFile
         }
-
 		resources {
 			srcDirs "$projectDir"
 			include 'META-INF/services/java.sql.Driver'
@@ -55,7 +67,7 @@ sourceSets {
 		resources {
 			srcDirs 'src/test/resources'
 			include '**/*.csv'
-			output.resourcesDir = output.classesDir
+			output.resourcesDir = testOutputDir
 		}
 	}
 }
@@ -67,17 +79,16 @@ repositories {
 
 dependencies {
 	compile 'com.microsoft.azure:azure-keyvault:1.0.0',
-	'com.microsoft.azure:adal4j:1.1.3'
-
+	'com.microsoft.azure:adal4j:1.5.0'
 	testCompile 'junit:junit:4.12',
-	'org.junit.platform:junit-platform-console:1.0.0-M3',
-	'org.junit.platform:junit-platform-commons:1.0.0-M3',
-	'org.junit.platform:junit-platform-engine:1.0.0-M3',
-	'org.junit.platform:junit-platform-launcher:1.0.0-M3',
-	'org.junit.platform:junit-platform-runner:1.0.0-M3',
-	'org.junit.platform:junit-platform-surefire-provider:1.0.0-M3',
-	'org.junit.jupiter:junit-jupiter-api:5.0.0-M3',
-	'org.junit.jupiter:junit-jupiter-engine:5.0.0-M3',
-	'com.zaxxer:HikariCP:2.6.0',
-	'org.apache.commons:commons-dbcp2:2.1.1'
+	'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',
+	'com.zaxxer:HikariCP:3.1.0',
+	'org.apache.commons:commons-dbcp2:2.0'
 }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.5.1.${jreVersion}-preview</version>
+	<version>6.5.2.${jreVersion}-preview</version>
 	<packaging>jar</packaging>
 
 	<name>Microsoft JDBC Driver for SQL Server</name>
@@ -38,8 +38,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<junit.platform.version>1.1.0</junit.platform.version>
-		<junit.jupiter.version>5.1.0</junit.jupiter.version>
+		<junit.platform.version>1.2.0</junit.platform.version>
+		<junit.jupiter.version>5.2.0</junit.jupiter.version>
 	</properties>
 
 	<dependencies>
@@ -53,11 +53,11 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>adal4j</artifactId>
-			<version>1.4.0</version>
+			<version>1.5.0</version>
 			<optional>true</optional>
 		</dependency>
 
-		<!-- dependency for running tests -->
+		<!-- dependencies for running tests -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -116,7 +116,7 @@
 		<dependency>
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
-			<version>2.7.8</version>
+			<version>3.1.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -125,14 +125,6 @@
 			<version>2.2.0</version>
 			<scope>test</scope>
 		</dependency>
-  	<!-- 
-	<dependency>
-  		<groupId>org.junit.vintage</groupId>
-		<artifactId>junit-vintage-engine</artifactId>	
-  		<version>4.12.0-M3</version>
-  		<scope>test</scope>
-  	</dependency>	
-  	 -->
 	</dependencies>
 
 	<profiles>
@@ -275,7 +267,7 @@
            	<plugin>
            		<groupId>org.apache.felix</groupId>
        			<artifactId>maven-bundle-plugin</artifactId>
-       			<version>3.3.0</version>
+       			<version>3.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -297,7 +289,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
  				<artifactId>maven-javadoc-plugin</artifactId>
- 				<version>3.0.0-M1</version>
+ 				<version>3.0.0</version>
 
  				<configuration>
  					<failOnError>true</failOnError>
@@ -316,7 +308,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.19</version>
+				<version>2.21.0</version>
 
 				<configuration>
 					<properties>