From 68d2a733e041a24bcced52a287de25dac9a588f4 Mon Sep 17 00:00:00 2001
From: hilpitome <hilpitome@gmail.com>
Date: Wed, 19 Apr 2023 12:56:11 +0300
Subject: [PATCH 1/7] update vulnerable dependencies

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 95e14bc79..c8f3f09e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 		<spring.security.version>5.5.7</spring.security.version>
 		<mybatis.version>3.5.7</mybatis.version>
 		<mybatis.spring.version>2.0.6</mybatis.spring.version>
-		<hibernate.version>5.4.24.Final</hibernate.version>
+		<hibernate.version>5.6.10.Final</hibernate.version>
 		<opensrp.updatePolicy>always</opensrp.updatePolicy>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<nexus-staging-maven-plugin.version>1.5.1</nexus-staging-maven-plugin.version>
@@ -95,7 +95,7 @@
 		<dependency>
 			<groupId>com.aliyun.oss</groupId>
 			<artifactId>aliyun-sdk-oss</artifactId>
-			<version>3.15.2</version>
+			<version>3.16.1</version>
 		</dependency>
 
 		<dependency>
@@ -115,7 +115,7 @@
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk</artifactId>
-			<version>1.12.322</version>
+			<version>1.12.333</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -281,7 +281,7 @@
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20190722</version>
+			<version>20230227</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.annotation</groupId>
@@ -507,7 +507,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>properties-maven-plugin</artifactId>
-				<version>1.0.0</version>
+				<version>1.1.0</version>
 				<executions>
 					<execution>
 						<phase>initialize</phase>

From 4b35fa5ab9104233fdcbc26156196e87a492972b Mon Sep 17 00:00:00 2001
From: hilpitome <hilpitome@gmail.com>
Date: Wed, 19 Apr 2023 13:04:46 +0300
Subject: [PATCH 2/7] fix dependencies with issues

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

diff --git a/pom.xml b/pom.xml
index c8f3f09e4..2845088c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,8 +12,8 @@
 
 	<properties>
 		<main.basedir>${project.basedir}</main.basedir>
-		<spring.version>5.2.22.RELEASE</spring.version>
-		<spring.data.version>2.2.13.RELEASE</spring.data.version>
+		<spring.version>5.3.26</spring.version>
+		<spring.data.version>2.7.2</spring.data.version>
 		<spring.security.version>5.5.7</spring.security.version>
 		<mybatis.version>3.5.7</mybatis.version>
 		<mybatis.spring.version>2.0.6</mybatis.spring.version>
@@ -28,8 +28,6 @@
 		<jackson.version>2.14.0</jackson.version>
 		<powermock.version>2.0.5</powermock.version>
 		<lombok.version>1.18.12</lombok.version>
-		<spring.data.redis>2.2.13.RELEASE</spring.data.redis>
-		<redis.jedis.version>3.8.0</redis.jedis.version>
 		<spring.ampqp.version>2.2.22.RELEASE</spring.ampqp.version>
 		<log4j.version>2.17.1</log4j.version>
 

From 4ccf70244dc37e90f8b6b0141d80eccf03ce6d08 Mon Sep 17 00:00:00 2001
From: hilpitome <hilpitome@gmail.com>
Date: Wed, 19 Apr 2023 13:09:22 +0300
Subject: [PATCH 3/7] set alpha version

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

diff --git a/pom.xml b/pom.xml
index 2845088c6..033259ab7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>3.2.8-SNAPSHOT</version>
+	<version>3.2.9-ALPHA-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

From 574eaa78f561c30d026a5dc3fae6126221072655 Mon Sep 17 00:00:00 2001
From: hilpitome <hilpitome@gmail.com>
Date: Wed, 19 Apr 2023 14:31:46 +0300
Subject: [PATCH 4/7] add missing dependencies

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 033259ab7..bc786a6b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,9 @@
 		<jackson.version>2.14.0</jackson.version>
 		<powermock.version>2.0.5</powermock.version>
 		<lombok.version>1.18.12</lombok.version>
-		<spring.ampqp.version>2.2.22.RELEASE</spring.ampqp.version>
+		<spring.data.redis>2.7.2</spring.data.redis>
+		<redis.jedis.version>3.8.0</redis.jedis.version>
+		<spring.ampqp.version>2.3.11</spring.ampqp.version>
 		<log4j.version>2.17.1</log4j.version>
 
 	</properties>

From 8641a67355b37ab2772bcf9c8aecc5a8d503d84d Mon Sep 17 00:00:00 2001
From: hilpitome <hilpitome@gmail.com>
Date: Thu, 20 Apr 2023 11:16:02 +0300
Subject: [PATCH 5/7] bump up version

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

diff --git a/pom.xml b/pom.xml
index 1549deda2..b6690a9a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>3.2.10-ALPHA-SNAPSHOT</version>
+	<version>3.2.12-ALPHA-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

From b84cf939e7814bb5620ef47f7411cb1936182964 Mon Sep 17 00:00:00 2001
From: hilpitome <hilpitome@gmail.com>
Date: Thu, 20 Apr 2023 11:22:53 +0300
Subject: [PATCH 6/7] fix versioning

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

diff --git a/pom.xml b/pom.xml
index b6690a9a4..bc786a6b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>3.2.12-ALPHA-SNAPSHOT</version>
+	<version>3.2.9-ALPHA-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

From 3f43131a89d569c21d6652eddc37c7a0e80496e4 Mon Sep 17 00:00:00 2001
From: hilpitome <hilpitome@gmail.com>
Date: Thu, 20 Apr 2023 11:29:09 +0300
Subject: [PATCH 7/7] update version

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

diff --git a/pom.xml b/pom.xml
index bc786a6b9..a546e7096 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>3.2.9-ALPHA-SNAPSHOT</version>
+	<version>3.2.10-ALPHA1-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>