From cfc5bc3ec4f56547eee78d889801672b6a016d37 Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Fri, 21 Oct 2022 19:21:32 +0200
Subject: [PATCH] Fix JaCoCo & SonarCloud config

---
 backend/pom.xml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 70e9ff3..f111a1a 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -16,7 +16,10 @@
         <java.version>18</java.version>
 
         <sonar.projectKey>grimsi_gameyfin</sonar.projectKey>
-        <sonar.coverage.jacoco.xmlReportPaths>./backend/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+        <sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
+        <sonar.language>java</sonar.language>
 
         <springdoc-openapi-ui.version>1.6.11</springdoc-openapi-ui.version>
         <resilience4j.version>1.7.1</resilience4j.version>
@@ -26,6 +29,7 @@
         <protobuf-java.version>3.21.7</protobuf-java.version>
         <easy-random.version>5.0.0</easy-random.version>
         <easy-random-protobuf.version>0.4.0</easy-random-protobuf.version>
+        <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
 
         <!-- Use older version because the newer versions have problems with non-ASCII characters in properties files (umlauts etc.) -->
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
@@ -262,14 +266,20 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>${jacoco-maven-plugin.version}</version>
                 <executions>
                     <execution>
-                        <id>report</id>
+                        <id>jacoco-initialize</id>
                         <goals>
-                            <goal>report-aggregate</goal>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-site</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>report</goal>
                         </goals>
-                        <phase>verify</phase>
                     </execution>
                 </executions>
             </plugin>