From bb39a935f006ffaf628f25b2cf1205dc472f6592 Mon Sep 17 00:00:00 2001
From: David Erel <89739062+david-piiano@users.noreply.github.com>
Date: Tue, 26 Nov 2024 14:30:22 +0800
Subject: [PATCH 1/3] Bumping spring-context to address vulenrability

---
 sdk/hibernate-encryption/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/hibernate-encryption/pom.xml b/sdk/hibernate-encryption/pom.xml
index 8e0a611..3425849 100644
--- a/sdk/hibernate-encryption/pom.xml
+++ b/sdk/hibernate-encryption/pom.xml
@@ -18,7 +18,7 @@
 
 		<lombok.version>1.18.34</lombok.version>
 		<guava.version>32.1.3-jre</guava.version>
-		<spring-context.version>5.3.20</spring-context.version>
+		<spring-context.version>5.3.41</spring-context.version>
 		<hibernate-core.version>5.6.15.Final</hibernate-core.version>
 		<junit.version>4.13.2</junit.version>
 		<junit-jupiter.version>5.10.0</junit-jupiter.version>

From f79d4ba3230adb091f5aff4bb32b113ef7121151 Mon Sep 17 00:00:00 2001
From: David Erel <david@piiano.com>
Date: Tue, 26 Nov 2024 08:44:48 +0200
Subject: [PATCH 2/3] sprint-context 5.3.41 is unavailable, pushing to 6.x
 version

---
 sdk/hibernate-encryption/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sdk/hibernate-encryption/pom.xml b/sdk/hibernate-encryption/pom.xml
index 3425849..2871991 100644
--- a/sdk/hibernate-encryption/pom.xml
+++ b/sdk/hibernate-encryption/pom.xml
@@ -18,7 +18,11 @@
 
 		<lombok.version>1.18.34</lombok.version>
 		<guava.version>32.1.3-jre</guava.version>
+<<<<<<< Updated upstream
 		<spring-context.version>5.3.41</spring-context.version>
+=======
+		<spring-context.version>6.1.14</spring-context.version>
+>>>>>>> Stashed changes
 		<hibernate-core.version>5.6.15.Final</hibernate-core.version>
 		<junit.version>4.13.2</junit.version>
 		<junit-jupiter.version>5.10.0</junit-jupiter.version>

From e22a7a8bfa6bfd4d7a8a98a1f0643cf022167db9 Mon Sep 17 00:00:00 2001
From: David Erel <david@piiano.com>
Date: Tue, 26 Nov 2024 08:55:13 +0200
Subject: [PATCH 3/3] retry

---
 sdk/hibernate-encryption/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sdk/hibernate-encryption/pom.xml b/sdk/hibernate-encryption/pom.xml
index 2871991..a219b2c 100644
--- a/sdk/hibernate-encryption/pom.xml
+++ b/sdk/hibernate-encryption/pom.xml
@@ -18,11 +18,7 @@
 
 		<lombok.version>1.18.34</lombok.version>
 		<guava.version>32.1.3-jre</guava.version>
-<<<<<<< Updated upstream
-		<spring-context.version>5.3.41</spring-context.version>
-=======
 		<spring-context.version>6.1.14</spring-context.version>
->>>>>>> Stashed changes
 		<hibernate-core.version>5.6.15.Final</hibernate-core.version>
 		<junit.version>4.13.2</junit.version>
 		<junit-jupiter.version>5.10.0</junit-jupiter.version>