Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AD-924] Update JDBC Version from 1.30 to 1.3.1 #121

Merged
merged 1 commit into from
Sep 16, 2022
Merged

[AD-924] Update JDBC Version from 1.30 to 1.3.1 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac-debug-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/win-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion build_linux_debug64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion build_linux_release64_deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion build_mac_debug64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion build_mac_release64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_windows.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion src/odbc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/odbc/install/documentdb-odbc.wxs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,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' >
Expand Down