From 1bbf2a011ed4bd849835244a8e1c39d33abfb4d9 Mon Sep 17 00:00:00 2001
From: asha15 <165079T@uom.lk>
Date: Mon, 2 Dec 2024 16:42:02 +0530
Subject: [PATCH 1/4] Upgrade dependency versions
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d68616f2e8..48a1a10a46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -820,6 +820,7 @@
2.3.1.wso2v1
1.4
1.2.4
+<<<<<<< HEAD
1.11.21
7.7.24
3.0.5
@@ -835,7 +836,7 @@
0.7.12
2.5.18
4.10.14
- 5.2.59
+ 5.2.60
1.1.16
1.2.4
From 7c37ae4f85e7b15db036a3b448e0b92e5fbf6e98 Mon Sep 17 00:00:00 2001
From: asha15 <165079T@uom.lk>
Date: Wed, 4 Dec 2024 12:17:22 +0530
Subject: [PATCH 2/4] Upgrade carbon multitenancy version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 48a1a10a46..8d48ecdd15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -832,7 +832,7 @@
1.9.4
findbugs-exclude-filter.xml
4.10.25
- 4.11.30
+ 4.11.31
0.7.12
2.5.18
4.10.14
From 9f922deee07443cd934087ae603dd38cd8977329 Mon Sep 17 00:00:00 2001
From: asha15 <165079T@uom.lk>
Date: Wed, 4 Dec 2024 15:41:25 +0530
Subject: [PATCH 3/4] Upgrade carbon event publisher version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8d48ecdd15..13f72cf3a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -836,7 +836,7 @@
0.7.12
2.5.18
4.10.14
- 5.2.60
+ 5.2.61
1.1.16
1.2.4
From 5bd3aea2f5fc3df9f1808f241cecd882b859df89 Mon Sep 17 00:00:00 2001
From: asha15 <165079T@uom.lk>
Date: Thu, 12 Dec 2024 16:06:12 +0530
Subject: [PATCH 4/4] Remove the merge conflict comment
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 13f72cf3a5..6170724b7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -820,7 +820,6 @@
2.3.1.wso2v1
1.4
1.2.4
-<<<<<<< HEAD
1.11.21
7.7.24
3.0.5