From 14003c557dd01a2d05cf78ca9f5e279b4deedaee 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

---
 .github/workflows/build.yml |  3 +--
 jollyday-core/pom.xml       |  1 +
 jollyday-jackson/pom.xml    |  2 +-
 jollyday-jaxb/pom.xml       |  2 +-
 jollyday-tests/pom.xml      | 15 +----------
 pom.xml                     | 15 +++++++++--
 report-aggregate/pom.xml    | 54 +++++++++++++++++++++++++++++++++++++
 7 files changed, 72 insertions(+), 20 deletions(-)
 create mode 100644 report-aggregate/pom.xml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f723238c..648fa8b4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,8 +36,7 @@ jobs:
       - name: Analyse with SonarCloud
         if: ${{ github.repository == 'focus-shift/jollyday' && matrix.java == 17 && matrix.os == 'ubuntu-latest' && (github.event_name != 'pull_request' || (github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]')) }}
         run: >
-          ./mvnw -Pcoverage verify
-          sonar:sonar
+          ./mvnw -Pcoverage sonar:sonar
           -Dsonar.host.url=https://sonarcloud.io
           -Dsonar.organization=focus-shift
           -Dsonar.projectKey=focus-shift_jollyday
diff --git a/jollyday-core/pom.xml b/jollyday-core/pom.xml
index 63aefc0f..fe2a1e7d 100644
--- a/jollyday-core/pom.xml
+++ b/jollyday-core/pom.xml
@@ -3,6 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>jollyday-core</artifactId>
+
   <name>Jollyday Core</name>
   <description>
     Core module of the jollyday library that contains the API for the developers and
diff --git a/jollyday-jackson/pom.xml b/jollyday-jackson/pom.xml
index 397f2724..b9d29307 100644
--- a/jollyday-jackson/pom.xml
+++ b/jollyday-jackson/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>jollyday-jackson</artifactId>
-  <name>Jollyday with Jackson</name>
 
+  <name>Jollyday with Jackson</name>
   <description>Jackson based jollyday implementation</description>
 
   <parent>
diff --git a/jollyday-jaxb/pom.xml b/jollyday-jaxb/pom.xml
index 9612cae0..dc725f15 100644
--- a/jollyday-jaxb/pom.xml
+++ b/jollyday-jaxb/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>jollyday-jaxb</artifactId>
-  <name>Jollyday with Jakarta XML Binding (JAXB)</name>
 
+  <name>Jollyday with Jakarta XML Binding (JAXB)</name>
   <description>Jakarta XML Binding (JAXB) based jollyday implementation</description>
 
   <parent>
diff --git a/jollyday-tests/pom.xml b/jollyday-tests/pom.xml
index f79d6784..201f20bc 100644
--- a/jollyday-tests/pom.xml
+++ b/jollyday-tests/pom.xml
@@ -3,6 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>jollyday-tests</artifactId>
+
   <name>Jollyday Tests</name>
 
   <parent>
@@ -93,20 +94,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 6df83fc6..cedbea29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
 
     <!--suppress UnresolvedMavenProperty - for IDEA-->
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${maven.multiModuleProjectDirectory}/jollyday-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/target/site/jacoco-aggregate/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 
@@ -295,7 +295,6 @@
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.11</version>
             <executions>
               <execution>
                 <id>prepare-agent</id>
@@ -303,6 +302,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>
@@ -370,6 +380,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 00000000..a8628b6f
--- /dev/null
+++ b/report-aggregate/pom.xml
@@ -0,0 +1,54 @@
+<?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>0.27.0-SNAPSHOT</version>
+  </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>