From f9c184b34ad606c0fbcead444d308d09cdb31596 Mon Sep 17 00:00:00 2001
From: Terry Chow <v-terrychow@microsoft.com>
Date: Tue, 14 Jan 2025 16:43:54 -0800
Subject: [PATCH 1/5] Updated MSAL and Azure Identity dependency versions

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 026144f46..a6891ef32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@
 		<!-- Driver Dependencies -->
 		<org.osgi.core.version>6.0.0</org.osgi.core.version>
 		<azure-security-keyvault-keys.version>4.7.3</azure-security-keyvault-keys.version>
-		<azure-identity.version>1.12.2</azure-identity.version>
-		<msal.version>1.15.1</msal.version>
+		<azure-identity.version>1.15.0</azure-identity.version>
+		<msal.version>1.17.2</msal.version>
 		<osgi.jdbc.version>1.1.0</osgi.jdbc.version>
 		<antlr-runtime.version>4.9.3</antlr-runtime.version>
 		<com.google.code.gson.version>2.10.1</com.google.code.gson.version>

From 4702c00247640abd75411b2a1fa8f5c945bd0e68 Mon Sep 17 00:00:00 2001
From: Terry Chow <v-terrychow@microsoft.com>
Date: Wed, 15 Jan 2025 11:11:13 -0800
Subject: [PATCH 2/5] Updated all test and compile dependencies

---
 pom.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index a6891ef32..cba5c7bfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,22 +54,22 @@
 		<releaseExt>-preview</releaseExt>
 		<!-- Driver Dependencies -->
 		<org.osgi.core.version>6.0.0</org.osgi.core.version>
-		<azure-security-keyvault-keys.version>4.7.3</azure-security-keyvault-keys.version>
+		<azure-security-keyvault-keys.version>4.9.1</azure-security-keyvault-keys.version>
 		<azure-identity.version>1.15.0</azure-identity.version>
 		<msal.version>1.17.2</msal.version>
 		<osgi.jdbc.version>1.1.0</osgi.jdbc.version>
-		<antlr-runtime.version>4.9.3</antlr-runtime.version>
-		<com.google.code.gson.version>2.10.1</com.google.code.gson.version>
-		<bcprov-jdk18on.version>1.78</bcprov-jdk18on.version>
-		<bcpkix-jdk18on.version>1.78</bcpkix-jdk18on.version>
+		<antlr-runtime.version>4.13.2</antlr-runtime.version>
+		<com.google.code.gson.version>2.11.0</com.google.code.gson.version>
+		<bcprov-jdk18on.version>1.79</bcprov-jdk18on.version>
+		<bcpkix-jdk18on.version>1.79</bcpkix-jdk18on.version>
 		<!-- JUnit Test Dependencies -->
-		<junit.platform.version>[1.3.2, 1.9.0]</junit.platform.version>
-		<junit.jupiter.version>5.8.2</junit.jupiter.version>
-		<hikaricp.version>3.4.2</hikaricp.version>
-		<dbcp2.version>2.7.0</dbcp2.version>
-		<slf4j.nop.version>1.7.30</slf4j.nop.version>
-		<gemini.mock.version>2.1.0.RELEASE</gemini.mock.version>
-		<h2.version>2.2.220</h2.version>
+		<junit.platform.version>[1.3.2, 1.11.4]</junit.platform.version>
+		<junit.jupiter.version>5.11.4</junit.jupiter.version>
+		<hikaricp.version>6.2.1</hikaricp.version>
+		<dbcp2.version>2.13.0</dbcp2.version>
+		<slf4j.nop.version>1.7.36</slf4j.nop.version>
+		<gemini.mock.version>3.0.0.M01</gemini.mock.version>
+		<h2.version>2.3.232</h2.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
 		<enforcer.skip>false</enforcer.skip>

From 99de5b5c1b5cd99981489bc6ddf9dc13c53dea0f Mon Sep 17 00:00:00 2001
From: Terry Chow <v-terrychow@microsoft.com>
Date: Wed, 15 Jan 2025 12:37:32 -0800
Subject: [PATCH 3/5] Reverted antlr update - broke tests

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cba5c7bfb..227f8aed9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
 		<azure-identity.version>1.15.0</azure-identity.version>
 		<msal.version>1.17.2</msal.version>
 		<osgi.jdbc.version>1.1.0</osgi.jdbc.version>
-		<antlr-runtime.version>4.13.2</antlr-runtime.version>
+		<antlr-runtime.version>4.9.3</antlr-runtime.version>
 		<com.google.code.gson.version>2.11.0</com.google.code.gson.version>
 		<bcprov-jdk18on.version>1.79</bcprov-jdk18on.version>
 		<bcpkix-jdk18on.version>1.79</bcpkix-jdk18on.version>

From 006a5d54a83322db5665b3bf10ed37d555e59911 Mon Sep 17 00:00:00 2001
From: Terry Chow <v-terrychow@microsoft.com>
Date: Wed, 15 Jan 2025 12:45:10 -0800
Subject: [PATCH 4/5] Updated gradle file

---
 build.gradle | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3e5d87a9e..c17a4cfc3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -143,29 +143,29 @@ repositories {
 dependencies {
     implementation 'org.osgi:org.osgi.core:6.0.0',
 			'org.osgi:org.osgi.service.jdbc:1.1.0'
-	compileOnly 'com.azure:azure-security-keyvault-keys:4.7.3',
-			'com.azure:azure-identity:1.12.2',
+	compileOnly 'com.azure:azure-security-keyvault-keys:4.9.1',
+			'com.azure:azure-identity:1.15.0',
 			'org.antlr:antlr4-runtime:4.9.3',
-			'com.google.code.gson:gson:2.10.1',
-			'org.bouncycastle:bcprov-jdk18on:1.78',
-			'org.bouncycastle:bcpkix-jdk18on:1.78'
-    testImplementation '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',
-			'org.junit.platform:junit-platform-launcher:1.5.2',
-			'org.junit.platform:junit-platform-runner:1.5.2',
+			'com.google.code.gson:gson:2.11.0',
+			'org.bouncycastle:bcprov-jdk18on:1.79',
+			'org.bouncycastle:bcpkix-jdk18on:1.79'
+    testImplementation 'org.junit.platform:junit-platform-console:1.11.4',
+			'org.junit.platform:junit-platform-commons:1.11.4',
+			'org.junit.platform:junit-platform-engine:1.11.4',
+			'org.junit.platform:junit-platform-launcher:1.11.4',
+			'org.junit.platform:junit-platform-runner:1.11.4',
 			'org.junit.platform:junit-platform-surefire-provider:1.3.2',
-			'org.junit.jupiter:junit-jupiter-api:5.8.2',
-			'org.junit.jupiter:junit-jupiter-engine:5.8.2',
-			'org.junit.jupiter:junit-jupiter-params:5.8.2',
-			'com.zaxxer:HikariCP:3.4.2',
-			'org.apache.commons:commons-dbcp2:2.7.0',
-			'org.slf4j:slf4j-nop:1.7.30',
+			'org.junit.jupiter:junit-jupiter-api:5.11.4',
+			'org.junit.jupiter:junit-jupiter-engine:5.11.4',
+			'org.junit.jupiter:junit-jupiter-params:5.11.4',
+			'com.zaxxer:HikariCP:6.2.1',
+			'org.apache.commons:commons-dbcp2:2.13.0',
+			'org.slf4j:slf4j-nop:1.7.36',
 			'org.antlr:antlr4-runtime:4.9.3',
-			'org.eclipse.gemini.blueprint:gemini-blueprint-mock:2.1.0.RELEASE',
-			'com.google.code.gson:gson:2.10.1',
-			'org.bouncycastle:bcprov-jdk18on:1.78',
-			'com.azure:azure-security-keyvault-keys:4.7.3',
-			'com.azure:azure-identity:1.12.2',
-			'com.h2database:h2:2.2.220'
+			'org.eclipse.gemini.blueprint:gemini-blueprint-mock:3.0.0.M01',
+			'com.google.code.gson:gson:2.11.0',
+			'org.bouncycastle:bcprov-jdk18on:1.79',
+			'com.azure:azure-security-keyvault-keys:4.9.1',
+			'com.azure:azure-identity:1.15.0',
+			'com.h2database:h2:2.3.232'
 }

From ad13edf7bb8c2fb4cbe1fe85b260af5a5685f7b3 Mon Sep 17 00:00:00 2001
From: Terry Chow <v-terrychow@microsoft.com>
Date: Wed, 15 Jan 2025 14:00:02 -0800
Subject: [PATCH 5/5] Reverted h2 and hikari dependency updates

---
 build.gradle | 4 ++--
 pom.xml      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index c17a4cfc3..659ebae55 100644
--- a/build.gradle
+++ b/build.gradle
@@ -158,7 +158,7 @@ dependencies {
 			'org.junit.jupiter:junit-jupiter-api:5.11.4',
 			'org.junit.jupiter:junit-jupiter-engine:5.11.4',
 			'org.junit.jupiter:junit-jupiter-params:5.11.4',
-			'com.zaxxer:HikariCP:6.2.1',
+			'com.zaxxer:HikariCP:3.4.2',
 			'org.apache.commons:commons-dbcp2:2.13.0',
 			'org.slf4j:slf4j-nop:1.7.36',
 			'org.antlr:antlr4-runtime:4.9.3',
@@ -167,5 +167,5 @@ dependencies {
 			'org.bouncycastle:bcprov-jdk18on:1.79',
 			'com.azure:azure-security-keyvault-keys:4.9.1',
 			'com.azure:azure-identity:1.15.0',
-			'com.h2database:h2:2.3.232'
+			'com.h2database:h2:2.2.220'
 }
diff --git a/pom.xml b/pom.xml
index 227f8aed9..dca0cd170 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,11 +65,11 @@
 		<!-- JUnit Test Dependencies -->
 		<junit.platform.version>[1.3.2, 1.11.4]</junit.platform.version>
 		<junit.jupiter.version>5.11.4</junit.jupiter.version>
-		<hikaricp.version>6.2.1</hikaricp.version>
+		<hikaricp.version>3.4.2</hikaricp.version>
 		<dbcp2.version>2.13.0</dbcp2.version>
 		<slf4j.nop.version>1.7.36</slf4j.nop.version>
 		<gemini.mock.version>3.0.0.M01</gemini.mock.version>
-		<h2.version>2.3.232</h2.version>
+		<h2.version>2.2.220</h2.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
 		<enforcer.skip>false</enforcer.skip>