From e10c6dac643e9e4f133165e4ca549f3ad5bb9c07 Mon Sep 17 00:00:00 2001
From: Wisdom Omuya <deafgoat@gmail.com>
Date: Wed, 5 Sep 2018 17:16:59 -0400
Subject: [PATCH] BUMP v1.1.0

---
 ChangeLog                                            | 4 ++++
 mongodb-odbc-driver/bin/VERSION.txt                  | 2 +-
 mongodb-odbc-driver/installer/msi/BinaryFragment.wxs | 4 ++--
 mongodb-odbc-driver/installer/msi/build-msi.ps1      | 6 +++---
 setupgui/windows/odbcdialogparams.rc                 | 4 ++--
 version.cmake                                        | 4 ++--
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 17bfc944..08567a7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+MongoDB ODBC 1.1.0
+  * Added support for SCRAM-SHA-256 authentication mechanism.
+  * Added support for Linux distributions (Ubuntu 14.04, 16.04 and RHEL 7).
+
 MongoDB ODBC 1.0.0
   Forked from MySQL ODBC 5.3.10
 
diff --git a/mongodb-odbc-driver/bin/VERSION.txt b/mongodb-odbc-driver/bin/VERSION.txt
index 3eefcb9d..9084fa2f 100644
--- a/mongodb-odbc-driver/bin/VERSION.txt
+++ b/mongodb-odbc-driver/bin/VERSION.txt
@@ -1 +1 @@
-1.0.0
+1.1.0
diff --git a/mongodb-odbc-driver/installer/msi/BinaryFragment.wxs b/mongodb-odbc-driver/installer/msi/BinaryFragment.wxs
index b32239af..b7581d3c 100644
--- a/mongodb-odbc-driver/installer/msi/BinaryFragment.wxs
+++ b/mongodb-odbc-driver/installer/msi/BinaryFragment.wxs
@@ -20,11 +20,11 @@
        </Component>
        <Component Guid="{20040826-9A0C-4783-9364-A1A74FFE6EB2}" Id="drivera" SharedDllRefCount="yes" Win64="$(var.win64Flag)">
             <File Checksum="yes" DiskId="1" Id="mdbodbca.dll"  Name="mdbodbca.dll" Source="mdbodbca.dll" KeyPath="yes" />
-            <ODBCDriver File="mdbodbca.dll" Id="MongoDB_ODBC_1.0a_Driver" Name="MongoDB ODBC 1.0 ANSI Driver" SetupFile="mdbodbcS.dll" />
+            <ODBCDriver File="mdbodbca.dll" Id="MongoDB_ODBC_1.0a_Driver" Name="MongoDB ODBC 1.1.0 ANSI Driver" SetupFile="mdbodbcS.dll" />
        </Component>
        <Component Guid="{66D2AAC0-B5D9-40DB-9797-3A52014DC526}" Id="driverw" SharedDllRefCount="yes" Win64="$(var.win64Flag)">
             <File Checksum="yes" DiskId="1" Id="mdbodbcw.dll" Name="mdbodbcw.dll" Source="mdbodbcw.dll" KeyPath="yes" />
-            <ODBCDriver File="mdbodbcw.dll" Id="MongoDB_ODBC_1.0w_Driver" Name="MongoDB ODBC 1.0 Unicode Driver" SetupFile="mdbodbcS.dll" />
+            <ODBCDriver File="mdbodbcw.dll" Id="MongoDB_ODBC_1.0w_Driver" Name="MongoDB ODBC 1.1.0 Unicode Driver" SetupFile="mdbodbcS.dll" />
        </Component>
        <Component Guid="{628199F9-7996-4D6C-8319-EDAF12120263}" Id="setuplib" SharedDllRefCount="yes" Win64="$(var.win64Flag)">
             <File DiskId="1" Id="mdbodbcS.lib" Name="mdbodbcS.lib" Source="mdbodbcS.lib" />
diff --git a/mongodb-odbc-driver/installer/msi/build-msi.ps1 b/mongodb-odbc-driver/installer/msi/build-msi.ps1
index f2a3d45d..bb224a4c 100644
--- a/mongodb-odbc-driver/installer/msi/build-msi.ps1
+++ b/mongodb-odbc-driver/installer/msi/build-msi.ps1
@@ -31,7 +31,7 @@ $version = $matches[1]
 # rev the minor version (1.0 -> 1.1). That way, we
 # will allow multiple minor versions to be installed
 # side-by-side.
-if ([double]$version -gt 1.0) {
+if ([double]$version -gt 1.1) {
     throw "You must change the upgrade code for a minor revision.
 Once that is done, change the version number above to
 account for the next revision that will require being
@@ -39,9 +39,9 @@ upgradeable. Make sure to change both x64 and x86 upgradeCode"
 }
 
 if ($Arch -eq "x64") {
-    $upgradeCode = "36ff9c14-c22c-4b8a-a998-eefb68e176ec"
+    $upgradeCode = "11f63272-b2a0-4b84-a280-e90c415c0bfa"
 } else {
-    $upgradeCode = "635a11fe-328a-4f94-ba31-a9116fbfda36"
+    $upgradeCode = "b3e15e1b-b36b-4f5e-bf2a-e85d2e00d3c1"
 }
 
 
diff --git a/setupgui/windows/odbcdialogparams.rc b/setupgui/windows/odbcdialogparams.rc
index 48d1c84b..783abbdd 100644
--- a/setupgui/windows/odbcdialogparams.rc
+++ b/setupgui/windows/odbcdialogparams.rc
@@ -58,14 +58,14 @@ BEGIN
         BEGIN
             VALUE "Comments", "provides setup library functionality\0"
             VALUE "CompanyName", "MongoDB Inc.\0"
-            VALUE "FileDescription", "MongoDB ODBC 1.0 Driver Setup Library\0"
+            VALUE "FileDescription", "MongoDB ODBC 1.1.0 Driver Setup Library\0"
             VALUE "FileVersion", MYODBC_STRFILEVER
             VALUE "InternalName", "mdbodbcS\0"
 	    VALUE "LegalCopyright", "Copyright (c) 1995, 2013, Oracle and/or its affiliates, Copyright (c) 2018-Present MongoDB Inc.\0"
             VALUE "LegalTrademarks", "MongoDB is a trademark of MongoDB Inc.\0"
             VALUE "OriginalFilename", "mdbodbcS.dll\0"
             VALUE "PrivateBuild", "Production\0"
-            VALUE "ProductName", "MongoDB ODBC 1.0\0"
+            VALUE "ProductName", "MongoDB ODBC 1.1.0\0"
             VALUE "ProductVersion", MYODBC_STRPRODUCTVER
             VALUE "SpecialBuild", "GA release\0"
         END
diff --git a/version.cmake b/version.cmake
index 71656a51..c8277538 100644
--- a/version.cmake
+++ b/version.cmake
@@ -23,10 +23,10 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 SET(CONNECTOR_MAJOR "1")
-SET(CONNECTOR_MINOR "0")
+SET(CONNECTOR_MINOR "1")
 SET(CONNECTOR_PATCH "0")
 SET(CONNECTOR_LEVEL "")
-SET(CONNECTOR_QUALITY "RC")
+SET(CONNECTOR_QUALITY "GA")
 
 # ----------------------------------------------------------------------
 # Set other variables that are about the version