fix: sonar

Author: JulienMessageIppon

.github/workflows/sonarcloud.yml

@@ -33,7 +33,14 @@ jobs:
           restore-keys: ${{ runner.os }}-sonar
 
       - name: Build and test (generate JaCoCo)
-        run: mvn -B -DskipTests=false verify
+        run: mvn -B verify -Djacoco.skip=false
+
+      #      - name: Generate combined report
+      #        run: |
+      #          mkdir -p target/jacoco-merged
+      #          cp domain/target/jacoco.exec target/jacoco-merged/domain.exec
+      #          cp infrastructure/target/jacoco.exec target/jacoco-merged/infra.exec
+      #          mvn jacoco:merge -DfileSets=target/jacoco-merged
 
       - name: SonarCloud analyze (push) - non-blocking
         if: github.event_name != 'pull_request'
@@ -45,7 +52,7 @@ jobs:
           -Dsonar.host.url=https://sonarcloud.io
           -Dsonar.organization=${{ vars.SONAR_ORG }}
           -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }}
-          -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml
+          -Dsonar.coverage.jacoco.xmlReportPaths=target/domain/site/jacoco-aggregate/jacoco.xml
           -Dsonar.qualitygate.wait=false
 
       - name: SonarCloud analyze
@@ -58,5 +65,5 @@ jobs:
           -Dsonar.host.url=https://sonarcloud.io
           -Dsonar.organization=${{ vars.SONAR_ORG }}
           -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }}
-          -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml
+          -Dsonar.coverage.jacoco.xmlReportPaths=target/domain/site/jacoco-aggregate/jacoco.xml
           -Dsonar.qualitygate.wait=true

pom.xml

@@ -51,38 +51,35 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.5.2</version>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.12</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>report-aggregate</goal>
+                        </goals>
+                        <configuration>
+                            <dataFileIncludes>
+                                <dataFileInclude>**/jacoco.exec</dataFileInclude>
+                            </dataFileIncludes>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-aggregate</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>coverage</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>prepare-agent</id>
-                                <goals>
-                                    <goal>prepare-agent</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>report</id>
-                                <phase>prepare-package</phase>
-                                <goals>
-                                    <goal>report</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <dependencyManagement>
         <dependencies>
             <dependency>