fix pom and ci

Author: cx-itay-paz

.github/workflows/ci.yml

@@ -68,50 +68,14 @@ jobs:
           CX_TENANT: ${{ secrets.CX_TENANT }}
           CX_APIKEY: ${{ secrets.CX_APIKEY }}
 
-      - name: Print filtered coverage percentage
+      - name: Print total coverage percentage
         run: |
-          COVERED_LINES=$(xmllint --xpath "sum(//report/package[
-            not(starts-with(@name, 'com.checkmarx.ast.results')) and
-            not(starts-with(@name, 'com.checkmarx.ast.kicsRealtimeResults')) and
-            not(starts-with(@name, 'com.checkmarx.ast.asca')) and
-            not(starts-with(@name, 'com.checkmarx.ast.learnMore')) and
-            not(starts-with(@name, 'com.checkmarx.ast.predicate')) and
-            not(starts-with(@name, 'com.checkmarx.ast.scan')) and
-            not(starts-with(@name, 'com.checkmarx.ast.codebashing')) and
-            not(starts-with(@name, 'com.checkmarx.ast.remediation')) and
-            not(starts-with(@name, 'com.checkmarx.ast.project')) and
-            not(starts-with(@name, 'com.checkmarx.ast.tenant')) and
-            not(starts-with(@name, 'com.checkmarx.ast.wrapper.Execution'))
-          ]/counter[@type='LINE']/@covered)" target/site/jacoco/jacoco.xml)
-
-          MISSED_LINES=$(xmllint --xpath "sum(//report/package[
-            not(starts-with(@name, 'com.checkmarx.ast.results')) and
-            not(starts-with(@name, 'com.checkmarx.ast.kicsRealtimeResults')) and
-            not(starts-with(@name, 'com.checkmarx.ast.asca')) and
-            not(starts-with(@name, 'com.checkmarx.ast.learnMore')) and
-            not(starts-with(@name, 'com.checkmarx.ast.predicate')) and
-            not(starts-with(@name, 'com.checkmarx.ast.scan')) and
-            not(starts-with(@name, 'com.checkmarx.ast.codebashing')) and
-            not(starts-with(@name, 'com.checkmarx.ast.remediation')) and
-            not(starts-with(@name, 'com.checkmarx.ast.project')) and
-            not(starts-with(@name, 'com.checkmarx.ast.tenant')) and
-            not(starts-with(@name, 'com.checkmarx.ast.wrapper.Execution'))
-          ]/counter[@type='LINE']/@missed)" target/site/jacoco/jacoco.xml)
-
-          if [ -z "$COVERED_LINES" ] || [ -z "$MISSED_LINES" ]; then
-            echo "Error: Could not extract coverage data from jacoco.xml"
-            exit 1
-          fi
-
+          COVERED_LINES=$(xmllint --xpath "string(//report/counter[@type='LINE']/@covered)" target/site/jacoco/jacoco.xml)
+          MISSED_LINES=$(xmllint --xpath "string(//report/counter[@type='LINE']/@missed)" target/site/jacoco/jacoco.xml)
           TOTAL_LINES=$((COVERED_LINES + MISSED_LINES))
-
-          if [ "$TOTAL_LINES" -eq 0 ]; then
-            COVERAGE_PERCENTAGE=0
-          else
-            COVERAGE_PERCENTAGE=$(echo "scale=2; $COVERED_LINES / $TOTAL_LINES * 100" | bc)
-          fi
-
-          echo "Filtered coverage percentage: $COVERAGE_PERCENTAGE%"
+          COVERAGE_PERCENTAGE=$(echo "scale=2; $COVERED_LINES / $TOTAL_LINES * 100" | bc)
+          echo "Total coverage percentage: $COVERAGE_PERCENTAGE%"
+      
 
 
 

pom.xml

@@ -65,9 +65,24 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.8.8</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/com/checkmarx/ast/results/**</exclude>
+                        <exclude>**/com/checkmarx/ast/kicsRealtimeResults/**</exclude>
+                        <exclude>**/com/checkmarx/ast/asca/**</exclude>
+                        <exclude>**/com/checkmarx/ast/learnMore/**</exclude>
+                        <exclude>**/com/checkmarx/ast/predicate/**</exclude>
+                        <exclude>**/com/checkmarx/ast/scan/**</exclude>
+                        <exclude>**/com/checkmarx/ast/codebashing/**</exclude>
+                        <exclude>**/com/checkmarx/ast/remediation/**</exclude>
+                        <exclude>**/com/checkmarx/ast/project/**</exclude>
+                        <exclude>**/com/checkmarx/ast/tenant/**</exclude>
+                        <exclude>**/com/checkmarx/ast/wrapper/Execution**</exclude>
+                        <!-- Add other patterns as needed -->
+                    </excludes>
+                </configuration>
                 <executions>
                     <execution>
-                        <id>prepare-agent</id>
                         <goals>
                             <goal>prepare-agent</goal>
                         </goals>
@@ -78,23 +93,6 @@
                         <goals>
                             <goal>report</goal>
                         </goals>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/com/checkmarx/ast/results/**</exclude>
-                                <exclude>**/com/checkmarx/ast/kicsRealtimeResults/**</exclude>
-                                <exclude>**/com/checkmarx/ast/asca/**</exclude>
-                                <exclude>**/com/checkmarx/ast/learnMore/**</exclude>
-                                <exclude>**/com/checkmarx/ast/predicate/**</exclude>
-                                <exclude>**/com/checkmarx/ast/scan/**</exclude>
-                                <exclude>**/com/checkmarx/ast/codebashing/**</exclude>
-                                <exclude>**/com/checkmarx/ast/remediation/**</exclude>
-                                <exclude>**/com/checkmarx/ast/project/**</exclude>
-                                <exclude>**/com/checkmarx/ast/tenant/**</exclude>
-                                <exclude>**/com/checkmarx/ast/wrapper/Execution**</exclude>
-                            </excludes>
-
-
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>