From e7478e1534aa55e8e773ced0640e7875f2d736b6 Mon Sep 17 00:00:00 2001
From: Marvin Lindner <marvin.lindner@sap.com>
Date: Mon, 9 Mar 2026 17:10:25 +0100
Subject: [PATCH 1/3] add coverage module

---
 coverage-report/pom.xml       | 176 ++++++++++++++++++++++++++++++++++
 integration-tests/srv/pom.xml |  12 +++
 pom.xml                       |   4 +-
 3 files changed, 191 insertions(+), 1 deletion(-)
 create mode 100644 coverage-report/pom.xml

diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
new file mode 100644
index 000000000..e56a67f6e
--- /dev/null
+++ b/coverage-report/pom.xml
@@ -0,0 +1,176 @@
+<?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>
+
+  <parent>
+    <groupId>com.sap.cds</groupId>
+    <artifactId>cds-feature-attachments-root</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <artifactId>cds-feature-attachments-coverage-report</artifactId>
+  <packaging>pom</packaging>
+
+  <name>CDS Feature for Attachments - Coverage Report</name>
+  <description>Aggregated JaCoCo coverage report combining unit tests and integration tests.</description>
+
+  <!-- Dependencies whose coverage data and classes are included in the aggregated report -->
+  <dependencies>
+    <!-- Source module to measure coverage for -->
+    <dependency>
+      <groupId>com.sap.cds</groupId>
+      <artifactId>cds-feature-attachments</artifactId>
+    </dependency>
+
+    <!-- Module that produces additional coverage data via @SpringBootTest -->
+    <dependency>
+      <groupId>com.sap.cds.integration-tests</groupId>
+      <artifactId>cds-feature-attachments-integration-tests-srv</artifactId>
+      <version>${revision}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- Do not deploy this module -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+
+      <!-- Skip static analysis — this module has no source code -->
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+
+      <!--
+        Copy core module's compiled classes into this module's target/classes.
+        This uses the exact same class files that were instrumented at runtime,
+        avoiding JaCoCo "classes do not match" warnings that occur when
+        unpacking from the JAR artifact.
+      -->
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.3.1</version>
+        <executions>
+          <execution>
+            <id>copy-core-classes</id>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>generate-resources</phase>
+            <configuration>
+              <outputDirectory>${project.build.directory}/classes</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${project.basedir}/../cds-feature-attachments/target/classes</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <executions>
+          <!-- Aggregate HTML/XML/CSV report from all dependency modules -->
+          <execution>
+            <id>jacoco-aggregate-report</id>
+            <goals>
+              <goal>report-aggregate</goal>
+            </goals>
+            <phase>verify</phase>
+            <configuration>
+              <dataFileExcludes>
+                <dataFileExclude>**/integration-tests/db/**</dataFileExclude>
+              </dataFileExcludes>
+            </configuration>
+          </execution>
+
+          <!-- Merge .exec files from unit tests and integration tests into one -->
+          <execution>
+            <id>jacoco-merge</id>
+            <goals>
+              <goal>merge</goal>
+            </goals>
+            <phase>verify</phase>
+            <configuration>
+              <fileSets>
+                <fileSet>
+                  <directory>${project.basedir}/../cds-feature-attachments/target</directory>
+                  <includes>
+                    <include>jacoco.exec</include>
+                  </includes>
+                </fileSet>
+                <fileSet>
+                  <directory>${project.basedir}/../integration-tests/srv/target</directory>
+                  <includes>
+                    <include>jacoco.exec</include>
+                  </includes>
+                </fileSet>
+              </fileSets>
+              <destFile>${project.build.directory}/jacoco-merged.exec</destFile>
+            </configuration>
+          </execution>
+
+          <!-- Enforce coverage thresholds on the merged data -->
+          <execution>
+            <id>jacoco-check-aggregated</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>verify</phase>
+            <configuration>
+              <dataFile>${project.build.directory}/jacoco-merged.exec</dataFile>
+              <excludes>
+                <exclude>${excluded.generation.package}**/*</exclude>
+              </excludes>
+              <rules>
+                <rule implementation="org.jacoco.maven.RuleConfiguration">
+                  <element>BUNDLE</element>
+                  <limits>
+                    <limit implementation="org.jacoco.report.check.Limit">
+                      <counter>INSTRUCTION</counter>
+                      <value>COVEREDRATIO</value>
+                      <minimum>0.95</minimum>
+                    </limit>
+                    <limit implementation="org.jacoco.report.check.Limit">
+                      <counter>BRANCH</counter>
+                      <value>COVEREDRATIO</value>
+                      <minimum>0.95</minimum>
+                    </limit>
+                    <limit implementation="org.jacoco.report.check.Limit">
+                      <counter>COMPLEXITY</counter>
+                      <value>COVEREDRATIO</value>
+                      <minimum>0.95</minimum>
+                    </limit>
+                    <limit implementation="org.jacoco.report.check.Limit">
+                      <counter>CLASS</counter>
+                      <value>MISSEDCOUNT</value>
+                      <maximum>0</maximum>
+                    </limit>
+                  </limits>
+                </rule>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/integration-tests/srv/pom.xml b/integration-tests/srv/pom.xml
index 6a5b6eada..74f49e35b 100644
--- a/integration-tests/srv/pom.xml
+++ b/integration-tests/srv/pom.xml
@@ -115,6 +115,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>jacoco-initialize</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index c36d8cb82..506884b86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
     <module>storage-targets/cds-feature-attachments-fs</module>
     <module>storage-targets/cds-feature-attachments-oss</module>
     <module>integration-tests</module>
+    <module>coverage-report</module>
   </modules>
 
   <scm>
@@ -406,6 +407,7 @@
                 <excludeArtifact>cds-feature-attachments-integration-tests-parent</excludeArtifact>
                 <excludeArtifact>cds-feature-attachments-integration-tests-db</excludeArtifact>
                 <excludeArtifact>cds-feature-attachments-integration-tests-srv</excludeArtifact>
+                <excludeArtifact>cds-feature-attachments-coverage-report</excludeArtifact>
               </excludeArtifacts>
             </configuration>
           </plugin>
@@ -418,7 +420,7 @@
         <module>cds-feature-attachments</module>
         <module>storage-targets/cds-feature-attachments-fs</module>
         <module>storage-targets/cds-feature-attachments-oss</module>
-        <!-- Exclude integration-tests modules -->
+        <!-- Exclude integration-tests and coverage-report modules -->
       </modules>
     </profile>
   </profiles>

From 8b66bcb8a57892f7808714ea4383c5d953d4c4c9 Mon Sep 17 00:00:00 2001
From: Marvin Lindner <marvin.lindner@sap.com>
Date: Mon, 9 Mar 2026 17:10:31 +0100
Subject: [PATCH 2/3] add sonarqube support

---
 .github/actions/scan-with-sonar/action.yml | 11 +++++++----
 .pipeline/config.yml                       |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/actions/scan-with-sonar/action.yml b/.github/actions/scan-with-sonar/action.yml
index 092254339..cdc4f8b34 100644
--- a/.github/actions/scan-with-sonar/action.yml
+++ b/.github/actions/scan-with-sonar/action.yml
@@ -43,9 +43,7 @@ runs:
 
     - name: Build project for SonarQube scan
       run: |
-        mvn clean verify -ntp -B \
-          -pl cds-feature-attachments,storage-targets/cds-feature-attachments-fs,storage-targets/cds-feature-attachments-oss \
-          -am
+        mvn clean verify -ntp -B
       shell: bash
 
     - name: Verify JaCoCo reports exist
@@ -59,6 +57,11 @@ runs:
             echo "Missing: $module/target/site/jacoco/jacoco.xml"
           fi
         done
+        if [ -f "coverage-report/target/site/jacoco-aggregate/jacoco.xml" ]; then
+          echo "Found: coverage-report/target/site/jacoco-aggregate/jacoco.xml"
+        else
+          echo "Missing: coverage-report/target/site/jacoco-aggregate/jacoco.xml"
+        fi
       shell: bash
 
     - name: SonarQube Scan
@@ -70,4 +73,4 @@ runs:
           --githubToken=${{ inputs.github-token }}
           --version=${{ steps.get-revision.outputs.REVISION }}
           --inferJavaBinaries=true
-          --options=-Dsonar.exclusions=**/samples/**,-Dsonar.coverage.jacoco.xmlReportPaths=cds-feature-attachments/target/site/jacoco/jacoco.xml,storage-targets/cds-feature-attachments-fs/target/site/jacoco/jacoco.xml,storage-targets/cds-feature-attachments-oss/target/site/jacoco/jacoco.xml
\ No newline at end of file
+          --options=-Dsonar.exclusions=**/samples/**,-Dsonar.coverage.jacoco.xmlReportPaths=cds-feature-attachments/target/site/jacoco/jacoco.xml,storage-targets/cds-feature-attachments-fs/target/site/jacoco/jacoco.xml,storage-targets/cds-feature-attachments-oss/target/site/jacoco/jacoco.xml,coverage-report/target/site/jacoco-aggregate/jacoco.xml
\ No newline at end of file
diff --git a/.pipeline/config.yml b/.pipeline/config.yml
index aa968f3c7..1f85e8b3d 100644
--- a/.pipeline/config.yml
+++ b/.pipeline/config.yml
@@ -36,7 +36,7 @@ steps:
       - sonar.java.source=17
       - sonar.exclusions=**/node_modules/**,**/target/**,**/test/**
       - sonar.modules=cds-feature-attachments,cds-feature-attachments-fs,cds-feature-attachments-oss
-      - sonar.coverage.jacoco.xmlReportPaths=cds-feature-attachments/target/site/jacoco/jacoco.xml,storage-targets/cds-feature-attachments-fs/target/site/jacoco/jacoco.xml,storage-targets/cds-feature-attachments-oss/target/site/jacoco/jacoco.xml
+      - sonar.coverage.jacoco.xmlReportPaths=cds-feature-attachments/target/site/jacoco/jacoco.xml,storage-targets/cds-feature-attachments-fs/target/site/jacoco/jacoco.xml,storage-targets/cds-feature-attachments-oss/target/site/jacoco/jacoco.xml,coverage-report/target/site/jacoco-aggregate/jacoco.xml
       - sonar.coverage.exclusions=cds-feature-attachments/src/test/**,cds-feature-attachments/src/gen/**,storage-targets/cds-feature-attachments-fs/src/test/**,storage-targets/cds-feature-attachments-oss/src/test/**
       - cds-feature-attachments.sonar.projectBaseDir=cds-feature-attachments
       - cds-feature-attachments.sonar.sources=src/main/java

From 345ce20c95c0a4d246a26fb0246bca820dbb60c5 Mon Sep 17 00:00:00 2001
From: Marvin Lindner <marvin.lindner@sap.com>
Date: Mon, 9 Mar 2026 17:18:10 +0100
Subject: [PATCH 3/3] adress suggestions

---
 coverage-report/pom.xml | 6 ------
 pom.xml                 | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
index e56a67f6e..234149877 100644
--- a/coverage-report/pom.xml
+++ b/coverage-report/pom.xml
@@ -26,7 +26,6 @@
     <dependency>
       <groupId>com.sap.cds.integration-tests</groupId>
       <artifactId>cds-feature-attachments-integration-tests-srv</artifactId>
-      <version>${revision}</version>
     </dependency>
   </dependencies>
 
@@ -94,11 +93,6 @@
               <goal>report-aggregate</goal>
             </goals>
             <phase>verify</phase>
-            <configuration>
-              <dataFileExcludes>
-                <dataFileExclude>**/integration-tests/db/**</dataFileExclude>
-              </dataFileExcludes>
-            </configuration>
           </execution>
 
           <!-- Merge .exec files from unit tests and integration tests into one -->
diff --git a/pom.xml b/pom.xml
index 506884b86..157f3ad49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,12 @@
         <artifactId>cds-feature-attachments</artifactId>
         <version>${revision}</version>
       </dependency>
+
+      <dependency>
+        <groupId>com.sap.cds.integration-tests</groupId>
+        <artifactId>cds-feature-attachments-integration-tests-srv</artifactId>
+        <version>${revision}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>