diff --git a/README.adoc b/README.adoc
index 7758acdf5f..2d21954199 100644
--- a/README.adoc
+++ b/README.adoc
@@ -19,7 +19,7 @@ endif::[]
 
 image:https://img.shields.io/maven-central/v/fr.sii.ogham/ogham-all.svg["Latest Release Standalone", link="https://mvnrepository.com/artifact/fr.sii.ogham/ogham-all/"]
 image:https://img.shields.io/badge/License-Apache%202.0-lightgrey.svg["License", link="https://opensource.org/licenses/Apache-2.0"]
-image:https://github.com/groupe-sii/ogham/workflows/Build/badge.svg?branch=misc/versions/update["Build Status", link="https://github.com/groupe-sii/ogham/actions?query=workflow%3ABuild"]
+image:https://github.com/groupe-sii/ogham/workflows/Build/badge.svg?branch=master["Build Status", link="https://github.com/groupe-sii/ogham/actions?query=workflow%3ABuild"]
 
 image:https://sonarcloud.io/api/project_badges/measure?project=fr.sii.ogham%3Aogham-parent&metric=alert_status["Sonar", link="https://sonarcloud.io/dashboard?id=fr.sii.ogham%3Aogham-parent"]
 image:https://sonarcloud.io/api/project_badges/measure?project=fr.sii.ogham%3Aogham-parent&metric=sqale_rating["Sonar", link="https://sonarcloud.io/dashboard?id=fr.sii.ogham%3Aogham-parent"]
@@ -55,7 +55,7 @@ image::https://groupe-sii.github.io/ogham/v3.0.0-SNAPSHOT/presentation/showcase.
 | https://groupe-sii.github.io/ogham/redirects/nightly-build-site.html[site]
 
 | https://groupe-sii.github.io/ogham/redirects/latest-release-code.html[code]
-| https://github.com/groupe-sii/ogham/tree/misc/versions/update[code]
+| https://github.com/groupe-sii/ogham/tree/master[code]
 | https://github.com/groupe-sii/ogham/tree/master[code]
 
 | https://groupe-sii.github.io/ogham/redirects/latest-release-showcase.html[showcase]
@@ -123,7 +123,7 @@ image:src/docs/resources/images/icons/maven-logo.png[Maven,width=118,height=30]
 ...
 ----
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/pom.xml?ts=2[View code of an example pom.xml]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/pom.xml?ts=2[View code of an example pom.xml]
 
 
 '''
@@ -373,7 +373,7 @@ take a look at https://groupe-sii.github.io/ogham/v3.0.0-SNAPSHOT/user-manual.ht
 
 [NOTE]
 ====
-The samples are available in the https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage[sample-standard-usage sub-project].
+The samples are available in the https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage[sample-standard-usage sub-project].
 
 All samples shown bellow are using SMTP for sending email. 
 See https://groupe-sii.github.io/ogham/v3.0.0-SNAPSHOT/user-manual.html#sendgrid[Sending email through SendGrid] 
@@ -435,7 +435,7 @@ public class BasicSample {
 <3> Create a MessagingService instance
 <4> Send an email with a subject and a simple body. The sender address is automatically set using `ogham.email.from.default-value` property
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/BasicSample.java?ts=2[Source code of the sample].
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/BasicSample.java?ts=2[Source code of the sample].
 
 
 _____
@@ -512,7 +512,7 @@ public class HtmlTemplateSample {
 <5> Indicate the path to the HTML template file (in the classpath)
 <6> Use any bean object for replacing variables in template
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlTemplateSample.java?ts=2[Source code of the sample].
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlTemplateSample.java?ts=2[Source code of the sample].
 
 '''
 
@@ -536,7 +536,7 @@ image:src/docs/resources/images/icons/thymeleaf.jpg[width=30,height=30] ThymeLea
 <2> Use the `name` attribute value in the template
 <3> Use the `value` attribute value in the template
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/thymeleaf/simple.html?ts=2[Source code of the HTML template]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/thymeleaf/simple.html?ts=2[Source code of the HTML template]
 
 
 _____
@@ -613,7 +613,7 @@ image:src/docs/resources/images/icons/java-logo.png[width=16,height=30] Java
 ----
 <1> Subject is no more in Java code
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlTemplateWithSubjectSample.java?ts=2[Source code of the sample]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlTemplateWithSubjectSample.java?ts=2[Source code of the sample]
 
 '''
 
@@ -639,7 +639,7 @@ image:src/docs/resources/images/icons/thymeleaf.jpg[width=30,height=30] ThymeLea
 
 NOTE: The subject of the email will be `Subject of the email - Welcome foo !`
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/thymeleaf/simpleWithSubject.html?ts=2[Source code of the HTML template]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/thymeleaf/simpleWithSubject.html?ts=2[Source code of the HTML template]
 
 
 _____
@@ -693,7 +693,7 @@ public class TextTemplateWithSubjectSample {
 ----
 <1> Subject is no more in Java code
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/TextTemplateWithSubjectSample.java?ts=2[Source code of the sample]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/TextTemplateWithSubjectSample.java?ts=2[Source code of the sample]
 
 '''
 
@@ -710,7 +710,7 @@ Foo bar ${value}
 
 NOTE: The subject of the email will be `Welcome foo !`
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/freemarker/simpleWithSubject.txt.ftl?ts=2[Source code of the text template]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/freemarker/simpleWithSubject.txt.ftl?ts=2[Source code of the text template]
 
 
 _____
@@ -793,7 +793,7 @@ image:src/docs/resources/images/icons/java-logo.png[width=16,height=30] Java
 `/template/withImagesAndCss/resources.txt.ftl` for the text alternative)
 <2> The template context
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlWithImagesAndCssTemplateSample.java?ts=2[Source code of the sample]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlWithImagesAndCssTemplateSample.java?ts=2[Source code of the sample]
 
 '''
 
@@ -868,7 +868,7 @@ determined
 <6> Same as <3>
 <7> The image is not inlined by Ogham. This can be useful to embed it manually.
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/withImagesAndCss/resources.html?ts=2[Source code of the HTML template]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/withImagesAndCss/resources.html?ts=2[Source code of the HTML template]
 
 '''
 
@@ -1058,7 +1058,7 @@ The call order between `text()` and `html()` doesn't matter (unlike using `.cont
 The underlying `Content` is a `MultiContent`.
 =====
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextSample.java?ts=2[Source code of the sample]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextSample.java?ts=2[Source code of the sample]
 
 
 _____
@@ -1123,7 +1123,7 @@ extension).
 The underlying `Content` is a `MultiTemplateContent`.
 =====
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextTemplateSample.java?ts=2[Source code of the sample]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextTemplateSample.java?ts=2[Source code of the sample]
 
 '''
 
@@ -1136,7 +1136,7 @@ image:src/docs/resources/images/icons/thymeleaf-text.jpg[width=30,height=30] Tex
 [[${name}]] [[${value}]]
 ----
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/thymeleaf/simple.txt?ts=2[Source code of the text template]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/thymeleaf/simple.txt?ts=2[Source code of the text template]
 
 
 '''
@@ -1159,7 +1159,7 @@ image:src/docs/resources/images/icons/thymeleaf-html.jpg[width=30,height=30] HTM
 </html>
 ----
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/thymeleaf/simple.html?ts=2[Source code of the HTML template]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/thymeleaf/simple.html?ts=2[Source code of the HTML template]
 
 
 _____
@@ -1232,7 +1232,7 @@ for HTML located at `/template/thymeleaf/simple.html` and one for text located a
 extension). The HTML template uses Thymeleaf while the text template uses FreeMarker.
 <2> The object used for evaluation as usual when using templates (same object used for both HTML and text)
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextMixedTemplateEnginesSample.java?ts=2[Source code of the sample]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextMixedTemplateEnginesSample.java?ts=2[Source code of the sample]
 
 '''
 
@@ -1245,7 +1245,7 @@ image:src/docs/resources/images/icons/freemarker-logo.png[width=60,height=24] Te
 ${name} ${value}
 ----
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/mixed/simple.txt.ftl?ts=2[Source code of the text template]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/mixed/simple.txt.ftl?ts=2[Source code of the text template]
 
 '''
 
@@ -1267,7 +1267,7 @@ image:src/docs/resources/images/icons/thymeleaf.jpg[width=30,height=30] HTML tem
 </html>
 ----
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/mixed/simple.html?ts=2[Source code of the HTML template]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/mixed/simple.html?ts=2[Source code of the HTML template]
 
 
 _____
@@ -1325,7 +1325,7 @@ image:src/docs/resources/images/icons/java-logo.png[width=16,height=30] Java
 <1> Attach a PDF file that exists in the classpath to the email. The name of the attachment uses the name of the file
 <2> Use an `InputStream` and name the attachment
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/WithAttachmentSample.java?ts=2[Source code of the sample]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/WithAttachmentSample.java?ts=2[Source code of the sample]
 
 
 _____
@@ -1369,7 +1369,7 @@ See user guide to read about https://groupe-sii.github.io/ogham/v3.0.0-SNAPSHOT/
 
 [NOTE]
 ====
-The samples are available in the https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage[sample-standard-usage sub-project].
+The samples are available in the https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage[sample-standard-usage sub-project].
 
 All samples shown bellow are using SMPP for sending SMS. 
 The https://en.wikipedia.org/wiki/Short_Message_Peer-to-Peer[SMPP] protocol 
@@ -1435,7 +1435,7 @@ public class BasicSample {
 <9> Send a SMS with a simple message. The sender phone number is automatically set using 
 `ogham.sms.from.default-value` property
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/BasicSample.java?ts=2[Source code of the sample].
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/BasicSample.java?ts=2[Source code of the sample].
 
 
 _____
@@ -1503,7 +1503,7 @@ set using `ogham.sms.from.default-value` property
 <5> Indicate the path to the template file (in the classpath)
 <6> Use any bean object for replacing variables in template
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/TemplateSample.java?ts=2[Source code of the sample].
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/TemplateSample.java?ts=2[Source code of the sample].
 
 '''
 
@@ -1515,7 +1515,7 @@ image:src/docs/resources/images/icons/thymeleaf.jpg[width=30,height=30] ThymeLea
 [[${name}]] [[${value}]]
 ----
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/thymeleaf/simple.txt?ts=2[Source code of the template]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/thymeleaf/simple.txt?ts=2[Source code of the template]
 
 
 _____
@@ -1591,7 +1591,7 @@ public class LongMessageSample {
 }
 ----
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/LongMessageSample.java?ts=2[Source code of the sample].
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/LongMessageSample.java?ts=2[Source code of the sample].
 
 
 
@@ -1653,7 +1653,7 @@ image:src/docs/resources/images/icons/maven-logo.png[Maven,width=118,height=30]
 </dependency>
 ----
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/pom.xml?ts=2[View code of an example pom.xml]
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/pom.xml?ts=2[View code of an example pom.xml]
 
 
 '''
@@ -1780,7 +1780,7 @@ public class EmailTestSample {
 <15> Assert that received email has no attachment
 
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/test/java/fr/sii/ogham/sample/test/EmailTestSample.java?ts=2[Source code of the sample].
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/test/java/fr/sii/ogham/sample/test/EmailTestSample.java?ts=2[Source code of the sample].
 
 
 _____
@@ -1856,7 +1856,7 @@ public class SmsTestSample {
 <9> Assert that the recipient phone number is `0601020304`
 
 
-https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/test/java/fr/sii/ogham/sample/test/SmsTestSample.java?ts=2[Source code of the sample].
+https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/test/java/fr/sii/ogham/sample/test/SmsTestSample.java?ts=2[Source code of the sample].
 
 
 _____
diff --git a/ogham-core/pom.xml b/ogham-core/pom.xml
index f79207217a..eb709db027 100644
--- a/ogham-core/pom.xml
+++ b/ogham-core/pom.xml
@@ -70,6 +70,17 @@
 			<artifactId>logback-classic</artifactId>
 		</dependency>
 
+		<!-- Dependency convergence -->
+		<!-- This is needed to enforce right versions in projects that use ogham -->
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+		</dependency>
+
 		<!-- Tests -->
 		<dependency>
 			<groupId>fr.sii.ogham</groupId>
diff --git a/ogham-email-sendgrid-common/pom.xml b/ogham-email-sendgrid-common/pom.xml
index 6482dc7687..5713b2f36a 100644
--- a/ogham-email-sendgrid-common/pom.xml
+++ b/ogham-email-sendgrid-common/pom.xml
@@ -25,16 +25,10 @@
 		<dependency>
 			<groupId>com.sendgrid</groupId>
 			<artifactId>sendgrid-java</artifactId>
-			<exclusions>
-				<!-- http-client imports mockito-core with compile scope... -->
-				<exclusion>
-					<groupId>org.mockito</groupId>
-					<artifactId>mockito-core</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
-		<!-- This is needed to force Jackson version in projects that uses ogham-test-utils -->
+		<!-- Dependency convergence -->
+		<!-- This is needed to enforce right versions in projects that use ogham -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
@@ -47,6 +41,10 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
 
 		<!-- Tests -->
 		<dependency>
diff --git a/ogham-template-thymeleaf-common/pom.xml b/ogham-template-thymeleaf-common/pom.xml
index b20279e929..86f70e11ee 100644
--- a/ogham-template-thymeleaf-common/pom.xml
+++ b/ogham-template-thymeleaf-common/pom.xml
@@ -27,6 +27,13 @@
 			<artifactId>thymeleaf</artifactId>
 		</dependency>
 
+		<!-- Dependency convergence -->
+		<!-- This is needed to enforce right versions in projects that use ogham -->
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+		</dependency>
+
 		<!-- Tests -->
 		<dependency>
 			<groupId>fr.sii.ogham</groupId>
diff --git a/ogham-test-classpath/src/main/resources/standalone/maven/pom.xml.ftl b/ogham-test-classpath/src/main/resources/standalone/maven/pom.xml.ftl
index ed82286f37..72d7511a64 100644
--- a/ogham-test-classpath/src/main/resources/standalone/maven/pom.xml.ftl
+++ b/ogham-test-classpath/src/main/resources/standalone/maven/pom.xml.ftl
@@ -77,6 +77,25 @@
 	                </execution>
 	            </executions>
 	        </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.0.0-M3</version>
+				<executions>
+					<execution>
+						<id>enforce</id>
+						<configuration>
+							<rules>
+								<dependencyConvergence />
+							</rules>
+						</configuration>
+						<phase>validate</phase>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/ogham-test-utils/pom.xml b/ogham-test-utils/pom.xml
index 7c25b1aa7c..2d788c7c17 100644
--- a/ogham-test-utils/pom.xml
+++ b/ogham-test-utils/pom.xml
@@ -22,10 +22,6 @@
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
@@ -54,11 +50,11 @@
 		</dependency>
 		<dependency>
 			<groupId>com.icegreen</groupId>
-			<artifactId>greenmail</artifactId>
+			<artifactId>greenmail-junit4</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.icegreen</groupId>
-			<artifactId>greenmail-junit4</artifactId>
+			<artifactId>greenmail</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.icegreen</groupId>
@@ -80,6 +76,10 @@
 			<groupId>com.fizzed</groupId>
 			<artifactId>ch-smpp</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.github.tomakehurst</groupId>
+			<artifactId>wiremock-jre8</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.xmlunit</groupId>
 			<artifactId>xmlunit-core</artifactId>
@@ -88,10 +88,6 @@
 			<groupId>uk.com.robust-it</groupId>
 			<artifactId>cloning</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.github.tomakehurst</groupId>
-			<artifactId>wiremock-jre8</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.spockframework</groupId>
 			<artifactId>spock-core</artifactId>
@@ -101,16 +97,25 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<!-- This is needed to force guava version in projects that uses ogham-test-utils -->
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.awaitility</groupId>
 			<artifactId>awaitility</artifactId>
 		</dependency>
-		<!-- This is needed to force Jackson version in projects that uses ogham-test-utils -->
+		
+		<!-- Dependency convergence -->
+		<!-- This is needed to enforce right versions in projects that use ogham -->
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
@@ -123,6 +128,34 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.objenesis</groupId>
+			<artifactId>objenesis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.conscrypt</groupId>
+			<artifactId>conscrypt-openjdk-uber</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.opentest4j</groupId>
+			<artifactId>opentest4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>jakarta.activation</artifactId>
+		</dependency>
 
 		<!-- dependencies for testing -->
 		<dependency>
@@ -130,10 +163,5 @@
 			<artifactId>junit-platform-testkit</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index f878ad1d75..dc2c771bb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,18 +25,23 @@
 		<commons-io.version>2.8.0</commons-io.version>
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 		<thymeleaf-v2.version>2.1.6.RELEASE</thymeleaf-v2.version>
-		<thymeleaf-v3.version>3.0.11.RELEASE</thymeleaf-v3.version>		<!-- TODO: Thymeleaf 3.0.12 introduced a restriction to call static methods. There is no simple way to enable/disable it (hard coded). -->
+		<thymeleaf-v3.version>3.0.11.RELEASE</thymeleaf-v3.version>		<!-- TODO: Thymeleaf 3.0.12 introduced a restriction to call static methods. 
+			There is no simple way to enable/disable it (hard coded). -->
 		<thymeleaf.version>${thymeleaf-v3.version}</thymeleaf.version>
 		<ognl.version>3.1.28</ognl.version>		<!-- TODO: ognl 3.2.x not supported by Thymeleaf (https://github.com/thymeleaf/thymeleaf/issues/727) -->
 		<freemarker.version>2.3.30</freemarker.version>
 		<javamail.version>1.6.2</javamail.version>
-		<jakarta-mail.version>1.6.5</jakarta-mail.version>	<!-- TODO: jakarta.mail 2.0.0 changes the base package from javax.mail to jakarta.mail. Just updating the packages will not work with Spring Boot integration. Need to provide another module with auto-adaptation (like thymeleaf or sendgrid) -->
+		<jakarta-mail.version>1.6.5</jakarta-mail.version>	<!-- TODO: jakarta.mail 2.0.0 changes the base package from javax.mail to 
+			jakarta.mail. Just updating the packages will not work with Spring Boot integration. 
+			Need to provide another module with auto-adaptation (like thymeleaf or sendgrid) -->
 		<slf4j.version>1.7.30</slf4j.version>
 		<logback.version>1.2.3</logback.version>
 		<commons-lang.version>3.11</commons-lang.version>
 		<cloudhopper.version>5.0.9</cloudhopper.version>
 		<cloudhopper-fizzed.version>5.0.9</cloudhopper-fizzed.version>
 		<cloudhopper-gsm.version>3.0.0</cloudhopper-gsm.version>
+		<cloudhopper-commons-util.version>6.0.2</cloudhopper-commons-util.version>
+		<cloudhopper-commons-charset.version>3.0.2</cloudhopper-commons-charset.version>
 		<jsoup.version>1.13.1</jsoup.version>
 		<commons-codec.version>1.15</commons-codec.version>
 		<sendgrid-java-v4.version>4.7.1</sendgrid-java-v4.version>
@@ -46,9 +51,11 @@
 		<libphonenumber.version>8.3.2</libphonenumber.version>
 		<tika.version>1.24.1</tika.version>
 		<javax-activation.version>1.2.0</javax-activation.version>
-		<jakarta-activation.version>1.2.2</jakarta-activation.version>	<!-- TODO: as for jakarta.mail, jakarta.activation 2.0.0 changes the base package. -->
+		<jakarta-activation.version>1.2.2</jakarta-activation.version>	<!-- TODO: as for jakarta.mail, jakarta.activation 2.0.0 changes the base 
+			package. -->
 		<jackson.version>2.12.0</jackson.version>
-		<reflections.version>0.9.11</reflections.version>	<!-- TODO: 0.9.12 has issues with Spring Fat JARs (https://github.com/ronmamo/reflections/issues/273, https://github.com/ronmamo/reflections/issues/277) -->
+		<reflections.version>0.9.11</reflections.version>	<!-- TODO: 0.9.12 has issues with Spring Fat JARs (https://github.com/ronmamo/reflections/issues/273, 
+			https://github.com/ronmamo/reflections/issues/277) -->
 		<guava.version>30.1-jre</guava.version>
 		<httpcore.version>4.4.14</httpcore.version>
 		<httpclient.version>4.5.13</httpclient.version>
@@ -372,6 +379,12 @@
 				<groupId>com.sun.mail</groupId>
 				<artifactId>jakarta.mail</artifactId>
 				<version>${jakarta-mail.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.sun.activation</groupId>
+						<artifactId>jakarta.activation</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>jakarta.mail</groupId>
@@ -382,6 +395,29 @@
 				<groupId>com.sendgrid</groupId>
 				<artifactId>sendgrid-java</artifactId>
 				<version>${sendgrid-java.version}</version>
+				<exclusions>
+					<!-- http-client imports mockito-core with compile scope... -->
+					<exclusion>
+						<groupId>org.mockito</groupId>
+						<artifactId>mockito-core</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.fasterxml.jackson.core</groupId>
+						<artifactId>jackson-core</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.fasterxml.jackson.core</groupId>
+						<artifactId>jackson-databind</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.fasterxml.jackson.core</groupId>
+						<artifactId>jackson-annotations</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.apache.httpcomponents</groupId>
+						<artifactId>httpclient</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 
 			<!-- SMS -->
@@ -389,21 +425,59 @@
 				<groupId>com.fizzed</groupId>
 				<artifactId>ch-smpp</artifactId>
 				<version>${cloudhopper-fizzed.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.cloudhopper</groupId>
 				<artifactId>ch-smpp</artifactId>
 				<version>${cloudhopper.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.cloudhopper</groupId>
 				<artifactId>ch-commons-gsm</artifactId>
 				<version>${cloudhopper-gsm.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.cloudhopper</groupId>
+						<artifactId>ch-commons-util</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>com.cloudhopper</groupId>
+				<artifactId>ch-commons-util</artifactId>
+				<version>${cloudhopper-commons-util.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.cloudhopper</groupId>
+				<artifactId>ch-commons-charset</artifactId>
+				<version>${cloudhopper-commons-charset.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jsmpp</groupId>
 				<artifactId>jsmpp</artifactId>
 				<version>${jsmpp.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 
 
@@ -452,6 +526,16 @@
 				<groupId>org.reflections</groupId>
 				<artifactId>reflections</artifactId>
 				<version>${reflections.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.javassist</groupId>
+						<artifactId>javassist</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.google.guava</groupId>
+						<artifactId>guava</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.google.guava</groupId>
@@ -479,16 +563,38 @@
 				<groupId>org.thymeleaf</groupId>
 				<artifactId>thymeleaf</artifactId>
 				<version>${thymeleaf.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.javassist</groupId>
+						<artifactId>javassist</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.thymeleaf</groupId>
 				<artifactId>thymeleaf-spring4</artifactId>
 				<version>${thymeleaf-v2.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>ognl</groupId>
 				<artifactId>ognl</artifactId>
 				<version>${ognl.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.javassist</groupId>
+						<artifactId>javassist</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.freemarker</groupId>
@@ -530,6 +636,12 @@
 				<groupId>ch.qos.logback</groupId>
 				<artifactId>logback-classic</artifactId>
 				<version>${logback.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 
 			<!-- Tests -->
@@ -557,6 +669,12 @@
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
 				<version>${junit.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.hamcrest</groupId>
+						<artifactId>hamcrest-core</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.junit</groupId>
@@ -565,15 +683,38 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.junit.vintage</groupId>
+				<artifactId>junit-vintage-engine</artifactId>
+				<version>${junit-jupiter.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>junit</groupId>
+						<artifactId>junit</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
 				<version>${mockito.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.objenesis</groupId>
+						<artifactId>objenesis</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-junit-jupiter</artifactId>
 				<version>${mockito-junit-jupiter.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.junit.jupiter</groupId>
+						<artifactId>junit-jupiter-api</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>net.bytebuddy</groupId>
@@ -599,17 +740,41 @@
 						<groupId>com.sun.mail</groupId>
 						<artifactId>javax.mail</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>junit</groupId>
+						<artifactId>junit</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.icegreen</groupId>
 				<artifactId>greenmail-junit4</artifactId>
 				<version>${greenmail.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>junit</groupId>
+						<artifactId>junit</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.icegreen</groupId>
 				<artifactId>greenmail-junit5</artifactId>
 				<version>${greenmail.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>junit</groupId>
+						<artifactId>junit</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>nl.jqno.equalsverifier</groupId>
@@ -625,16 +790,78 @@
 				<groupId>uk.com.robust-it</groupId>
 				<artifactId>cloning</artifactId>
 				<version>${cloning.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.objenesis</groupId>
+						<artifactId>objenesis</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.github.tomakehurst</groupId>
 				<artifactId>wiremock-jre8</artifactId>
 				<version>${wiremock.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.hamcrest</groupId>
+						<artifactId>hamcrest-core</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.google.guava</groupId>
+						<artifactId>guava</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.conscrypt</groupId>
+						<artifactId>conscrypt-openjdk-uber</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.apache.commons</groupId>
+						<artifactId>commons-lang3</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.fasterxml.jackson.core</groupId>
+						<artifactId>jackson-core</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.fasterxml.jackson.core</groupId>
+						<artifactId>jackson-databind</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.fasterxml.jackson.core</groupId>
+						<artifactId>jackson-annotations</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.opentest4j</groupId>
+						<artifactId>opentest4j</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>commons-io</groupId>
+						<artifactId>commons-io</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.xmlunit</groupId>
+						<artifactId>xmlunit-core</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.apache.httpcomponents</groupId>
+						<artifactId>httpclient</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.spockframework</groupId>
 				<artifactId>spock-core</artifactId>
 				<version>${spock.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>junit</groupId>
+						<artifactId>junit</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.groovy</groupId>
@@ -680,6 +907,12 @@
 				<groupId>org.awaitility</groupId>
 				<artifactId>awaitility</artifactId>
 				<version>${awaitility.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.hamcrest</groupId>
+						<artifactId>hamcrest</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<!-- Fix dependency convergence -->
 			<dependency>
@@ -715,6 +948,17 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-test</artifactId>
+				<version>${spring-boot.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -1271,7 +1515,7 @@
 								<dependencyConvergence />
 							</rules>
 						</configuration>
-						<phase>install</phase>
+						<phase>validate</phase>
 						<goals>
 							<goal>enforce</goal>
 						</goals>