From 1397dd8cbab6adc70d61f720082b4ff49e6c6615 Mon Sep 17 00:00:00 2001
From: Sachin-Mamoru <sachinm@wso2.com>
Date: Thu, 4 Jan 2024 14:59:55 +0530
Subject: [PATCH] Bump kernel version to 4.9.21 and pack hazelcast as a feature

---
 modules/p2-profile-gen/carbon.product | 4 ++--
 modules/p2-profile-gen/pom.xml        | 7 +++++++
 pom.xml                               | 7 ++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/p2-profile-gen/carbon.product b/modules/p2-profile-gen/carbon.product
index ad0d4971883..61f78d54726 100644
--- a/modules/p2-profile-gen/carbon.product
+++ b/modules/p2-profile-gen/carbon.product
@@ -2,7 +2,7 @@
 <?pde version="3.5"?>
 
 <product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application"
-version="4.9.20" useFeatures="true" includeLaunchers="true">
+version="4.9.21" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -14,7 +14,7 @@ version="4.9.20" useFeatures="true" includeLaunchers="true">
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.9.20"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.9.21"/>
    </features>
 
   <configurations>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 5933e62f450..8f4311cccd2 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -336,6 +336,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.hazelcast.feature:${carbon.kernel.version}
+                                </featureArtifactDef>
 
                                 <!-- DepSync feature -->
                                 <featureArtifactDef>
@@ -806,6 +809,10 @@
                                     <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.hazelcast.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
 
                                 <feature>
                                     <id>
diff --git a/pom.xml b/pom.xml
index 6546a7858fd..2924c45edcd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -994,6 +994,11 @@
                 <artifactId>org.wso2.carbon.core.ui.feature</artifactId>
                 <version>${carbon.kernel.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.hazelcast</artifactId>
+                <version>${carbon.kernel.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.identity</groupId>
                 <artifactId>org.wso2.stratos.identity.dashboard.ui</artifactId>
@@ -2374,7 +2379,7 @@
         <charon.version>3.4.1</charon.version>
 
         <!-- Carbon Kernel -->
-        <carbon.kernel.version>4.9.20</carbon.kernel.version>
+        <carbon.kernel.version>4.9.21</carbon.kernel.version>
 
         <!-- Identity Verification -->
         <identity.verification.version>1.0.6</identity.verification.version>