Merge pull request #113 from Microsoft/dev

For Release 6.1.2

.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 language: java
 jdk:
   - oraclejdk8
-  
+
 services:
   - docker
 
@@ -21,4 +21,4 @@ before_script:
 script: 
   - docker ps -a
   - mvn test -B -Pbuild41
-  - mvn test -B -Pbuild42
+  - mvn test -B -Pbuild42

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.2]
+### Added
+ - Socket timeout implementation for both connection string and data source [#85](https://github.com/Microsoft/mssql-jdbc/pull/85)
+ - Query timeout API for datasource [#88](https://github.com/Microsoft/mssql-jdbc/pull/88)
+ - Added connection tests [#95](https://github.com/Microsoft/mssql-jdbc/pull/95)
+ - Added Support for FIPS enabled JVM [#97](https://github.com/Microsoft/mssql-jdbc/pull/97)
+ - Added additional tests for bulk copy [#110] (https://github.com/Microsoft/mssql-jdbc/pull/110)
+
+### Changed
+ - Remove redundant type casts [#63](https://github.com/Microsoft/mssql-jdbc/pull/63) 
+ - Read SQL Server error message if status flag has DONE_ERROR set [#73](https://github.com/Microsoft/mssql-jdbc/pull/73)
+ - Fix a bug when the value of queryTimeout is bigger than the max value of integer [#78](https://github.com/Microsoft/mssql-jdbc/pull/78) 
+ - Add new dependencies to gradle build script [#81](https://github.com/Microsoft/mssql-jdbc/pull/81)
+ - Updates to test framework [#90](https://github.com/Microsoft/mssql-jdbc/pull/90)
+
+### Fixed Issues
+ - Set the jre8 version as default [#59](https://github.com/Microsoft/mssql-jdbc/issues/59) 
+ - Fixed exception SQL Server instance in use does not support column encryption [#65](https://github.com/Microsoft/mssql-jdbc/issues/65) 
+ - TVP Handling is causing exception when calling SP with return value [#80](https://github.com/Microsoft/mssql-jdbc/issues/80) 
+ - BigDecimal in TVP can incorrectly cause SQLServerException related to invalid precision or scale [#86](https://github.com/Microsoft/mssql-jdbc/issues/86) 
+ - Fixed the connection close issue on using variant type [#91] (https://github.com/Microsoft/mssql-jdbc/issues/91)
+
+
 ## [6.1.1]
 ### Added
 - Java Docs [#46](https://github.com/Microsoft/mssql-jdbc/pull/46)
@@ -29,6 +52,3 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 ## [6.1.0]
 ### Changed
 - Open Sourced.
-
-
-

README.md

@@ -8,6 +8,15 @@ We hope you enjoy using the Microsoft JDBC Driver for SQL Server.
 
 SQL Server Team
 
+## Status of Most Recent Builds
+| AppVeyor (Windows)       | Travis CI (Linux) |
+|--------------------------|--------------------------|
+| [![av-image][]][av-site] | [![tv-image][]][tv-site] |
+
+[av-image]: https://ci.appveyor.com/api/projects/status/o6fjg16678ol64d3?svg=true "Windows"
+[av-site]: https://ci.appveyor.com/project/Microsoft-JDBC/mssql-jdbc
+[tv-image]: https://travis-ci.org/Microsoft/mssql-jdbc.svg? "Linux"
+[tv-site]: https://travis-ci.org/Microsoft/mssql-jdbc
 
 ## Announcements
 What's coming next?  We will look into adding a more comprehensive set of tests, improving our javadocs, and start developing the next set of features.
@@ -48,16 +57,6 @@ To build the jar files, you must use Java 8 with either Ant (with Ivy), Maven or
     	* 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
 
-### Status of Most Recent Builds
-| AppVeyor (Windows)       | Travis CI (Linux) |
-|--------------------------|--------------------------|
-| [![av-image][]][av-site] | [![tv-image][]][tv-site] |
-
-[av-image]: https://ci.appveyor.com/api/projects/status/o6fjg16678ol64d3?svg=true
-[av-site]: https://ci.appveyor.com/project/Microsoft-JDBC/mssql-jdbc
-[tv-image]: https://travis-ci.org/Microsoft/mssql-jdbc.svg?
-[tv-site]: https://travis-ci.org/Microsoft/mssql-jdbc
-
 ## Resources
 
 ### Documentation

build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 archivesBaseName = 'mssql-jdbc'
-version = '6.1.1'
+version = '6.1.2'
 
 allprojects {
     tasks.withType(JavaCompile) {
@@ -59,8 +59,17 @@ repositories {
 }
 
 dependencies {
-	compile 'com.microsoft.azure:azure-keyvault:0.9.7',
-	'junit:junit:4.12'
+	compile 'com.microsoft.azure:azure-keyvault:0.9.7'
+
+	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'
 }
 
 

build.xml

@@ -4,17 +4,26 @@
   </description>
   <!-- set global properties for this build -->
   <property name="artifactId" value="mssql-jdbc"/>
-  <property name="version" value="6.1.1"/>
+  <property name="version" value="6.1.2"/>
 
   <property name="src" location="src/main/java"/>
   <property name="build" location="build"/>
-  <property name="test" location="src/test/java"/>
+  <property name="bvtTest" location="src/test/java/com/microsoft/sqlserver/jdbc/bvt/"/>
   <property name="bvtTest_Classes" location="${build}/classes/test/bvt"/>
 
 	<!-- download dependencies -->	
 	<ivy:resolve>
 		<dependency org="com.microsoft.azure" name="azure-keyvault" rev="0.9.7"/>
 		<dependency org="junit" name="junit" rev="4.12"/>
+		<dependency org="org.junit.platform" name="junit-platform-console" rev="1.0.0-M3"/>
+		<dependency org="org.junit.platform" name="junit-platform-commons" rev="1.0.0-M3"/>
+		<dependency org="org.junit.platform" name="junit-platform-engine" rev="1.0.0-M3"/>
+		<dependency org="org.junit.platform" name="junit-platform-launcher" rev="1.0.0-M3"/>
+		<dependency org="org.junit.platform" name="junit-platform-runner" rev="1.0.0-M3"/>
+		<dependency org="org.junit.platform" name="junit-platform-surefire-provider" rev="1.0.0-M3"/>
+		<dependency org="org.junit.jupiter" name="junit-jupiter-api" rev="5.0.0-M3"/>
+		<dependency org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.0.0-M3"/>
+
 	</ivy:resolve>
 
 	<!-- retrieves all the dependencies of the resolve call to lib directory -->
@@ -96,7 +105,7 @@
 
    <target name="compile_test"
 		description="compile the junit source">
-			<javac  classpathref="${JDBC_VERSION}" srcdir="${test}" 
+			<javac  classpathref="${JDBC_VERSION}" srcdir="${bvtTest}" 
 				destdir="${bvtTest_Classes}" 
 				encoding="UTF-8" 
 				source="${JAVA_VERSION}" 
@@ -110,10 +119,10 @@
 			<param name="JAVA_VERSION" value="1.7"/>
 			<param name="JDBC_VERSION" value="test_classpath41"/>
 		</antcall>
-		<junit haltonfailure="true" printsummary="true" showoutput="true">
+		<junit haltonfailure="true" printsummary="true" showoutput="true" fork="true">
 			<formatter type="plain" usefile="false" />
 			<classpath><path refid="test_classpath41" /></classpath>
-			<test name="bvtTest"></test>
+			<test name="com.microsoft.sqlserver.jdbc.bvt.bvtTest"></test>
 		</junit>
 	</target>
 
@@ -122,10 +131,10 @@
 			<param name="JAVA_VERSION" value="1.8"/>
 			<param name="JDBC_VERSION" value="test_classpath42"/>
 		</antcall>
-		<junit haltonfailure="true" printsummary="true" showoutput="true">
+		<junit haltonfailure="true" printsummary="true" showoutput="true" fork="true">
 			<formatter type="plain" usefile="false" />
 			<classpath><path refid="test_classpath42" /></classpath>
-			<test name="bvtTest"></test>
+			<test name="com.microsoft.sqlserver.jdbc.bvt.bvtTest"></test>
 		</junit>
 	</target>
 

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.1.1</version>
+	<version>6.1.2</version>
 
 	<packaging>jar</packaging>
 
@@ -58,7 +58,63 @@
 			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
-
+
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-console</artifactId>
+			<version>1.0.0-M3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-commons</artifactId>
+			<version>1.0.0-M3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-engine</artifactId>
+			<version>1.0.0-M3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-launcher</artifactId>
+			<version>1.0.0-M3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-runner</artifactId>
+			<version>1.0.0-M3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-surefire-provider</artifactId>
+			<version>1.0.0-M3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>5.0.0-M3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>5.0.0-M3</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>
@@ -93,9 +149,12 @@
 				</plugins>
 			</build>
 		</profile>
-		
+
 		<profile>
 			<id>build42</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<build>
 				<plugins>
 					<plugin>
@@ -106,41 +165,41 @@
 								<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc41.java</exclude>
 							</excludes>
 							<source>1.8</source>
-							<target>1.8</target> 
+							<target>1.8</target>
 						</configuration>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-jar-plugin</artifactId>
 						<version>3.0.2</version>
 						<configuration>
-							<finalName>${project.artifactId}-${project.version}.jre8</finalName>   	
+							<finalName>${project.artifactId}-${project.version}.jre8</finalName>
 							<archive>
 								<manifest>
 									<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 								</manifest>
 							</archive>
 						</configuration>
-					</plugin>   
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
-		
+
 	</profiles>
 
 	<build>
 
 		<resources>
 			<resource>
-				<directory>${basedir}</directory> 
+				<directory>${basedir}</directory>
 				<includes>
 					<include>META-INF/services/java.sql.Driver</include>
 				</includes>
 			</resource>
 		</resources>
-		
+
 		<plugins>
-			
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>

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

@@ -706,15 +706,15 @@ else if (StreamType.CHARACTER == getterArgs.streamType ||
 
 	// Returns date portion of string.
 	// Expects one of "<date>" or "<date><space><time>".
-	private static final String getDatePart(String s)
+	private static String getDatePart(String s)
 	{
 		int sp = s.indexOf(' ');
 		if (-1 == sp) return s;
 		return s.substring(0,sp);
 	}
 	// Returns time portion of string.
 	// Expects one of "<time>" or "<date><space><time>".
-	private static final String getTimePart(String s)
+	private static String getTimePart(String s)
 	{
 		int sp = s.indexOf(' ');
 		if (-1 == sp) return s;