Skip to content

enable jacoco xml aggregation #EA-4270 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gsergiu merged 6 commits into from
Jan 22, 2026
Merged

enable jacoco xml aggregation #EA-4270 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57b2ca8
enable jacoco xml aggregation #EA-4270
gsergiu Jan 22, 2026
00d7bb3
Merge branch 'master' into EA-4270_optimise_Client
gsergiu Jan 22, 2026
6c263f3
merge file
gsergiu Jan 22, 2026
031108e
Merge branch 'EA-4270_optimise_Client' of https://github.com/european…
gsergiu Jan 22, 2026
6cb9581
try failesafe for code coverage #EA-4270
gsergiu Jan 22, 2026
a304a00
try with jacoco-aggregate
gsergiu Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,17 @@ gpg --symmetric --cipher-algo AES256 entity-client.properties
B - Use Encrypted Properties
1. Create & configure decrypt script (decrypt_config.sh)
1.1 ensure executions rights before committing to github:
# on linux
chmod +x ./.github/workflows/decrypt_config.sh

#on Windows cygwin or WSL or Git Bash can be used
chmod +x decrypt_config.sh
ls -l decrypt_config.sh
git add --chmod=+x ./.github/workflows/decrypt_config.sh
#if the file was allready added to git, use the following
#git update-index --chmod=+x ./.github/workflows/decrypt_config.sh
#verify execution permissions
git ls-files --stage
1.2 commit file to gihub
git commit -m"Executable script!"

2. Ensure that the application is able to load properties from external file and that the decripted properties file matches the location from which the app is loading properties
3. Update Github Workflow to run decrypt script (NOTE: secrets.CLIENT_PROPS_PASS is the name of the secret in Github secrets see Settings-> Secrets and Variables -> Actions -> Secrets)
Expand Down
61 changes: 59 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
<sonar.organization>europeana</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.exclusions>**/*.gpg,**/*.template</sonar.exclusions>

<aggregate.report.xml>target/site/jacoco-aggregate/jacoco.xml</aggregate.report.xml>
<aggregate.report.xml>
target/site/jacoco-aggregate/jacoco.xml</aggregate.report.xml>
<sonar.coverage.jacoco.xmlReportPaths>${aggregate.report.xml}</sonar.coverage.jacoco.xmlReportPaths>
<sonar.java.pmd.reportPaths>${project.build.directory}/pmd.xml</sonar.java.pmd.reportPaths>
<sonar.java.spotbugs.reportPaths>
Expand Down Expand Up @@ -163,8 +163,64 @@
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<phase>verify</phase>
<goals>
<goal>report-aggregate</goal>
</goals>
<!-- include the reports from all modules into the aggegated report (only in this module)-->
<configuration>
<dataFileIncludes>
<dataFileInclude>**/jacoco.exec</dataFileInclude>
</dataFileIncludes>
<outputDirectory>
${project.reporting.outputDirectory}/jacoco-aggregate
</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>

<!-- run tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
<includes>
<include>**/*Test.java</include>
</includes>
</configuration>
</plugin>

<!-- try failsafe for coverage data-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>

<!-- useModulePath = false Fixes Integration test not
finding beans. May
be
removed with 3.0.0-M6 is available
See: https://stackoverflow.com/a/65806777/14530159 -->
<configuration>
<useModulePath>false</useModulePath>
<includes>
<include>**/*Test.java</include>
</includes>
</configuration>

</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
Expand Down Expand Up @@ -235,6 +291,7 @@
</plugins>
</configuration>
</plugin>

</plugins>
</build>
</profile>
Expand Down