microsoft · lilgreenbird · Oct 14, 2020 · Feb 5, 2020 · Feb 8, 2020 · Feb 10, 2020
diff --git a/README.md b/README.md
@@ -104,10 +104,8 @@ Starting from version 7.0.0, the driver Jars (jre10 and above) will expose 'Auto
 This project has following dependencies: 
 
 Compile Time:
- - `com.microsoft.azure:azure-keyvault` : Azure Key Vault Provider for Always Encrypted Azure Key Vault feature (optional)
- - `com.microsoft.azure:azure-keyvault-webkey` : Azure Key Vault Provider for Always Encrypted Azure Key Vault feature (optional)
- - `com.microsoft.azure:adal4j` : Azure Active Directory Library for Java for Azure Active Directory Authentication feature and Azure Key Vault feature (optional)
- - `com.microsoft.rest:client-runtime` : Azure Active Directory Library for Java for Azure Active Directory Authentication feature and Azure Key Vault feature (optional)
+ - `com.azure:azure-security-keyvault-keys` : Microsoft Azure Client Library For KeyVault Keys (optional)
+ - `com.azure:azure-identity` : Microsoft Azure Client Library For Identity (optional)
  - `org.bouncycastle:bcprov-jdk15on` : Bouncy Castle Provider for Always Encrypted with secure enclaves feature with JAVA 8 only (optional)
  - `com.google.code.gson:gson` : Gson for Always Encrypted with secure enclaves feature (optional)
 
@@ -123,7 +121,7 @@ mvn dependency:tree
 ### Azure Key Vault and Azure Active Directory Authentication Dependencies
 Projects that require either of the two features need to explicitly declare the dependency in their pom file.
 
-***For Example:*** If you are using *Azure Active Directory Authentication feature* then you need to redeclare *adal4j* and *client-runtime* dependency in your project's POM file. Please see the following snippet: 
+***For Example:*** If you are using *Azure Active Directory Authentication feature* then you need to declare the *azure-identity* dependency in your project's POM file. Please see the following snippet: 
 
 ```xml
 <dependency>
@@ -134,19 +132,14 @@ Projects that require either of the two features need to explicitly declare the
 </dependency>
 
 <dependency>
-	<groupId>com.microsoft.azure</groupId>
-	<artifactId>adal4j</artifactId>
-	<version>1.6.5</version>
+	<groupId>com.azure</groupId>
+	<artifactId>azure-identity</artifactId>
+	<version>1.1.3</version>
 </dependency>
 
-<dependency>
-	<groupId>com.microsoft.rest</groupId>
-	<artifactId>client-runtime</artifactId>
-	<version>1.7.4</version>
-</dependency>
 ```
 
-***For Example:*** If you are using *Azure Key Vault feature* then you need to redeclare *azure-keyvault*, *azure-keyvault-webkey* dependency and *adal4j*, *client-runtime* dependency in your project's POM file. Please see the following snippet: 
+***For Example:*** If you are using *Azure Key Vault feature* then you need to declare the *azure-identity* and *azure-security-keyvault-keys* dependencies in your project's POM file. Please see the following snippet: 
 
 ```xml
 <dependency>
@@ -157,21 +150,15 @@ Projects that require either of the two features need to explicitly declare the
 </dependency>
 
 <dependency>
-	<groupId>com.microsoft.azure</groupId>
-	<artifactId>adal4j</artifactId>
-	<version>1.6.5</version>
-</dependency>
-
-<dependency>
-	<groupId>com.microsoft.rest</groupId>
-	<artifactId>client-runtime</artifactId>
-	<version>1.7.4</version>
+	<groupId>com.azure</groupId>
+	<artifactId>azure-identity</artifactId>
+	<version>1.1.3</version>
 </dependency>
 
 <dependency>
-	<groupId>com.microsoft.azure</groupId>
-	<artifactId>azure-keyvault</artifactId>
-	<version>1.2.4</version>
+	<groupId>com.azure</groupId>
+	<artifactId>azure-security-keyvault-keys</artifactId>
+	<version>4.2.1</version>
 </dependency>
 ```
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -44,7 +44,7 @@ jobs:
     inputs:
       mavenPomFile: 'pom.xml'
       goals: 'clean dependency:purge-local-repository -DdllPath=$(Agent.TempDirectory) -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pjre15 -DuserNTLM=$(userNTLM) -DpasswordNTLM=$(passwordNTLM) -DdomainNTLM=$(domainNTLM) -DexcludedGroups=$(Ex_Groups) -Dpkcs12_truststore_password=$(pkcs12_truststore_password) -Dpkcs12_truststore=$(pkcs12_truststore.secureFilePath)
--DapplicationClientID=$(applicationClientID) -DapplicationKey=$(applicationKey) -DkeyID=$(keyID) -DwindowsKeyPath=$(windowsKeyPath) -DenclaveAttestationUrl=$(enclaveAttestationUrl) -DenclaveAttestationProtocol=$(enclaveAttestationProtocol) -DenclaveServer=$(enclaveServer)'
+-DapplicationClientID=$(applicationClientID) -DapplicationKey=$(applicationKey) -DtenantID=$(tenantID) -DkeyID=$(keyID) -DwindowsKeyPath=$(windowsKeyPath) -DenclaveAttestationUrl=$(enclaveAttestationUrl) -DenclaveAttestationProtocol=$(enclaveAttestationProtocol) -DenclaveServer=$(enclaveServer)'
       testResultsFiles: '**/TEST-*.xml'
       testRunTitle: 'Maven build jre15'
       javaHomeOption: Path
@@ -54,7 +54,7 @@ jobs:
     inputs:
       mavenPomFile: 'pom.xml'
       goals: 'clean dependency:purge-local-repository -DdllPath=$(Agent.TempDirectory) -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pjre11 -DuserNTLM=$(userNTLM) -DpasswordNTLM=$(passwordNTLM) -DdomainNTLM=$(domainNTLM) -DexcludedGroups=$(Ex_Groups) -Dpkcs12_truststore_password=$(pkcs12_truststore_password) -Dpkcs12_truststore=$(pkcs12_truststore.secureFilePath)
--DapplicationClientID=$(applicationClientID) -DapplicationKey=$(applicationKey) -DkeyID=$(keyID) -DwindowsKeyPath=$(windowsKeyPath) -DenclaveAttestationUrl=$(enclaveAttestationUrl) -DenclaveAttestationProtocol=$(enclaveAttestationProtocol) -DenclaveServer=$(enclaveServer)'
+-DapplicationClientID=$(applicationClientID) -DapplicationKey=$(applicationKey) -DtenantID=$(tenantID) -DkeyID=$(keyID) -DwindowsKeyPath=$(windowsKeyPath) -DenclaveAttestationUrl=$(enclaveAttestationUrl) -DenclaveAttestationProtocol=$(enclaveAttestationProtocol) -DenclaveServer=$(enclaveServer)'
       testResultsFiles: '**/TEST-*.xml'
       testRunTitle: 'Maven build jre11'
       javaHomeOption: Path
@@ -64,7 +64,7 @@ jobs:
     inputs:
       mavenPomFile: 'pom.xml'
       goals: 'clean dependency:purge-local-repository -DdllPath=$(Agent.TempDirectory) -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pjre8 -DuserNTLM=$(userNTLM) -DpasswordNTLM=$(passwordNTLM) -DdomainNTLM=$(domainNTLM) -DexcludedGroups=$(Ex_Groups) -Dpkcs12_truststore_password=$(pkcs12_truststore_password) -Dpkcs12_truststore=$(pkcs12_truststore.secureFilePath) 
--DapplicationClientID=$(applicationClientID) -DapplicationKey=$(applicationKey) -DkeyID=$(keyID) -DwindowsKeyPath=$(windowsKeyPath) -DenclaveAttestationUrl=$(enclaveAttestationUrl) -DenclaveAttestationProtocol=$(enclaveAttestationProtocol) -DenclaveServer=$(enclaveServer)'
+-DapplicationClientID=$(applicationClientID) -DapplicationKey=$(applicationKey) -DtenantID=$(tenantID) -DkeyID=$(keyID) -DwindowsKeyPath=$(windowsKeyPath) -DenclaveAttestationUrl=$(enclaveAttestationUrl) -DenclaveAttestationProtocol=$(enclaveAttestationProtocol) -DenclaveServer=$(enclaveServer)'
       testResultsFiles: '**/TEST-*.xml'
       testRunTitle: 'Maven build jre8'
       javaHomeOption: Path

diff --git a/build.gradle b/build.gradle
@@ -110,14 +110,12 @@ repositories {
 dependencies {
 	compile 'org.osgi:org.osgi.core:6.0.0',
 			'org.osgi:org.osgi.compendium:5.0.0'
-	compileOnly 'com.microsoft.azure:azure-keyvault:1.2.2',
-			'com.microsoft.azure:azure-keyvault-webkey:1.2.1',
-			'com.microsoft.rest:client-runtime:1.7.0',
-			'com.microsoft.azure:adal4j:1.6.4',
+	compileOnly 'com.azure:azure-security-keyvault-keys:4.2.1',
+			'com.azure:azure-identity:1.1.3',
 			'org.antlr:antlr4-runtime:4.7.2',
 			'com.google.code.gson:gson:2.8.6',
-			'org.bouncycastle:bcprov-jdk15on:1.64',
-			'org.bouncycastle:bcpkix-jdk15on:1.64'
+			'org.bouncycastle:bcprov-jdk15on:1.65',
+			'org.bouncycastle:bcpkix-jdk15on:1.65'
 	testCompile 'org.junit.platform:junit-platform-console:1.5.2',
 			'org.junit.platform:junit-platform-commons:1.5.2',
 			'org.junit.platform:junit-platform-engine:1.5.2',
@@ -127,15 +125,15 @@ dependencies {
 			'org.junit.jupiter:junit-jupiter-api:5.6.0',
 			'org.junit.jupiter:junit-jupiter-engine:5.6.0',
 			'org.junit.jupiter:junit-jupiter-params:5.6.0',
-			'com.zaxxer:HikariCP:3.4.1',
-			'org.apache.commons:commons-dbcp2:2.6.0',
+			'com.zaxxer:HikariCP:3.4.2',
+			'org.apache.commons:commons-dbcp2:2.7.0',
 			'org.slf4j:slf4j-nop:1.7.29',
 			'org.antlr:antlr4-runtime:4.7.2',
 			'org.eclipse.gemini.blueprint:gemini-blueprint-mock:2.1.0.RELEASE',
 			'com.google.code.gson:gson:2.8.6',
-			'org.bouncycastle:bcprov-jdk15on:1.64',
-			'com.microsoft.azure:adal4j:1.6.4',
-			'com.microsoft.azure:azure-keyvault:1.2.2',
-			'com.microsoft.azure:azure-keyvault-webkey:1.2.1',
+			'org.bouncycastle:bcprov-jdk15on:1.65',
+			'com.azure:azure-security-keyvault-keys:4.2.1',
+			'com.azure:azure-identity:1.1.3',
+			'com.microsoft.azure:adal4j:1.6.5',
 			'com.h2database:h2:1.4.200'
 }
diff --git a/pom.xml b/pom.xml
@@ -60,9 +60,9 @@
 		<releaseExt>-preview</releaseExt>
 
 		<!-- Driver Dependencies -->
-		<azure.keyvault.version>1.2.4</azure.keyvault.version>
+		<azure.keyvault.version>4.2.1</azure.keyvault.version>
+		<azure.identity.version>1.1.3</azure.identity.version>
 		<azure.adal4j.version>1.6.5</azure.adal4j.version>
-		<rest.client.version>1.7.4</rest.client.version>
 		<osgi.core.version>6.0.0</osgi.core.version>
 		<osgi.comp.version>5.0.0</osgi.comp.version>
 		<antlr.runtime.version>4.7.2</antlr.runtime.version>
@@ -86,23 +86,28 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.microsoft.azure</groupId>
-			<artifactId>azure-keyvault</artifactId>
+			<groupId>com.azure</groupId>
+			<artifactId>azure-security-keyvault-keys</artifactId>
 			<version>${azure.keyvault.version}</version>
-			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.azure</groupId>
+			<artifactId>azure-identity</artifactId>
+			<version>${azure.identity.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>stax</groupId>
+					<artifactId>stax-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>adal4j</artifactId>
 			<version>${azure.adal4j.version}</version>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.microsoft.rest</groupId>
-			<artifactId>client-runtime</artifactId>
-			<version>${rest.client.version}</version>
-			<optional>true</optional>
-		</dependency>
 
 		<!-- dependencies for ANTLR -->
 		<dependency>

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/KeyVaultCredential.java b/src/main/java/com/microsoft/sqlserver/jdbc/KeyVaultCredential.java