Merge remote-tracking branch 'upstream/dev' into dev

microsoft · Aug 5, 2020 · 1d0a4ad · 1d0a4ad
2 parents c67d8ed + 596d1cb
commit 1d0a4ad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@
 
 apply plugin: 'java'
 
-version = '8.4.0'
+version = '8.5.0-SNAPSHOT'
 def jreVersion = ""
 def testOutputDir = file("build/classes/java/test")
 def archivesBaseName = 'mssql-jdbc'
@@ -75,7 +75,7 @@ if(hasProperty('buildProfile') && buildProfile == "jre8") {
 	}
 }
 
-jar.archiveFileName = "${archivesBaseName}-${version}.${jreVersion}.jar"
+jar.archiveFileName = "${archivesBaseName}-${version}.${jreVersion}-preview.jar"
 jar {
 	manifest {
         attributes 'Title': "Microsoft JDBC Driver ${version} for SQL Server",

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>8.4.0</version>
+	<version>8.5.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Microsoft JDBC Driver for SQL Server</name>
@@ -57,7 +57,7 @@
 		<excludedGroups>xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth</excludedGroups>
 
 		<!-- Use -preview for preview release, leave empty for official release.-->
-		<releaseExt></releaseExt>
+		<releaseExt>-preview</releaseExt>
 
 		<!-- Driver Dependencies -->
 		<azure.keyvault.version>1.2.4</azure.keyvault.version>

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java
@@ -7,13 +7,13 @@
 
 final class SQLJdbcVersion {
     static final int major = 8;
-    static final int minor = 4;
+    static final int minor = 5;
     static final int patch = 0;
     static final int build = 0;
     /*
      * Used to load mssql-jdbc_auth DLL.
      * 1. Set to "-preview" for preview release.
      * 2. Set to "" (empty String) for official release.
      */
-    static final String releaseExt = "";
+    static final String releaseExt = "-preview";
 }