Add aggregation module

.gitlab-ci.yml

@@ -23,6 +23,7 @@ stages:          # List of stages for jobs, and their order of execution
   - build-docker
   - test-backend
   - test-ui
+  - visualization
 
 
 include:
@@ -89,6 +90,28 @@ build-maven-job:
         - "*/target/surefire-reports/TEST-*.xml"
         #        - "*/target/failsafe-reports/TEST-*.xml"
 
+code-coverage-visualization:
+  # Must be in a stage later than build-maven-job's stage.
+  stage: visualization
+  image: registry.gitlab.com/haynes/jacoco2cobertura:1.0.7
+  tags:
+    - cq-sans-dind     # Set this job to only run on our new specialized runner
+  script:
+    # convert report from jacoco to cobertura, using relative project path
+    # find all modules containing java source files.
+    - mkdir -p target/site/
+    - jacoco_paths=`find * -path "**/src/main/java" -type d | sed -e 's@^@'"$CI_PROJECT_DIR"'/@'`
+    - echo "jacocopaths -> $jacoco_paths"
+    - python /opt/cover2cover.py smp-aggregator/target/site/jacoco-aggregate/index.html $jacoco_paths > target/site/cobertura.xml
+  needs: ["build-maven-job"]
+  dependencies:
+    - build-maven-job
+
+  artifacts:
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: target/site/cobertura.xml
 
 
 # This job executed docker image build (and pushes them to repo)
@@ -159,5 +182,5 @@ test-ui-tomcat-mysql-sml-job:
     expire_in: 1 week
     name: "ui-report"
     paths:
-      - target/surefire-reports/*
+      - target/*
 

pom.xml

@@ -28,6 +28,7 @@
         <module>smp-webapp</module>
         <module>smp-soapui-tests</module>
         <module>smp-examples</module>
+        <module>smp-aggregator</module>
     </modules>
 
     <properties>
@@ -659,7 +660,7 @@
                     </execution>
                     <execution>
                         <id>report</id>
-                        <phase>verify</phase>
+                        <phase>package</phase>
                         <goals>
                             <goal>report</goal>
                         </goals>

smp-aggregator/pom.xml

+<?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">
+    <parent>
+        <artifactId>smp-modules</artifactId>
+        <groupId>eu.europa.ec.edelivery</groupId>
+        <version>5.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>smp-aggregator</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>eu.europa.ec.edelivery</groupId>
+            <artifactId>smp-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>eu.europa.ec.edelivery</groupId>
+            <artifactId>smp-spi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>eu.europa.ec.edelivery</groupId>
+            <artifactId>smp-server-library</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>eu.europa.ec.edelivery</groupId>
+            <artifactId>smp</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <!-- jacoco start -->
+            <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>
\ No newline at end of file

smp-docker/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>4.2-RC2-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>

smp-wls-deploy/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>4.2-RC2-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>smp-wls-deploy</artifactId>