From e5bd392d313dc4511e09457d3abc96213d640b80 Mon Sep 17 00:00:00 2001
From: tharikaGitHub <tharika.m92@gmail.com>
Date: Thu, 23 Mar 2023 20:39:04 +0530
Subject: [PATCH 1/4] Add remote audit logging config features to p2 profiles

---
 modules/p2-profile/product/pom.xml | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/modules/p2-profile/product/pom.xml b/modules/p2-profile/product/pom.xml
index 8f7df3e6f5..f142a34d05 100644
--- a/modules/p2-profile/product/pom.xml
+++ b/modules/p2-profile/product/pom.xml
@@ -577,6 +577,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.tracing.feature:${carbon.apimgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.logging.config.mgt.feature:${carbon.commons.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.logging.viewer.feature:${carbon.commons.version}
                                 </featureArtifactDef>
@@ -823,6 +826,10 @@
                                     <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -1534,6 +1541,10 @@
                                     <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -2151,6 +2162,10 @@
                                     <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -2638,6 +2653,10 @@
                                     <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -3173,6 +3192,10 @@
                                     <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -3655,6 +3678,10 @@
                                     <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -4128,6 +4155,10 @@
                                     <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>

From 11f8bfef33a4822bfb177c2913f7ae513833b019 Mon Sep 17 00:00:00 2001
From: tharikaGitHub <tharika.m92@gmail.com>
Date: Sun, 9 Apr 2023 12:32:05 +0530
Subject: [PATCH 2/4] Change remote logging component names in p2 profiles

---
 modules/p2-profile/product/pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/p2-profile/product/pom.xml b/modules/p2-profile/product/pom.xml
index f142a34d05..6d44d1713a 100644
--- a/modules/p2-profile/product/pom.xml
+++ b/modules/p2-profile/product/pom.xml
@@ -578,7 +578,7 @@
                                     org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.tracing.feature:${carbon.apimgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.commons:org.wso2.carbon.logging.config.mgt.feature:${carbon.commons.version}
+                                    org.wso2.carbon.commons:org.wso2.carbon.logging.remote.config.mgt.feature:${carbon.commons.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.logging.viewer.feature:${carbon.commons.version}
@@ -827,7 +827,7 @@
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
@@ -1542,7 +1542,7 @@
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
@@ -2163,7 +2163,7 @@
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
@@ -2654,7 +2654,7 @@
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
@@ -3193,7 +3193,7 @@
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
@@ -3679,7 +3679,7 @@
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
@@ -4156,7 +4156,7 @@
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.logging.config.mgt.feature.group</id>
+                                    <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
                                 <feature>

From 1154d751344a53f24203a08bfdcf599faf540563 Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Mon, 12 Jun 2023 01:04:54 +0530
Subject: [PATCH 3/4] Install feature to copy the SecuredHttpAppender

---
 modules/p2-profile/product/pom.xml | 31 ++++++++++++++++++++++++++++++
 pom.xml                            |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/modules/p2-profile/product/pom.xml b/modules/p2-profile/product/pom.xml
index 6d44d1713a..8c664b4e46 100644
--- a/modules/p2-profile/product/pom.xml
+++ b/modules/p2-profile/product/pom.xml
@@ -580,6 +580,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.logging.remote.config.mgt.feature:${carbon.commons.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.logging.appender.http.feature:${carbon.commons.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.logging.viewer.feature:${carbon.commons.version}
                                 </featureArtifactDef>
@@ -830,6 +833,10 @@
                                     <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.appender.http.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -1545,6 +1552,10 @@
                                     <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.appender.http.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -2166,6 +2177,10 @@
                                     <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.appender.http.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -2657,6 +2672,10 @@
                                     <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.appender.http.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -3196,6 +3215,10 @@
                                     <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.appender.http.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -3682,6 +3705,10 @@
                                     <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.appender.http.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -4159,6 +4186,10 @@
                                     <id>org.wso2.carbon.logging.remote.config.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.appender.http.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.view.feature.group</id>
                                     <version>${carbon.commons.version}</version>
diff --git a/pom.xml b/pom.xml
index d2f10ea8af..bd12d2ebd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1293,7 +1293,7 @@
 
         <cipher.tool.version>1.1.20</cipher.tool.version>
 
-        <carbon.commons.version>4.9.2</carbon.commons.version>
+        <carbon.commons.version>4.9.4-SNAPSHOT</carbon.commons.version>
         <carbon.kernel.imp.pkg.version>[4.5.0, 5.0.0)</carbon.kernel.imp.pkg.version>
 
         <!-- carbon mediation -->

From bc8fdecb2dbff1716363694a432aa2f4c2b98a38 Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Thu, 18 Jan 2024 10:37:17 +0530
Subject: [PATCH 4/4] Upgrade carbon-commons version

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

diff --git a/pom.xml b/pom.xml
index bd12d2ebd4..ec5f8cfc21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1293,7 +1293,7 @@
 
         <cipher.tool.version>1.1.20</cipher.tool.version>
 
-        <carbon.commons.version>4.9.4-SNAPSHOT</carbon.commons.version>
+        <carbon.commons.version>4.10.7</carbon.commons.version>
         <carbon.kernel.imp.pkg.version>[4.5.0, 5.0.0)</carbon.kernel.imp.pkg.version>
 
         <!-- carbon mediation -->