Updating connectionResiliency branch with the changes from dev branch

.gitignore

@@ -14,7 +14,9 @@ build/
 *~.nib
 local.properties
 .classpath
+.vscode/
 .settings/
+.gradle/
 .loadpath
 
 # External tool builders

.travis.yml

@@ -1,4 +1,4 @@
-sudo: required
+sudo: required
 
 language: java
 jdk:
@@ -8,23 +8,37 @@ services:
   - docker
 
 env:
+ global:	
   - mssql_jdbc_test_connection_properties='jdbc:sqlserver://localhost:1433;databaseName=master;username=sa;password=<YourStrong!Passw0rd>;'
-
+  - mssql_jdbc_logging='true'
+  # Enabling logging with console / file handler for JUnit Test Framework. 
+  #- mssql_jdbc_logging_handler='console'|'file'
+
+#Cache the .m2 folder
+cache:
+ directories:
+  - $HOME/.m2
+
+before_install:
+  - mkdir AE_Certificates
+
 install: 
+  - cd AE_Certificates
+  - openssl req -newkey rsa:2048 -x509 -keyout cakey.pem -out cacert.pem -days 3650 -subj "/C=US/ST=WA/L=Redmond/O=Microsoft Corporation/OU=SQL Server/CN=JDBC Driver" -nodes
+  - openssl pkcs12 -export -in cacert.pem -inkey cakey.pem -out identity.p12 -password pass:password
+  - keytool -importkeystore -destkeystore clientcert.jks -deststorepass password -srckeystore identity.p12 -srcstoretype PKCS12 -srcstorepass password
+  - keytool -list -v -keystore clientcert.jks -storepass "password" > JavaKeyStore.txt
+  - cd ..
   - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild41
   - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild42
 
 before_script:
-  - docker pull microsoft/mssql-server-linux
-  - docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=<YourStrong!Passw0rd>' -p 1433:1433 -d microsoft/mssql-server-linux
+  - docker pull microsoft/mssql-server-linux:2017-latest
+  - docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=<YourStrong!Passw0rd>' -p 1433:1433 -d microsoft/mssql-server-linux:2017-latest
 
 script: 
   - docker ps -a
 
 ##Test for JDBC Specification 41 & 42 and submit coverage report.
   - mvn test -B -Pbuild41 jacoco:report && bash <(curl -s https://codecov.io/bash) -cF JDBC41
   - mvn test -B -Pbuild42 jacoco:report && bash <(curl -s https://codecov.io/bash) -cF JDBC42
-
-#after_success:
-# instead of after success we are using && operator for conditional submitting coverage report.
-#  - bash <(curl -s https://codecov.io/bash)

AppVeyorJCE/README.md

@@ -0,0 +1,31 @@
+# JCE chocolatey package
+
+### Disclaimers:
+1. All contents within this directory originate from [this GitHub project](https://github.com/TobseF/jce-chocolatey-package). This project was added to allow us to test the Always Encrypted feature on AppVeyor builds.
+
+2. This is not an official project of Oracle. It\`s only easy of the manual installation: It downloads the JCE from oracle.com and unpacks it to the installed JDK.
+
+
+[Chocolatey](https://chocolatey.org/) package for the [JCE (Unlimited Strength Java Cryptography Extension Policy Files)](http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html)
+
+This chocolatey package adds the JCE to latest installed Java SDK. The The `JAVA_HOME` environment variable has to point to the JDK. If `JAVA_HOME` is not set, nothing will be changed. The original files are backuped (renamed to `*_old`) and can be reverted at any time. This package is a perfect addion to the [JDK8 package](https://chocolatey.org/packages/jdk8).
+
+#### Install with [Chocolatey](https://chocolatey.org/)
+```PowerShell
+choco install jce -y
+```
+
+#### Build from source:
+1. Install [Chocolatey](https://chocolatey.org/).
+2. Open cmd with admin rights in jce package directory.
+3. Pack NuGet Package (.nupkg).
+```PowerShell
+cpack
+```
+4. Install JCE NuGet Package.
+```PowerShell
+choco install jce -fdv -s . -y
+```
+
+
+

AppVeyorJCE/jce.nuspec

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Do not remove this test for UTF-8: if “Ω” doesn’t appear as greek uppercase omega letter enclosed in quotation marks, you should use an editor that supports UTF-8, not this one. -->
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
+    <id>jce</id>
+    <title>JCE (Java Cryptography Extension)</title>
+    <version>7.0.0</version>
+    <authors>Sun Microsystems/Oracle Corporation</authors>
+    <owners>Tobse Fritz</owners>
+    <summary>Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files 7</summary>
+    <description>Downloads and installs the Java Cryptography Extension (JCE) to the lastest JDK. The The JAVA_HOME environment variable has to point to the JDK. If JAVA_HOME is not set, nothing will be changed. The original files are backuped (renamed to *_old) and can be reverted at any time.</description>
+    <projectUrl>https://github.com/TobseF/jce-chocolatey-package</projectUrl>
+    <tags>java jce admin</tags>
+    <copyright></copyright>
+    <licenseUrl>http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <iconUrl>http://cdn.rawgit.com/chocolatey/chocolatey-coreteampackages/50fd97744110dcbce1acde889c0870599c9d5584/icons/java.svg</iconUrl>
+    <!--<dependencies>
+      <dependency id="" version="__VERSION__" />
+      <dependency id="" />
+    </dependencies>-->
+    <releaseNotes></releaseNotes>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+  </files>
+</package>

AppVeyorJCE/tools/chocolateyInstall.ps1

@@ -0,0 +1,15 @@
+$script_path = $(Split-Path -parent $MyInvocation.MyCommand.Definition)
+$common = $(Join-Path $script_path "common.ps1")
+. $common
+
+#installs JCE
+try {
+    chocolatey-install
+} catch {
+    if ($_.Exception.InnerException) {
+        $msg = $_.Exception.InnerException.Message
+    } else {
+        $msg = $_.Exception.Message
+    }
+    throw 
+}  

AppVeyorJCE/tools/chocolateyUninstall.ps1

@@ -0,0 +1,14 @@
+$script_path = $(Split-Path -parent $MyInvocation.MyCommand.Definition)
+$common = $(Join-Path $script_path "common.ps1")
+. $common
+
+function Uninstall-ChocolateyPath {
+param(
+  [string] $pathToUninstall,
+  [System.EnvironmentVariableTarget] $pathType = [System.EnvironmentVariableTarget]::User
+)
+  Write-Debug "Running 'Uninstall-ChocolateyPath' with pathToUninstall:`'$pathToUninstall`'";
+
+  #get the PATH variable
+  $envPath = $env:PATH
+}

AppVeyorJCE/tools/common.ps1

@@ -0,0 +1,85 @@
+$jce_version = '7' 
+$zipFolder = 'UnlimitedJCEPolicy'
+$script_path = $(Split-Path -parent $MyInvocation.MyCommand.Definition)
+
+function has_file($filename) {
+    return Test-Path $filename
+}
+
+function download-from-oracle($url, $output_filename) {
+    if (!(has_file($output_fileName))) {
+        Write-Host  "Downloading JCE from $url"
+
+        try {
+            [System.Net.ServicePointManager]::ServerCertificateValidationCallback = { $true }
+            $client = New-Object Net.WebClient
+            $dummy = $client.Headers.Add('Cookie', 'gpw_e24=http://www.oracle.com; oraclelicense=accept-securebackup-cookie')
+            $dummy = $client.DownloadFile($url, $output_filename)
+        } finally {
+            [System.Net.ServicePointManager]::ServerCertificateValidationCallback = $null
+        }
+    }  
+}
+
+function download-jce-file($url, $output_filename) {
+    $dummy = download-from-oracle $url $output_filename
+}
+
+function download-jce() {
+    $filename = "UnlimitedJCEPolicyJDK$jce_version.zip"
+    $url = "http://download.oracle.com/otn-pub/java/jce/$jce_version/$filename"
+    $output_filename = Join-Path $script_path $filename
+	If(!(Test-Path $output_filename)){
+		$dummy = download-jce-file $url $output_filename
+	}
+    return $output_filename
+}
+
+function get-java-home(){
+    return Get-EnvironmentVariable 'JAVA_HOME' -Scope 'Machine' -PreserveVariables
+}
+
+function get-jce-dir($java_home) {
+    return Join-Path $java_home 'jre\lib\security'
+}
+
+function chocolatey-install() {
+    $java_home = get-java-home
+    if (!$java_home) { 
+        Write-Host "Couldnt find JAVA_HOME environment variable"
+        Write-Host "Skipping installation"
+    }else{
+    	$jce_dir = get-jce-dir $java_home
+	    $already_patched_file = Join-Path $jce_dir 'local_policy_old.jar'
+
+	    If(Test-Path $already_patched_file){
+		    Write-Host "JCE already installed: $jce_dir"
+		    Write-Host "Skipping installation"
+	    }else{
+		    Write-Host "JCE is not installed ($already_patched_file) is not present"
+		    Write-Host "Starting installation"
+		    install-jce $jce_dir
+	    }
+    }
+}
+
+function install-jce($jce_dir) {
+	$jce_zip_file = download-jce
+	$temp_dir = Get-EnvironmentVariable 'TEMP' -Scope User -PreserveVariables
+	$local_policy = Join-Path $jce_dir 'local_policy.jar'
+	$export_policy = Join-Path $jce_dir 'US_export_policy.jar'
+
+	Write-Host "Downloading JCE ($jce_zip_file)"
+	Install-ChocolateyZipPackage -PackageName 'jce7' -Url $jce_zip_file -UnzipLocation $temp_dir
+
+	If(Test-Path $local_policy){
+		Rename-Item -Path $local_policy -NewName 'local_policy_old.jar' -Force
+	}
+
+	If(Test-Path $export_policy){
+		Rename-Item -Path $export_policy -NewName 'US_export_policy_old.jar' -Force
+	}
+
+	$unzippedFolder = Join-Path $temp_dir $zipFolder
+	Copy-Item $unzippedFolder\*.jar $jce_dir -force
+}