From 6ca9c8f019b8f6ff8d7425b298029ad31526fe0a Mon Sep 17 00:00:00 2001
From: Tobias Schneider <Tobias.Schneider@Tobsch.org>
Date: Fri, 12 Jan 2024 14:35:29 +0100
Subject: [PATCH] Fix sonar coverage

---
 jollyday-tests/pom.xml   | 14 ----------
 pom.xml                  | 23 +++++++++++++++--
 report-aggregate/pom.xml | 55 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 16 deletions(-)
 create mode 100644 report-aggregate/pom.xml

diff --git a/jollyday-tests/pom.xml b/jollyday-tests/pom.xml
index cd40846ba..5379775b4 100644
--- a/jollyday-tests/pom.xml
+++ b/jollyday-tests/pom.xml
@@ -93,20 +93,6 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>report</id>
-            <goals>
-              <goal>report-aggregate</goal>
-            </goals>
-            <phase>verify</phase>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index a1eb40b3e..2c247f889 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,9 +44,8 @@
     <jqwik.version>1.9.2</jqwik.version>
     <jmh.version>1.37</jmh.version>
 
-    <!--suppress UnresolvedMavenProperty - for IDEA-->
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${maven.multiModuleProjectDirectory}/jollyday-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${maven.multiModuleProjectDirectory}/report-aggregate/target/site/jacoco-aggregate/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
     <sonar.java.source>
       ${java.version}
@@ -190,6 +189,14 @@
           <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>
+          </executions>
         </plugin>
 
         <plugin>
@@ -305,6 +312,17 @@
                   <goal>prepare-agent</goal>
                 </goals>
               </execution>
+              <execution>
+                <id>report</id>
+                <goals>
+                  <goal>report</goal>
+                </goals>
+                <configuration>
+                  <formats>
+                    <format>XML</format>
+                  </formats>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
         </plugins>
@@ -372,6 +390,7 @@
       </activation>
       <modules>
         <module>jollyday-tests</module>
+        <module>report-aggregate</module>
       </modules>
     </profile>
 
diff --git a/report-aggregate/pom.xml b/report-aggregate/pom.xml
new file mode 100644
index 000000000..4ae6fca8d
--- /dev/null
+++ b/report-aggregate/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>pom</packaging>
+
+  <artifactId>report-aggregate</artifactId>
+  <name>Aggregate Coverage Report</name>
+
+  <description>Aggregate Coverage Report</description>
+
+  <parent>
+    <groupId>de.focus-shift</groupId>
+    <artifactId>jollyday</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>de.focus-shift</groupId>
+      <artifactId>jollyday-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>de.focus-shift</groupId>
+      <artifactId>jollyday-jackson</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>de.focus-shift</groupId>
+      <artifactId>jollyday-jaxb</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>report-aggregate</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>report-aggregate</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>