From fc5643dee4195e2866ca8bff917ed0734fcd13bd Mon Sep 17 00:00:00 2001
From: prathabanKavin <kavinprathaban025@gmail.com>
Date: Tue, 22 Oct 2024 00:41:32 +0530
Subject: [PATCH] Fix issues

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

diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml
index 93bc5da774..abbcaa0aed 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml
@@ -38,25 +38,26 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
-                </configuration>
+                <version>${jacoco.maven.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>jacoco-initialize</id>
                         <goals>
                             <goal>prepare-agent</goal>
                         </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/jacoco-unit.exec</destFile> <!-- Use standard target path -->
+                        </configuration>
                     </execution>
                     <execution>
-                        <id>jacoco-site</id>
-                        <phase>test</phase>
+                        <id>jacoco-report</id>
+                        <phase>prepare-package</phase> <!-- Changed phase to prepare-package to ensure exec is generated before reporting -->
                         <goals>
                             <goal>report</goal>
                         </goals>
                         <configuration>
-                            <dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
-                            <outputDirectory>${basedir}/target/coverage-reports/site</outputDirectory>
+                            <dataFile>${project.build.directory}/jacoco-unit.exec</dataFile>
+                            <outputDirectory>${project.build.directory}/coverage-reports/site</outputDirectory> <!-- Adjusted to standard output path -->
                         </configuration>
                     </execution>
                 </executions>
diff --git a/pom.xml b/pom.xml
index fb52435a97..4b90c893b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2069,26 +2069,25 @@
                     <artifactId>jacoco-maven-plugin</artifactId>
                     <version>${jacoco.maven.plugin.version}</version>
                     <executions>
-                        <!-- Prepares the JaCoCo agent for code coverage -->
                         <execution>
                             <id>prepare-agent</id>
                             <goals>
                                 <goal>prepare-agent</goal>
                             </goals>
                             <configuration>
-                                <destFile>${basedir}/target/coverage-reports/jacoco-ut.exec</destFile>
+                                <destFile>${basedir}/target/coverage-reports/jacoco-aggregate.exec</destFile>
                                 <append>true</append>
                             </configuration>
                         </execution>
-                        <!-- Post-execution: generates the JaCoCo report -->
                         <execution>
-                            <id>report</id>
+                            <id>report-aggregate</id>
+                            <phase>verify</phase> <!-- Or another phase as needed -->
                             <goals>
-                                <goal>report</goal>
+                                <goal>report-aggregate</goal>
                             </goals>
                             <configuration>
-                                <dataFile>${basedir}/target/coverage-reports/jacoco-ut.exec</dataFile>
-                                <outputDirectory>${basedir}/target/site/jacoco</outputDirectory>
+                                <outputDirectory>${project.build.directory}/site/jacoco</outputDirectory>
+                                <!-- No dataFile needed here -->
                             </configuration>
                         </execution>
                     </executions>