[AD-915] Auto Installer - JVM included

.github/workflows/linux-build.yml

@@ -27,7 +27,6 @@ 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.1"
   JAVA_HOME: "/usr/lib/jvm/java-17-amazon-corretto/"
 
 jobs:
@@ -71,6 +70,11 @@ jobs:
         sudo apt update
         sudo apt install libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev libpulse-dev linux-headers-$(uname -r) gcc gcc-multilib  g++ g++-multilib linux-headers-$(uname -r) build-essential valgrind libboost-all-dev libbson-dev libsasl2-dev lcov
 
+    - name: Update environment with JDBC_DRIVER_VERSION
+      run: |
+        read -r JDBC_DRIVER_VERSION < ./src/JDBC_DRIVER_VERSION.txt
+        echo "JDBC_DRIVER_VERSION=$JDBC_DRIVER_VERSION" >> $GITHUB_ENV
+
     - name: Cache DocumentDB JDBC JAR
       id: cache-documentdb-jdbc-jar
       uses: actions/cache@v3
@@ -214,6 +218,11 @@ jobs:
         sudo apt update
         sudo apt install libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev libpulse-dev linux-headers-$(uname -r) gcc gcc-multilib  g++ g++-multilib linux-headers-$(uname -r) build-essential valgrind libboost-all-dev libbson-dev libsasl2-dev lcov
 
+    - name: Update environment with JDBC_DRIVER_VERSION
+      run: |
+        read -r JDBC_DRIVER_VERSION < ./src/JDBC_DRIVER_VERSION.txt
+        echo "JDBC_DRIVER_VERSION=$JDBC_DRIVER_VERSION" >> $GITHUB_ENV
+
     - name: Cache DocumentDB JDBC JAR
       id: cache-documentdb-jdbc-jar
       uses: actions/cache@v3

.github/workflows/mac-build.yml

@@ -27,7 +27,6 @@ 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.1"
   ODBCINSTINI: "${{github.workspace}}/build/odbc/lib/documentdb-odbc-install.ini"
   ODBCINI: "${{github.workspace}}/odbc.ini"
 
@@ -64,6 +63,11 @@ jobs:
         chmod +x scripts/install_dependencies_mac.sh
         ./scripts/install_dependencies_mac.sh
 
+    - name: Update environment with JDBC_DRIVER_VERSION
+      run: |
+        read -r JDBC_DRIVER_VERSION < ./src/JDBC_DRIVER_VERSION.txt
+        echo "JDBC_DRIVER_VERSION=$JDBC_DRIVER_VERSION" >> $GITHUB_ENV
+
     - name: Cache DocumentDB JDBC JAR
       id: cache-documentdb-jdbc-jar
       uses: actions/cache@v3

.github/workflows/mac-debug-build.yml

@@ -27,7 +27,6 @@ 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.1"
   ODBCINSTINI: "${{github.workspace}}/build/odbc/lib/documentdb-odbc-install.ini"
   ODBCINI: "${{github.workspace}}/odbc.ini"
 
@@ -71,6 +70,11 @@ jobs:
         echo "/Library/Developer/CommandLineTools/usr/bin" >> $GITHUB_PATH
         echo "/usr/local/bin/" >> $GITHUB_PATH
 
+    - name: Update environment with JDBC_DRIVER_VERSION
+      run: |
+        read -r JDBC_DRIVER_VERSION < ./src/JDBC_DRIVER_VERSION.txt
+        echo "JDBC_DRIVER_VERSION=$JDBC_DRIVER_VERSION" >> $GITHUB_ENV
+
     - name: Cache DocumentDB JDBC JAR
       id: cache-documentdb-jdbc-jar
       uses: actions/cache@v3

.github/workflows/win-build.yml

@@ -29,10 +29,9 @@ 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.1"
   MONGO_IMPORT_COMMAND: "mongoimport.exe"
   # Artifacts are created when pushing to develop branch on merge of pull requests.
-  SHOULD_CREATE_ARTIFACTS: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
+  SHOULD_CREATE_ARTIFACTS: "true" #${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
 
 jobs:
   build-windows32:
@@ -61,16 +60,36 @@ jobs:
       run: |
         Get-Content ./src/ODBC_DRIVER_VERSION.txt | ForEach-Object { echo "ODBC_DRIVER_VERSION=$_"; break; } >> $env:GITHUB_ENV
 
-    - name: Get Java distribution
+    - name: Update environment with JDBC_DRIVER_VERSION
+      shell: pwsh
+      run: |
+        Get-Content ./src/JDBC_DRIVER_VERSION.txt | ForEach-Object { echo "JDBC_DRIVER_VERSION=$_"; break; } >> $env:GITHUB_ENV
+
+    # Get first JDK to provide access to jpackage
+    - name: Get Java distribution (JDK 17, 32-bit)
       uses: actions/setup-java@v2
       with:
         distribution: 'temurin'
         java-version: '17'
         architecture: x86
 
+    # Get first JDK to provide access to jlink
+    - name: Get Java distribution (JDK 11, 32-bit)
+      shell: pwsh
+      run: |
+        . ./scripts/functions_win.ps1
+        Install-JavaJdk -InstallParentPath "jdks" -PlatformArchitecture "x86" -JdkVersion "11"
+        echo "JAVA_HOME=$env:JAVA_HOME" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
     - name: "Update path for Java"
       run: |
-        echo "${{ env.JAVA_HOME }}\bin\server" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        echo "${{env.JAVA_HOME}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        echo "${{env.JAVA_HOME}}\bin\server" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+    - name: Ensure jlink and jpackage have the expected versions
+      run: |
+        if ( -not ((jlink --version) -like "11*") ) { exit 1 }
+        if ( -not ((jpackage --version) -like "17*") ) { exit 1 }
 
     - name: "Update path for WIX Toolset"
       run: |
@@ -134,7 +153,14 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: docdb-odbc-driver-win32-${{env.ODBC_DRIVER_VERSION}}
-        path: build/odbc/cmake/Release
+        path: |
+          build/odbc/cmake/Release/*.dll
+          build/odbc/cmake/Release/*.msi
+          build/odbc/cmake/Release/*.exe
+          build/odbc/cmake/Release/*.pdb
+          !build/odbc/cmake/Release/images
+          !build/odbc/cmake/Release/jpackage-resources
+          !build/odbc/cmake/Release/runtime-image
 
     - name: Upload performance test at push to develop
       if: ${{env.SHOULD_CREATE_ARTIFACTS == 'true'}}
@@ -229,15 +255,21 @@ jobs:
       run: |
         Get-Content ./src/ODBC_DRIVER_VERSION.txt | ForEach-Object { echo "ODBC_DRIVER_VERSION=$_"; break; } >> $env:GITHUB_ENV
 
+    - name: Update environment with JDBC_DRIVER_VERSION
+      shell: pwsh
+      run: |
+        Get-Content ./src/JDBC_DRIVER_VERSION.txt | ForEach-Object { echo "JDBC_DRIVER_VERSION=$_"; break; } >> $env:GITHUB_ENV
+
     - name: Get Java distribution
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-        architecture: x64
+      shell: pwsh
+      run: |
+        . ./scripts/functions_win.ps1
+        Install-JavaJdk -InstallParentPath "jdks" -PlatformArchitecture "x64"
+        echo "JAVA_HOME=$env:JAVA_HOME" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
     - name: "Update path for Java"
       run: |
+        echo "${{env.JAVA_HOME}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "${{env.JAVA_HOME}}\bin\server" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
     - name: "Update path for WIX Toolset"
@@ -301,7 +333,14 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: docdb-odbc-driver-amd64-${{env.ODBC_DRIVER_VERSION}}
-        path: build/odbc/cmake/Release
+        path: |
+          build/odbc/cmake/Release/*.dll
+          build/odbc/cmake/Release/*.msi
+          build/odbc/cmake/Release/*.exe
+          build/odbc/cmake/Release/*.pdb
+          !build/odbc/cmake/Release/images
+          !build/odbc/cmake/Release/jpackage-resources
+          !build/odbc/cmake/Release/runtime-image
 
     - name: Upload performance test at push to develop
       if: ${{env.SHOULD_CREATE_ARTIFACTS == 'true'}}
@@ -367,15 +406,28 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Update environment with JDBC_DRIVER_VERSION
+      shell: pwsh
+      run: |
+        Get-Content ./src/JDBC_DRIVER_VERSION.txt | ForEach-Object { echo "JDBC_DRIVER_VERSION=$_"; break; } >> $env:GITHUB_ENV
+
+    #- name: Get Java distribution
+    #  uses: actions/setup-java@v2
+    #  with:
+    #    distribution: 'temurin'
+    #    java-version: '17'
+    #    architecture: x64
+
     - name: Get Java distribution
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-        architecture: x64
+      shell: pwsh
+      run: |
+        . ./scripts/functions_win.ps1
+        Install-JavaJdk -InstallParentPath "jdks" -PlatformArchitecture "x64"
+        echo "JAVA_HOME=$env:JAVA_HOME" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
     - name: "Update path for Java"
       run: |
+        echo "${{env.JAVA_HOME}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "${{env.JAVA_HOME}}\bin\server" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
     - name: "Update path for WIX Toolset"

build_linux_debug64.sh

@@ -12,9 +12,7 @@ cmake ../src -DCMAKE_BUILD_TYPE="$BUILD_TYPE" -DCODE_COVERAGE="ON" -DBUILD_SHARE
 cd ..
 
 # Download the DocumentDB JDBC Driver
-if [ -z "$JDBC_DRIVER_VERSION" ]; then 
-    JDBC_DRIVER_VERSION="1.3.1"
-fi
+read -r JDBC_DRIVER_VERSION < "${PROJECT_DIR}/src/odbc/JDBC_DRIVER_VERSION.txt"
 JDBC_DRIVER_FILENAME="documentdb-jdbc-$JDBC_DRIVER_VERSION-all.jar"
 JDBC_DRIVER_FULLPATH="$DRIVER_BIN_DIR/libs/$JDBC_DRIVER_FILENAME"
 export DOCUMENTDB_HOME="$DRIVER_BIN_DIR"

build_linux_release64_deb.sh

@@ -9,9 +9,7 @@ cmake ../src -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCODE_COVERAGE="OFF" -DBUILD_SHARED
 cd ..
 
 # Download the DocumentDB JDBC Driver
-if [ -z "$JDBC_DRIVER_VERSION" ]; then
-    JDBC_DRIVER_VERSION="1.3.1"
-fi
+read -r JDBC_DRIVER_VERSION < "${PROJECT_DIR}/src/odbc/JDBC_DRIVER_VERSION.txt"
 JDBC_DRIVER_FILENAME="documentdb-jdbc-$JDBC_DRIVER_VERSION-all.jar"
 JDBC_DRIVER_FULLPATH="$DRIVER_BIN_DIR/libs/$JDBC_DRIVER_FILENAME"
 export DOCUMENTDB_HOME="$DRIVER_BIN_DIR"

build_mac_debug64.sh

@@ -12,9 +12,7 @@ cmake ../src -DCMAKE_BUILD_TYPE="$BUILD_TYPE" -DCODE_COVERAGE="ON" -DBUILD_SHARE
 cd ..
 
 # Download the DocumentDB JDBC Driver
-if [ -z "$JDBC_DRIVER_VERSION" ]; then 
-    JDBC_DRIVER_VERSION="1.3.1"
-fi
+read -r JDBC_DRIVER_VERSION < "${PROJECT_DIR}/src/odbc/JDBC_DRIVER_VERSION.txt"
 JDBC_DRIVER_FILENAME="documentdb-jdbc-$JDBC_DRIVER_VERSION-all.jar"
 JDBC_DRIVER_FULLPATH="$DRIVER_BIN_DIR/libs/$JDBC_DRIVER_FILENAME"
 export DOCUMENTDB_HOME="$DRIVER_BIN_DIR"

build_mac_release64.sh

@@ -9,9 +9,7 @@ cmake ../src -DCMAKE_BUILD_TYPE="$BUILD_TYPE" -DCODE_COVERAGE="OFF" -DBUILD_SHAR
 make -j 4
 
 # Download the DocumentDB JDBC Driver
-if [ -z "$JDBC_DRIVER_VERSION" ]; then 
-    JDBC_DRIVER_VERSION="1.3.1"
-fi
+read -r JDBC_DRIVER_VERSION < "${PROJECT_DIR}/src/odbc/JDBC_DRIVER_VERSION.txt"
 JDBC_DRIVER_FILENAME="documentdb-jdbc-$JDBC_DRIVER_VERSION-all.jar"
 JDBC_DRIVER_FULLPATH="$DRIVER_BIN_DIR/libs/$JDBC_DRIVER_FILENAME"
 export DOCUMENTDB_HOME="$DRIVER_BIN_DIR"

scripts/build_windows.ps1

@@ -20,7 +20,9 @@ $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.1" } else { $JDBC_DRIVER_VERSION }
+foreach ( $line in Get-Content "$DRIVER_SOURCE_DIR\JDBC_DRIVER_VERSION.txt" ) { 
+    $JDBC_DRIVER_VERSION = $line; break; 
+}
 $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)) {

scripts/functions_win.ps1

@@ -211,21 +211,44 @@ function Confirm-JavaJdk {
 # Installs an Amazon Corretto JDK into the user's folder and updates the JAVA_HOME and PATH environment variables.
 function Install-JavaJdk {
 	[OutputType([Boolean])]
-	param ()
+	param (
+		$InstallParentPath = "$env:USERPROFILE\.jdks",
+		$PlatformArchitecture = "x64",
+		$JdkVersion = "17",
+		$JdkName = "amazon-corretto",
+		$JdkDownloadUrl = "https://corretto.aws/downloads/latest",
+		$Platform = "windows",
+		[switch]$InstallOnly
+	)
 
 	Write-Host "Installing Java JDK"
-	$jdksFolder     = "$env:USERPROFILE\.jdks"
-	$jdkZipFileName = 'amazon-corretto-17-x64-windows-jdk.zip'
-	$jdkDownloadUri = "https://corretto.aws/downloads/latest/$jdkZipFileName"
-	$jdkZipFilePath = "$jdksFolder\$jdkZipFileName"
+
+	Write-Host "`$InstallParentPath = '$InstallParentPath'"
+	Write-Host "`$PlatformArchitecture = '$PlatformArchitecture'"
+	Write-Host "`$JdkVersion = '$JdkVersion'"
+	Write-Host "`$JdkName = '$JdkName'"
+	Write-Host "`$JdkDownloadUrl = '$JdkDownloadUrl'"
+	Write-Host "`$Platform = '$Platform'"
+
+	$jdksFolder     = $InstallParentPath
+	$jdkZipFileName = "${JdkName}-${JdkVersion}-${PlatformArchitecture}-${Platform}-jdk.zip"
+	$jdkDownloadUri = "${JdkDownloadUrl}/$jdkZipFileName"
 	$tempFolderPath = Join-Path $Env:Temp $(New-Guid)
+	# Ensure parent folder exists
+	if ( -not (Test-Path -Path $jdksFolder)) {
+		New-Item -Type Directory -Path $jdksFolder -Force
+	}
+	$jdksFolder = Resolve-Path -Path $jdksFolder
+	$jdkZipFilePath = "$jdksFolder\$jdkZipFileName"
 
 	try {
 		# Download the JDK
 		Invoke-WebRequest $jdkDownloadUri -OutFile $jdkZipFilePath
+		Write-Host "After 'Invoke-WebRequest $jdkDownloadUri -OutFile $jdkZipFilePath'"
 		#Extract the zip file 
 		New-Item -Type Directory -Path $tempFolderPath
 		Expand-Archive -Path $jdkZipFilePath $tempFolderPath
+		Write-Host "After 'Expand-Archive -Path $jdkZipFilePath $tempFolderPath'"
 
 		# Ensure unique folder
 		$contentsOfTempFolder = Get-ChildItem -Path $tempFolderPath -Directory -Name
@@ -235,13 +258,15 @@ function Install-JavaJdk {
 		}
 		# Place JDK in user's folder
 		$jdkFolderName = $contentsOfTempFolder
-		$Env:JAVA_HOME = "$jdksFolder\$jdkFolderName"
-		if ( -not (Test-Path -Path $Env:JAVA_HOME) ) {
+		if ( -not (Test-Path -Path "$jdksFolder\$jdkFolderName") ) {
 			Copy-Item -Path "$tempFolderPath\*" -Destination $jdksFolder -Recurse -Force
 		}
-
-		# Update PATH for bin (java.exe) and server (jvm.dll)
-		Set-JdkPath
+		# Update if not just an install, only
+		if ( -not $InstallOnly ) {
+			# Update JAVA_HOME and PATH for bin (java.exe) and server (jvm.dll)
+			$Env:JAVA_HOME = "$jdksFolder\$jdkFolderName"
+			Set-JdkPath
+		}
 	}
 	catch {
 		Write-Host "Error installing Java JDK."

src/CMakeLists.txt

@@ -19,6 +19,7 @@ cmake_minimum_required(VERSION 3.20)
 
 # Update version number in ODBC_DRIVER_VERSION.txt file.
 file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/ODBC_DRIVER_VERSION.txt" ODBC_DRIVER_VERSION)
+string(STRIP ${ODBC_DRIVER_VERSION} ODBC_DRIVER_VERSION)
 project(DocumentDB-ODBC.C++ VERSION ${ODBC_DRIVER_VERSION})
 
 include("${CMAKE_CURRENT_SOURCE_DIR}/modules/code-coverage.cmake")

src/JDBC_DRIVER_VERSION.txt

@@ -0,0 +1 @@
+1.3.1