From 361f24c48a673030a3d7bcd1c6c6493658487a51 Mon Sep 17 00:00:00 2001
From: ShammiL <shammi0107@gmail.com>
Date: Tue, 10 Sep 2024 18:10:26 +0530
Subject: [PATCH 1/7] Add code coverage dependencies

---
 .../pom.xml                                   | 10 +++-
 pom.xml                                       | 56 +++++++++++++++++++
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml b/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
index 0c2a8b95c..68e6dfd37 100644
--- a/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
+++ b/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
@@ -48,13 +48,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.4</version>
+            </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
+                <version>2.22.2</version>
                 <inherited>false</inherited>
                 <configuration>
-
-                    <argLine>-Xms512m -Xmx1024m</argLine>
+                    <argLine>${argLine}</argLine>
                     <disableXmlReport>false</disableXmlReport>
                     <parallel>false</parallel>
                     <systemProperties>
diff --git a/pom.xml b/pom.xml
index ad72db824..f947de234 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,6 +232,62 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.8.4</version>
+                    <executions>
+                        <execution>
+                            <id>default-prepare-agent-by-coverage-enforcer</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                            <configuration>
+                                <propertyName>argLine</propertyName>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>default-report-by-coverage-enforcer</id>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/jacoco.exec</dataFile>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>default-check-by-coverage-enforcer</id>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/jacoco.exec</dataFile>
+                                <rules>
+                                    <!-- implementation is needed only for Maven 2 -->
+                                    <rule implementation="org.jacoco.maven.RuleConfiguration">
+                                        <element>BUNDLE</element>
+                                        <limits>
+                                            <!-- implementation is needed only for Maven 2 -->
+                                            <limit implementation="org.jacoco.report.check.Limit">
+                                                <counter>LINE</counter>
+                                                <value>COVEREDRATIO</value>
+                                                <minimum>0.0</minimum>
+                                            </limit>
+                                        </limits>
+                                    </rule>
+                                </rules>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>maven.surefire.plugin.version</version>
+                    <configuration>
+                        <argLine>@{argline} -Xms512m -Xmx1024m</argLine>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>

From 7f9f9be8ad1a78f9cf1b43ac72196190701bbb19 Mon Sep 17 00:00:00 2001
From: ShammiL <shammi0107@gmail.com>
Date: Tue, 10 Sep 2024 18:14:12 +0530
Subject: [PATCH 2/7] Add codecov to PR build

---
 .github/workflows/pull_request_ubuntu_build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/pull_request_ubuntu_build.yml b/.github/workflows/pull_request_ubuntu_build.yml
index 1b101bee8..b206c62fd 100644
--- a/.github/workflows/pull_request_ubuntu_build.yml
+++ b/.github/workflows/pull_request_ubuntu_build.yml
@@ -19,3 +19,8 @@ jobs:
         cache: maven
     - name: Build with Maven
       run: mvn clean install
+    - name: Upload test coverage to Codecov
+      uses: codecov/codecov-action@v4.0.1
+      with:
+        flags: unit_tests
+        token: ${{ secrets.CODECOV_TOKEN }}

From 7b72a17fd8f4b267472a3a8f3638cd492ff05316 Mon Sep 17 00:00:00 2001
From: ShammiL <shammi0107@gmail.com>
Date: Tue, 10 Sep 2024 18:21:12 +0530
Subject: [PATCH 3/7] Downgrade surefire plugin version

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

diff --git a/pom.xml b/pom.xml
index f947de234..319778563 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
         <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
         <maven.resources.plugin.version>3.1.0</maven.resources.plugin.version>
         <maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
-        <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
+        <maven.surefire.plugin.version>2.12.4</maven.surefire.plugin.version>
         <!--<jacoco.maven.plugin.version>0.8.2</jacoco.maven.plugin.version>-->
         <!--<testng.version>6.11</testng.version>-->
         <maven.dependency.plugin.version>3.1.1</maven.dependency.plugin.version>

From 6580a89905ff5616f64168a0322cf3f2cd91a2b1 Mon Sep 17 00:00:00 2001
From: ShammiL <shammi0107@gmail.com>
Date: Tue, 10 Sep 2024 18:26:14 +0530
Subject: [PATCH 4/7] Remove version in module pom

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

diff --git a/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml b/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
index 68e6dfd37..3b3c21930 100644
--- a/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
+++ b/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
@@ -55,7 +55,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+<!--                <version>2.22.2</version>-->
                 <inherited>false</inherited>
                 <configuration>
                     <argLine>${argLine}</argLine>

From ba059ed5644629ac4ce0ff3f39ccb633564c95af Mon Sep 17 00:00:00 2001
From: ShammiL <shammi0107@gmail.com>
Date: Wed, 11 Sep 2024 09:11:54 +0530
Subject: [PATCH 5/7] Revert to prev surefire versions

---
 .../pom.xml                                                     | 2 +-
 pom.xml                                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml b/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
index 3b3c21930..1ae88124e 100644
--- a/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
+++ b/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
@@ -55,7 +55,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-<!--                <version>2.22.2</version>-->
+                <version>2.12.4</version>
                 <inherited>false</inherited>
                 <configuration>
                     <argLine>${argLine}</argLine>
diff --git a/pom.xml b/pom.xml
index 319778563..f947de234 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
         <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
         <maven.resources.plugin.version>3.1.0</maven.resources.plugin.version>
         <maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
-        <maven.surefire.plugin.version>2.12.4</maven.surefire.plugin.version>
+        <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
         <!--<jacoco.maven.plugin.version>0.8.2</jacoco.maven.plugin.version>-->
         <!--<testng.version>6.11</testng.version>-->
         <maven.dependency.plugin.version>3.1.1</maven.dependency.plugin.version>

From 6d4b483c54a0a440eef9505fde8060c6134993b3 Mon Sep 17 00:00:00 2001
From: ShammiL <shammi0107@gmail.com>
Date: Wed, 11 Sep 2024 09:39:07 +0530
Subject: [PATCH 6/7] Enable inheriting for surefire

---
 .../pom.xml                                                   | 4 ++--
 pom.xml                                                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml b/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
index 1ae88124e..457bbe0b6 100644
--- a/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
+++ b/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
@@ -55,8 +55,8 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
-                <inherited>false</inherited>
+                <version>2.22.2</version>
+<!--                <inherited>false</inherited>-->
                 <configuration>
                     <argLine>${argLine}</argLine>
                     <disableXmlReport>false</disableXmlReport>
diff --git a/pom.xml b/pom.xml
index f947de234..4c0a91933 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,7 +283,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>maven.surefire.plugin.version</version>
+                    <version>2.22.2</version>
                     <configuration>
                         <argLine>@{argline} -Xms512m -Xmx1024m</argLine>
                     </configuration>

From 918f69c04ad47ad690846ccfa81a3ddca23b8249 Mon Sep 17 00:00:00 2001
From: ShammiL <shammi0107@gmail.com>
Date: Wed, 11 Sep 2024 12:32:32 +0530
Subject: [PATCH 7/7] Remove surefire plugin inheriting config

---
 .../pom.xml                                                      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml b/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
index 457bbe0b6..2368c0004 100644
--- a/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
+++ b/monitoring-dashboard/integration/org.wso2.micro.integrator.dashboard.integration.tests/pom.xml
@@ -56,7 +56,6 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
-<!--                <inherited>false</inherited>-->
                 <configuration>
                     <argLine>${argLine}</argLine>
                     <disableXmlReport>false</disableXmlReport>