From 0a1759f7b95ab38f45dbefec370e0eadf4776e9d Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Thu, 30 Aug 2018 11:29:29 -0700 Subject: [PATCH] Update driver patch for next release (#795) * Update driver patch for next release. * Modify test to always check for equal Driver version and Build versions. --- build.gradle | 2 +- pom.xml | 2 +- .../java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java | 2 +- .../java/com/microsoft/sqlserver/jdbc/TestResource.java | 3 +-- .../jdbc/databasemetadata/DatabaseMetaDataTest.java | 7 +------ 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 6c4011116..6109f6b97 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ apply plugin: 'java' -version = '7.1.0' +version = '7.1.1-SNAPSHOT' def jreVersion = "" def testOutputDir = file("build/classes/java/test") def archivesBaseName = 'mssql-jdbc' diff --git a/pom.xml b/pom.xml index 10f016db5..72a59bc10 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.microsoft.sqlserver mssql-jdbc - 7.1.0 + 7.1.1-SNAPSHOT jar Microsoft JDBC Driver for SQL Server diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java index 09074842c..3aa3f9791 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java @@ -8,6 +8,6 @@ final class SQLJdbcVersion { static final int major = 7; static final int minor = 1; - static final int patch = 0; + static final int patch = 1; static final int build = 0; } diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java b/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java index 691371b63..a3b875798 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java @@ -106,8 +106,7 @@ protected Object[][] getContents() { "The database name component of the object qualifier must be the name of the current database."}, {"R_numKeysIncorrect", "number of foreign key entries is incorrect."}, {"R_manifestNotFound", "Manifest file does not exist on classpath so ignoring test"}, - {"R_buildVersionError", - "build version should be greater than driver versions for non SNAPSHOT versions, and same for SNAPSHOT versions"}, + {"R_buildVersionError", "Build version should always be same as driver version."}, {"R_getURLContainsPwd", "Get URL should not have password attribute / property."}, {"R_userNameNull", "Username should not be null"}, {"R_userNameNotMatch", "Username does not match UserName from Connection String."}, diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java index 95f0c2799..91543fe33 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java @@ -103,12 +103,7 @@ public void testDriverVersion() throws SQLException, IOException { int intBuildVersion = Integer.valueOf(buildVersion); int intDriverVersion = Integer.valueOf(driverVersion); - if (isSnapshot) { - assertTrue(intDriverVersion < intBuildVersion, TestResource.getResource("R_buildVersionError")); - } else { - assertTrue(intDriverVersion == intBuildVersion, TestResource.getResource("R_buildVersionError")); - } - + assertTrue(intDriverVersion == intBuildVersion, TestResource.getResource("R_buildVersionError")); } /**