From 57b2ca8117d9f5dd97b8c3438cf573eef2288379 Mon Sep 17 00:00:00 2001
From: gsergiu <4517853+gsergiu@users.noreply.github.com>
Date: Thu, 22 Jan 2026 11:50:37 +0100
Subject: [PATCH 1/4] enable jacoco xml aggregation #EA-4270

---
 .github/workflows/readme.txt | 12 +++++++--
 pom.xml                      | 48 +++++++++++++++++++++++++++++++++---
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/readme.txt b/.github/workflows/readme.txt
index 758ec25..30cb45e 100644
--- a/.github/workflows/readme.txt
+++ b/.github/workflows/readme.txt
@@ -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)
diff --git a/pom.xml b/pom.xml
index d0659f1..e327025 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,12 +59,9 @@
         <sonar.organization>europeana</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.exclusions>**/*.gpg,**/*.template</sonar.exclusions>
-        <!-- 
-		SG: not needed in single project	
         <aggregate.report.xml>
-			target/site/jacoco-aggregate/jacoco.xml</aggregate.report.xml>
+			target/site/jacoco/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>
 			${project.build.directory}/spotbugsXml.xml</sonar.java.spotbugs.reportPaths>
@@ -171,8 +168,50 @@
 									<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
+									</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					
+					
+					<!-- plugins that need to be executed only on this module -->
+					<plugin>
+						<groupId>org.jacoco</groupId>
+						<artifactId>jacoco-maven-plugin</artifactId>
+						<version>${jacoco-plugin.version}</version>
+						<executions>
+							<execution>
+								<phase>verify</phase>
+								<goals>
+									<goal>report-aggregate</goal>
+								</goals>
+								<!-- include the reports from exec into the xml report-->
+								<configuration>
+									<dataFileIncludes>
+										<dataFileInclude>**/jacoco.exec</dataFileInclude>
+									</dataFileIncludes>
+									<outputDirectory>
+										${project.reporting.outputDirectory}/jacoco-aggregate
+									</outputDirectory>
+								</configuration>
+							</execution>
 						</executions>
 					</plugin>
+					
+										
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>
@@ -243,6 +282,7 @@
 							</plugins>
 						</configuration>
 					</plugin>
+					
 				</plugins>
 			</build>
 		</profile>

From 6c263f3edcba2eba8abb21a2468de7710d08c477 Mon Sep 17 00:00:00 2001
From: gsergiu <4517853+gsergiu@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:19 +0100
Subject: [PATCH 2/4] merge file

---
 pom.xml | 42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index e327025..8ec232f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,12 +66,7 @@
 		<sonar.java.spotbugs.reportPaths>
 			${project.build.directory}/spotbugsXml.xml</sonar.java.spotbugs.reportPaths>
 		<sonar.cpd.exclusions>**/model/**/*</sonar.cpd.exclusions>
-		
-        <!--Sonar  plugins -->
-		<!-- Exclude POJOs code duplication analysis -->
-		<!-- 
-		<apache.commons.validator.version>1.7</apache.commons.validator.version>
-		-->
+
 		<git-code-format.version>3.1</git-code-format.version>
 		<git-commit-id.version>5.0.0</git-commit-id.version>
 		<surefire.version>3.0.0-M5</surefire.version>
@@ -186,32 +181,19 @@
 						</executions>
 					</plugin>
 					
-					
-					<!-- plugins that need to be executed only on this module -->
+					<!-- run tests -->
 					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>${jacoco-plugin.version}</version>
-						<executions>
-							<execution>
-								<phase>verify</phase>
-								<goals>
-									<goal>report-aggregate</goal>
-								</goals>
-								<!-- include the reports from exec into the xml report-->
-								<configuration>
-									<dataFileIncludes>
-										<dataFileInclude>**/jacoco.exec</dataFileInclude>
-									</dataFileIncludes>
-									<outputDirectory>
-										${project.reporting.outputDirectory}/jacoco-aggregate
-									</outputDirectory>
-								</configuration>
-							</execution>
-						</executions>
-					</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>
 					
-										
+															
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>

From 6cb9581f6cf7eead391aed5a86a3f4f6eacbedd3 Mon Sep 17 00:00:00 2001
From: gsergiu <4517853+gsergiu@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:32:26 +0100
Subject: [PATCH 3/4] try failesafe for code coverage #EA-4270

---
 pom.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pom.xml b/pom.xml
index 8ec232f..b578427 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,6 +193,33 @@
     					</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>

From a304a00332f8a2edb8b0720bfd819571d38f1013 Mon Sep 17 00:00:00 2001
From: gsergiu <4517853+gsergiu@users.noreply.github.com>
Date: Thu, 22 Jan 2026 13:02:51 +0100
Subject: [PATCH 4/4] try with jacoco-aggregate

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b578427..8aae344 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.exclusions>**/*.gpg,**/*.template</sonar.exclusions>
         <aggregate.report.xml>
-			target/site/jacoco/jacoco.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>
@@ -174,7 +174,7 @@
 										<dataFileInclude>**/jacoco.exec</dataFileInclude>
 									</dataFileIncludes>
 									<outputDirectory>
-										${project.reporting.outputDirectory}/jacoco
+										${project.reporting.outputDirectory}/jacoco-aggregate
 									</outputDirectory>
 								</configuration>
 							</execution>