From 91ba8a6c4af9f18e623297d60d5535cca0dd8b0a Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Fri, 21 Oct 2022 18:54:22 +0200
Subject: [PATCH] Add test coverage to CI

---
 backend/pom.xml          | 15 +++++++++++----
 pom.xml                  |  5 -----
 sonar-project.properties |  5 -----
 3 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 100644 sonar-project.properties

diff --git a/backend/pom.xml b/backend/pom.xml
index 5247c41..3c8d4c8 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -23,6 +23,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>
@@ -259,14 +260,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>
diff --git a/pom.xml b/pom.xml
index d8f8f43..bd29ecd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,13 +30,8 @@
     </scm>
   
     <properties>
-        <sonar.organization>grimsi-github</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-    </properties>
-
-    <properties>
         <sonar.organization>grimsi-github</sonar.organization>
-        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
 
     <build>
diff --git a/sonar-project.properties b/sonar-project.properties
deleted file mode 100644
index 94f3f62..0000000
--- a/sonar-project.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# Point SONAR to the compiled Java classes
-sonar.java.binaries=./backend/target
-
-# Point SONAR to the JaCoCo report
-sonar.coverage.jacoco.xmlReportPaths=./backend/target/site/jacoco-aggregate/jacoco.xml