From 3851c40e09b8e82d771739c135c23977449fddab Mon Sep 17 00:00:00 2001
From: affonsoBQ <67347924+affonsoBQ@users.noreply.github.com>
Date: Fri, 16 Sep 2022 15:46:11 -0700
Subject: [PATCH] Update JDBC Version (#121)

---
 .github/workflows/linux-build.yml       | 2 +-
 .github/workflows/mac-build.yml         | 2 +-
 .github/workflows/mac-debug-build.yml   | 2 +-
 .github/workflows/win-build.yml         | 2 +-
 build_linux_debug64.sh                  | 2 +-
 build_linux_release64_deb.sh            | 2 +-
 build_mac_debug64.sh                    | 2 +-
 build_mac_release64.sh                  | 2 +-
 scripts/build_windows.ps1               | 2 +-
 src/odbc/CMakeLists.txt                 | 2 +-
 src/odbc/install/documentdb-odbc.wxs.in | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 9417a6db5..d2e7f5a92 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -27,7 +27,7 @@ env:
   DOC_DB_ODBC_INTEGRATION_TEST: 1
   DOC_DB_LOG_PATH: "${{github.workspace}}/build/odbc/logs"
   DOC_DB_LOG_LEVEL: "debug"
-  JDBC_DRIVER_VERSION: "1.3.0"
+  JDBC_DRIVER_VERSION: "1.3.1"
   JAVA_HOME: "/usr/lib/jvm/java-17-amazon-corretto/"
 
 jobs:
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index 74ae5d219..709144bfd 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -27,7 +27,7 @@ env:
   DOC_DB_ODBC_INTEGRATION_TEST: 1
   DOC_DB_LOG_PATH: "${{github.workspace}}/build/odbc/logs"
   DOC_DB_LOG_LEVEL: "debug"
-  JDBC_DRIVER_VERSION: "1.3.0"
+  JDBC_DRIVER_VERSION: "1.3.1"
   ODBCINSTINI: "${{github.workspace}}/build/odbc/lib/documentdb-odbc-install.ini"
   ODBCINI: "${{github.workspace}}/odbc.ini"
 
diff --git a/.github/workflows/mac-debug-build.yml b/.github/workflows/mac-debug-build.yml
index 218e6f03d..33b9a32fb 100644
--- a/.github/workflows/mac-debug-build.yml
+++ b/.github/workflows/mac-debug-build.yml
@@ -27,7 +27,7 @@ env:
   DOC_DB_ODBC_INTEGRATION_TEST: 1
   DOC_DB_LOG_PATH: "${{github.workspace}}/build/odbc/logs"
   DOC_DB_LOG_LEVEL: "debug"
-  JDBC_DRIVER_VERSION: "1.3.0"
+  JDBC_DRIVER_VERSION: "1.3.1"
   ODBCINSTINI: "${{github.workspace}}/build/odbc/lib/documentdb-odbc-install.ini"
   ODBCINI: "${{github.workspace}}/odbc.ini"
 
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 2dd4ac162..7940af7fe 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -29,7 +29,7 @@ env:
   DOC_DB_PRIV_KEY_FILE: ~/certs/docdb-sshtunnel.pem
   DOC_DB_LOG_PATH: "${{github.workspace}}/build/odbc/logs"
   DOC_DB_LOG_LEVEL: "debug"
-  JDBC_DRIVER_VERSION: "1.3.0"
+  JDBC_DRIVER_VERSION: "1.3.1"
   MONGO_IMPORT_COMMAND: "mongoimport.exe"
 
 jobs:
diff --git a/build_linux_debug64.sh b/build_linux_debug64.sh
index 13ab30ca1..7c1d10631 100755
--- a/build_linux_debug64.sh
+++ b/build_linux_debug64.sh
@@ -13,7 +13,7 @@ cd ..
 
 # Download the DocumentDB JDBC Driver
 if [ -z "$JDBC_DRIVER_VERSION" ]; then 
-    JDBC_DRIVER_VERSION="1.3.0"
+    JDBC_DRIVER_VERSION="1.3.1"
 fi
 JDBC_DRIVER_FILENAME="documentdb-jdbc-$JDBC_DRIVER_VERSION-all.jar"
 JDBC_DRIVER_FULLPATH="$DRIVER_BIN_DIR/libs/$JDBC_DRIVER_FILENAME"
diff --git a/build_linux_release64_deb.sh b/build_linux_release64_deb.sh
index 54aa1b8f5..c304a1e06 100755
--- a/build_linux_release64_deb.sh
+++ b/build_linux_release64_deb.sh
@@ -10,7 +10,7 @@ cd ..
 
 # Download the DocumentDB JDBC Driver
 if [ -z "$JDBC_DRIVER_VERSION" ]; then
-    JDBC_DRIVER_VERSION="1.3.0"
+    JDBC_DRIVER_VERSION="1.3.1"
 fi
 JDBC_DRIVER_FILENAME="documentdb-jdbc-$JDBC_DRIVER_VERSION-all.jar"
 JDBC_DRIVER_FULLPATH="$DRIVER_BIN_DIR/libs/$JDBC_DRIVER_FILENAME"
diff --git a/build_mac_debug64.sh b/build_mac_debug64.sh
index 5e00ef4c3..0499c77ea 100755
--- a/build_mac_debug64.sh
+++ b/build_mac_debug64.sh
@@ -13,7 +13,7 @@ cd ..
 
 # Download the DocumentDB JDBC Driver
 if [ -z "$JDBC_DRIVER_VERSION" ]; then 
-    JDBC_DRIVER_VERSION="1.3.0"
+    JDBC_DRIVER_VERSION="1.3.1"
 fi
 JDBC_DRIVER_FILENAME="documentdb-jdbc-$JDBC_DRIVER_VERSION-all.jar"
 JDBC_DRIVER_FULLPATH="$DRIVER_BIN_DIR/libs/$JDBC_DRIVER_FILENAME"
diff --git a/build_mac_release64.sh b/build_mac_release64.sh
index 525f7ab5b..5605db448 100755
--- a/build_mac_release64.sh
+++ b/build_mac_release64.sh
@@ -10,7 +10,7 @@ make -j 4
 
 # Download the DocumentDB JDBC Driver
 if [ -z "$JDBC_DRIVER_VERSION" ]; then 
-    JDBC_DRIVER_VERSION="1.3.0"
+    JDBC_DRIVER_VERSION="1.3.1"
 fi
 JDBC_DRIVER_FILENAME="documentdb-jdbc-$JDBC_DRIVER_VERSION-all.jar"
 JDBC_DRIVER_FULLPATH="$DRIVER_BIN_DIR/libs/$JDBC_DRIVER_FILENAME"
diff --git a/scripts/build_windows.ps1 b/scripts/build_windows.ps1
index 5b48e73b4..e9ec73b0b 100644
--- a/scripts/build_windows.ps1
+++ b/scripts/build_windows.ps1
@@ -20,7 +20,7 @@ $DRIVER_SOURCE_DIR = "${WORKING_DIR}\src"
 $DRIVER_BUILD_DIR = "${BUILD_DIR}\odbc\cmake"
 
 # Download the JDBC driver
-$JDBC_DRIVER_VERSION = if ($JDBC_DRIVER_VERSION -eq $null) { "1.3.0" } else { $JDBC_DRIVER_VERSION }
+$JDBC_DRIVER_VERSION = if ($JDBC_DRIVER_VERSION -eq $null) { "1.3.1" } else { $JDBC_DRIVER_VERSION }
 $JDBC_DRIVER_FILENAME = "documentdb-jdbc-$JDBC_DRIVER_VERSION-all.jar"
 $JDBC_DRIVER_FULLPATH = "$DRIVER_BUILD_DIR\$CONFIGURATION\libs\$JDBC_DRIVER_FILENAME"
 if (-not (Test-Path -Path $JDBC_DRIVER_FULLPATH -PathType Leaf)) {
diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt
index 289ef4f05..ce6720098 100644
--- a/src/odbc/CMakeLists.txt
+++ b/src/odbc/CMakeLists.txt
@@ -235,7 +235,7 @@ if (WIN32 AND ${WITH_ODBC_MSI})
         set(WIX_ODBC_ZLIB1_FILE "zlibd1.dll")
     endif()
 
-    set(WIX_ODBC_JDBC_PATH ".\\libs\\documentdb-jdbc-1.3.0-all.jar")
+    set(WIX_ODBC_JDBC_PATH ".\\libs\\documentdb-jdbc-1.3.1-all.jar")
 
     set(WIX_PROJECT_NAME "Amazon DocumentDB")
     set(WIX_MANUFACTURER "Amazon Web Services")
diff --git a/src/odbc/install/documentdb-odbc.wxs.in b/src/odbc/install/documentdb-odbc.wxs.in
index abc0d6fe9..e8f9c1905 100644
--- a/src/odbc/install/documentdb-odbc.wxs.in
+++ b/src/odbc/install/documentdb-odbc.wxs.in
@@ -64,7 +64,7 @@
                         </Component>
                         <Directory Id='JDBCDIR' Name='libs'>
                             <Component Id='JDBC' Guid='@WIX_COMPONENT_ID_JDBC@' Win64='@WIX_COMPONENT_IS_WIN64@'>
-                                <File Id='JDBC' Name='documentdb-jdbc-1.3.0-all.jar' DiskId='1' Source='@WIX_ODBC_JDBC_PATH@' KeyPath='yes'/>
+                                <File Id='JDBC' Name='documentdb-jdbc-1.3.1-all.jar' DiskId='1' Source='@WIX_ODBC_JDBC_PATH@' KeyPath='yes'/>
                             </Component>
                         </Directory>
                         <Component Id='DOCUMENTDBHOMEVAR' Guid='@WIX_COMPONENT_ID_DOCUMNETDB_HOME_ENV_VAR@' Win64='@WIX_COMPONENT_IS_WIN64@' KeyPath='yes' >