Merge dev to master post v7.1.0 release #792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

cheenamalhotra wants to merge 35 commits into master from dev

CHANGELOG.md

-Original file line number
+Diff line change
@@ Expand Up @@
     The format is based on [Keep a Changelog](http://keepachangelog.com/)
+    ## [7.1.0] Preview Release
+    ### Added
+    - Added support for LocalDate, LocalTime and LocalDateTime to be passed as 'type' in ResultSet.getObject() [#749](https://github.com/Microsoft/mssql-jdbc/pull/749)
+    - Added support to read SQL Warnings after ResultSet is read completely [#785](https://github.com/Microsoft/mssql-jdbc/pull/785)
+    ### Fixed Issues
+    - Fixed Javadoc warnings and removed obselete HTML tags from Javadocs [#786](https://github.com/Microsoft/mssql-jdbc/pull/786)
+    - Fixed random JUnit failures in framework tests [#762](https://github.com/Microsoft/mssql-jdbc/pull/762)
+    ### Changed
+    - Improved performance of readLong() function by unrolling loop and using bitwise operators instead of additions [#763](https://github.com/Microsoft/mssql-jdbc/pull/763)
+    - Removed logging logic which caused performance degradation in AE [#773](https://github.com/Microsoft/mssql-jdbc/pull/773)
+    ## [7.0.0] Stable Release
+    ### Added
+    - Added 'Automatic-Module-Name' manifest entry to jre10 Jar, allowing JDK 10 users to access driver module 'com.microsoft.sqlserver.jdbc' [#732](https://github.com/Microsoft/mssql-jdbc/pull/732)
+    - Added setUseBulkCopyForBatchInsert() to request boundary declaration APIs [#739](https://github.com/Microsoft/mssql-jdbc/pull/739)
+    - Added new test for validation of supported public APIs in request boundary declaration APIs [#746](https://github.com/Microsoft/mssql-jdbc/pull/746)
+    ### Fixed Issues
+    - Fixed policheck issue with 'Country' keyword [#745](https://github.com/Microsoft/mssql-jdbc/pull/745)
+    - Fixed issues reported by static analysis tools (SonarQube, Fortify) [#747](https://github.com/Microsoft/mssql-jdbc/pull/747)
+    ### Changed
+    - Reformatted code and updated mssql-jdbc-formatter [#742](https://github.com/Microsoft/mssql-jdbc/pull/742)
+    - Changed Sha1HashKey to CityHash128Key for generating PreparedStatement handle and metadata cache keys [#717](https://github.com/Microsoft/mssql-jdbc/pull/717)
+    - Changed order of logic for checking the condition for using Bulk Copy API [#736](https://github.com/Microsoft/mssql-jdbc/pull/736)
+    - Changed collation name in UTF8SupportTest [#741](https://github.com/Microsoft/mssql-jdbc/pull/741)
+    - Changed scope of unwanted Public APIs [#757](https://github.com/Microsoft/mssql-jdbc/pull/757)
+    - Changed behavior of Bulk Copy API for batch inserts to disallow non-parameterized queries [#756](https://github.com/Microsoft/mssql-jdbc/pull/756)
+    - Changed APIs and JavaDocs for Spatial Datatypes [#752](https://github.com/Microsoft/mssql-jdbc/pull/752)
+    - Improved Javadoc comments in driver [#754](https://github.com/Microsoft/mssql-jdbc/pull/754), [#760](https://github.com/Microsoft/mssql-jdbc/pull/760)
     ## [6.5.4] Preview Release
     ### Added
     - Added new connection property "useBulkCopyForBatchInsert" to enable Bulk Copy API support for batch insert operation [#686](https://github.com/Microsoft/mssql-jdbc/pull/686)
@@ Expand Down @@

LICENSE

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,4 +1,4 @@
  
    ﻿Copyright(c) 2017 Microsoft Corporation

    ﻿Copyright(c) 2018 Microsoft Corporation

    All rights reserved.

    MIT License

    @@ -9,6 +9,6 @@ and / or sell copies of the Software, and to permit persons to whom the Software
  
    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

    THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 

    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 

    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 

    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 

    IN THE SOFTWARE.
      
    IN THE SOFTWARE.

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -78,7 +78,7 @@ We're now on the Maven Central Repository. Add the following to your POM file to
  
    <dependency>

    	<groupId>com.microsoft.sqlserver</groupId>

    	<artifactId>mssql-jdbc</artifactId>

    	<version>6.4.0.jre9</version>

    	<version>7.0.0.jre10</version>

    </dependency>

    ```

    The driver can be downloaded from the [Microsoft Download Center](https://go.microsoft.com/fwlink/?linkid=868287).

    @@ -88,10 +88,11 @@ 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.4.jre10-preview</version>

    	<version>7.1.0.jre10-preview</version>

    </dependency>

    ```

    ### Using driver as Java Module

    Starting from version 7.0.0, the driver Jars (jre10 and above) will expose 'Automatic-Module' as **'com.microsoft.sqlserver.jdbc'**. The supporting Jar can now be added to ModulePath to access this module.

    ## Dependencies

    @@ -118,7 +119,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>6.5.4.jre10-preview</version>

    	<version>7.1.0.jre10-preview</version>

    	<scope>compile</scope>

    </dependency>

    @@ -134,7 +135,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>6.5.4.jre10-preview</version>

    	<version>7.1.0.jre10-preview</version>

    	<scope>compile</scope>

    </dependency>

    @@ -182,7 +183,7 @@ Preview releases happen approximately monthly between stable releases. This give
  
    You can see what is going into a future release by monitoring [Milestones](https://github.com/Microsoft/mssql-jdbc/milestones) in the repository.

    ### Versioning convention

    Starting with 6.0, stable versions have an even minor version. For example, 6.0, 6.2, 6.4. Preview versions have an odd minor version. For example, 6.1, 6.3, 6.5.

    Starting with 6.0, stable versions have an even minor version. For example, 6.0, 6.2, 6.4, 7.0. Preview versions have an odd minor version. For example, 6.1, 6.3, 6.5, 7.1.

    ## Contributors 

    Special thanks to everyone who has contributed to the project.

build.gradle

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -10,7 +10,7 @@
  
    apply plugin: 'java'

    version = '6.5.4'

    version = '7.1.0'

    def jreVersion = ""

    def testOutputDir = file("build/classes/java/test")

    def archivesBaseName = 'mssql-jdbc'

    @@ -27,23 +27,27 @@ allprojects {
  
    if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "build43")){

    	jreVersion = "jre10"

    	jreVersion = "jre10-preview"

    	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'

    	jar {

    		manifest {

    			attributes 'Automatic-Module-Name': 'com.microsoft.sqlserver.jdbc'

    		}

    	}

    	sourceCompatibility = 10

    	targetCompatibility = 10

    }

    if((hasProperty('buildProfile') && buildProfile == "build42")) {

    	jreVersion = "jre8"

    	jreVersion = "jre8-preview"

    	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java'

    	sourceCompatibility = 1.8

    	targetCompatibility = 1.8

    }

    jar.archiveName = "${archivesBaseName}-${version}.${jreVersion}-preview.jar"

    jar.archiveName = "${archivesBaseName}-${version}.${jreVersion}.jar"

    jar {

    	manifest {

            attributes 'Title': "Microsoft JDBC Driver ${version} for SQL Server",

    @@ -78,17 +82,16 @@ repositories {
  
    }

    dependencies {

    	compile 'com.microsoft.azure:azure-keyvault:1.0.0',

    	compileOnly 'com.microsoft.azure:azure-keyvault:1.0.0',

    	'com.microsoft.azure:adal4j:1.6.0'

    	testCompile 'junit:junit:4.12',

    	'org.junit.platform:junit-platform-console:1.2.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',

    	'com.zaxxer:HikariCP:3.1.0',

    	'org.apache.commons:commons-dbcp2:2.0'

    }
      
    	'com.zaxxer:HikariCP:3.2.0',

    	'org.apache.commons:commons-dbcp2:5.0'

    }

issue_template.md

-Original file line number
+Diff line change
@@ -1,23 +1,27 @@
-    ## Driver version or jar name
-    Please tell us what the JDBC driver version or jar name is.
-    ## SQL Server version
-    Please tell us what the SQL Server version is.
-    ## Client operating system
-    Please tell us what oprating system the client program is running on.
-    ## Java/JVM version
-    Example: java version "1.8.0", IBM J9 VM
-    ## Table schema
-    Please tell us the table schema
-    ## Problem description
-    Please share more details with us.
-    ## Expected behavior and actual behavior
-    Please tell us what should happen and what happened instead
-    ## Repro code
-    Please share repro code with us, or tell us how to reproduce the issue.
+    ## Driver version
+    <!--- Provide the JDBC driver version (e.g. 7.0.0). -->
+    ## SQL Server version
+    <!--- Provide the output of executing `SELECT @@VERSION` on your target SQL Server. -->
+    ## Client Operating System
+    <!--- Provide the Operating System the client application is running on. -->
+    ## JAVA/JVM version
+    <!--- Provide the JAVA/JVM version (e.g. java version "1.8.0", IBM J9 VM). -->
+    ## Table schema
+    <!--- Provide the table schema. -->
+    ## Problem description
+    <!--- Provide full details of the problem. -->
+. Expected behaviour:
+. Actual behaviour:
+. Error message/stack trace:
+. Any other details that can be helpful:
+    ## JDBC trace logs
+    <!--- Provide the JDBC trace logs. Instructions can be found here: https://docs.microsoft.com/en-us/sql/connect/jdbc/tracing-driver-operation?view=sql-server-2017 -->
+    ## Reproduction code
+    <!--- Provide standalone JAVA code that reproduces the issue, preferably raw JDBC code. -->

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge dev to master post v7.1.0 release #792

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!