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.
microsoft · Aug 30, 2018 · 0a1759f · 0a1759f
1 parent 5ac69d9
commit 0a1759f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git 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
@@ -6,7 +6,7 @@
 
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>7.1.0</version>
+	<version>7.1.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Microsoft JDBC Driver for SQL Server</name>

diff --git 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
@@ -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
@@ -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"));
     }
 
     /**