misc(update) Update versions

.derived

@@ -1,4 +1,6 @@
 target
 **/target
 README.adoc
-**/__pycache__
+**/__pycache__
+.sts4-cache
+**/.sts4-cache

ogham-email-sendgrid-common/pom.xml

@@ -1,4 +1,6 @@
-<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">
+<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">
 
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
@@ -32,6 +34,20 @@
 			</exclusions>
 		</dependency>
 
+		<!-- This is needed to force Jackson version in projects that uses ogham-test-utils -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+
 		<!-- Tests -->
 		<dependency>
 			<groupId>fr.sii.ogham</groupId>

ogham-test-classpath/src/main/resources/application.yml

@@ -78,9 +78,9 @@ spring-matrix:
     build:
       - maven
     spring-boot-version:
-      - 2.2.11.RELEASE
-      - 2.3.5.RELEASE
-      - 2.4.0
+      - 2.2.12.RELEASE
+      - 2.3.7.RELEASE
+      - 2.4.1
     spring-boot-dependencies:
       -
       - web

ogham-test-utils/pom.xml

@@ -110,6 +110,19 @@
 			<groupId>org.awaitility</groupId>
 			<artifactId>awaitility</artifactId>
 		</dependency>
+		<!-- This is needed to force Jackson version in projects that uses ogham-test-utils -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
 
 		<!-- dependencies for testing -->
 		<dependency>

ogham-test-utils/src/main/java/fr/sii/ogham/testing/extension/junit/sms/config/ServerConfig.java

@@ -209,7 +209,7 @@ private static ServerDelays buildServerDelays(Slow slow) {
 		delays.setSendQuerySmRespWaiting(toAwaiter(slow.sendQuerySmRespDelay()));
 		delays.setSendReplaceSmWaiting(toAwaiter(slow.sendReplaceSmDelay()));
 		delays.setSendReplaceSmRespWaiting(toAwaiter(slow.sendReplaceSmRespDelay()));
-		delays.setSendSubmiMultiWaiting(toAwaiter(slow.sendSubmiMultiDelay()));
+		delays.setSendSubmitMultiWaiting(toAwaiter(slow.sendSubmitMultiDelay()));
 		delays.setSendSubmitMultiRespWaiting(toAwaiter(slow.sendSubmitMultiRespDelay()));
 		delays.setSendSubmitSmWaiting(toAwaiter(slow.sendSubmitSmDelay()));
 		delays.setSendSubmitSmRespWaiting(toAwaiter(slow.sendSubmitSmRespDelay()));

ogham-test-utils/src/main/java/fr/sii/ogham/testing/extension/junit/sms/config/Slow.java

@@ -159,12 +159,12 @@
 	long sendReplaceSmRespDelay() default 0L;
 
 	/**
-	 * Simulate slow server by waiting {@code sendSubmiMultiDelay} milliseconds
-	 * before sending "SubmiMulti" data
+	 * Simulate slow server by waiting {@code sendSubmitMultiDelay} milliseconds
+	 * before sending "SubmitMulti" data
 	 * 
 	 * @return the delay in milliseconds (0 by default)
 	 */
-	long sendSubmiMultiDelay() default 0L;
+	long sendSubmitMultiDelay() default 0L;
 
 	/**
 	 * Simulate slow server by waiting {@code sendSubmitMultiRespDelay}

ogham-test-utils/src/main/java/fr/sii/ogham/testing/extension/junit/sms/config/SlowConfig.java

@@ -59,7 +59,7 @@ public SlowConfig(ServerConfig parent) {
 		sendQuerySmResp = new WaitingConfHelper(ServerDelays::setSendQuerySmRespWaiting);
 		sendReplaceSm = new WaitingConfHelper(ServerDelays::setSendReplaceSmRespWaiting);
 		sendReplaceSmResp = new WaitingConfHelper(ServerDelays::setSendReplaceSmRespWaiting);
-		sendSubmitMulti = new WaitingConfHelper(ServerDelays::setSendSubmiMultiWaiting);
+		sendSubmitMulti = new WaitingConfHelper(ServerDelays::setSendSubmitMultiWaiting);
 		sendSubmitMultiResp = new WaitingConfHelper(ServerDelays::setSendSubmitMultiRespWaiting);
 		sendSubmitSm = new WaitingConfHelper(ServerDelays::setSendSubmitSmWaiting);
 		sendSubmitSmResp = new WaitingConfHelper(ServerDelays::setSendSubmitSmRespWaiting);

ogham-test-utils/src/main/java/fr/sii/ogham/testing/sms/simulator/config/ServerDelays.java

@@ -98,10 +98,10 @@ public class ServerDelays {
 	 */
 	private Awaiter sendReplaceSmRespWaiting;
 	/**
-	 * Simulate slow server by executing {@code sendSubmiMultiWaiting} function
-	 * before sending "SubmiMulti" data
+	 * Simulate slow server by executing {@code sendSubmitMultiWaiting} function
+	 * before sending "SubmitMulti" data
 	 */
-	private Awaiter sendSubmiMultiWaiting;
+	private Awaiter sendSubmitMultiWaiting;
 	/**
 	 * Simulate slow server by executing {@code sendSubmitMultiRespWaiting}
 	 * function before sending "SubmitMultiResp" data
@@ -272,12 +272,12 @@ public void setSendReplaceSmRespWaiting(Awaiter sendReplaceSmRespWaiting) {
 		this.sendReplaceSmRespWaiting = sendReplaceSmRespWaiting;
 	}
 
-	public Awaiter getSendSubmiMultiWaiting() {
-		return sendSubmiMultiWaiting;
+	public Awaiter getSendSubmitMultiWaiting() {
+		return sendSubmitMultiWaiting;
 	}
 
-	public void setSendSubmiMultiWaiting(Awaiter sendSubmiMultiWaiting) {
-		this.sendSubmiMultiWaiting = sendSubmiMultiWaiting;
+	public void setSendSubmitMultiWaiting(Awaiter sendSubmitMultiWaiting) {
+		this.sendSubmitMultiWaiting = sendSubmitMultiWaiting;
 	}
 
 	public Awaiter getSendSubmitMultiRespWaiting() {

ogham-test-utils/src/main/java/fr/sii/ogham/testing/sms/simulator/jsmpp/SlowPduSender.java

@@ -180,12 +180,12 @@ public byte[] sendReplaceSmResp(OutputStream os, int sequenceNumber) throws IOEx
 	}
 
 	@Override
-	public byte[] sendSubmiMulti(OutputStream os, int sequenceNumber, String serviceType, TypeOfNumber sourceAddrTon, NumberingPlanIndicator sourceAddrNpi, String sourceAddr,
+	public byte[] sendSubmitMulti(OutputStream os, int sequenceNumber, String serviceType, TypeOfNumber sourceAddrTon, NumberingPlanIndicator sourceAddrNpi, String sourceAddr,
 			DestinationAddress[] destinationAddresses, ESMClass esmClass, byte protocolId, byte priorityFlag, String scheduleDeliveryTime, String validityPeriod, RegisteredDelivery registeredDelivery,
 			ReplaceIfPresentFlag replaceIfPresentFlag, DataCoding dataCoding, byte smDefaultMsgId, byte[] shortMessage, OptionalParameter... optionalParameters)
 			throws PDUStringException, InvalidNumberOfDestinationsException, IOException {
-		await(delays.getSendSubmiMultiWaiting());
-		return delegate.sendSubmiMulti(os, sequenceNumber, serviceType, sourceAddrTon, sourceAddrNpi, sourceAddr, destinationAddresses, esmClass, protocolId, priorityFlag, scheduleDeliveryTime,
+		await(delays.getSendSubmitMultiWaiting());
+		return delegate.sendSubmitMulti(os, sequenceNumber, serviceType, sourceAddrTon, sourceAddrNpi, sourceAddr, destinationAddresses, esmClass, protocolId, priorityFlag, scheduleDeliveryTime,
 				validityPeriod, registeredDelivery, replaceIfPresentFlag, dataCoding, smDefaultMsgId, shortMessage, optionalParameters);
 	}
 
@@ -196,8 +196,8 @@ public byte[] sendSubmitMultiResp(OutputStream os, int sequenceNumber, String me
 	}
 
 	@Override
-	public byte[] sendAlertNotification(OutputStream os, int sequenceNumber, byte sourceAddrTon, byte sourceAddrNpi, String sourceAddr, byte esmeAddrTon, byte esmeAddrNpi, String esmeAddr,
-			OptionalParameter... optionalParameters) throws PDUStringException, IOException {
+	public byte[] sendAlertNotification(OutputStream os, int sequenceNumber, TypeOfNumber sourceAddrTon, NumberingPlanIndicator sourceAddrNpi, String sourceAddr, TypeOfNumber esmeAddrTon,
+			NumberingPlanIndicator esmeAddrNpi, String esmeAddr, OptionalParameter... optionalParameters) throws PDUStringException, IOException {
 		await(delays.getSendAlertNotificationWaiting());
 		return delegate.sendAlertNotification(os, sequenceNumber, sourceAddrTon, sourceAddrNpi, sourceAddr, esmeAddrTon, esmeAddrNpi, esmeAddr, optionalParameters);
 	}

ogham-test-utils/src/test/groovy/oghamtesting/it/extensions/logging/SpockLoggingExtensionSpec.groovy

@@ -297,7 +297,7 @@ class SpockLoggingExtensionSpec extends Specification {
 			EngineTestKit.engine("junit-vintage")
 				.selectors(selectClass(FakeSpec.class))
 				.execute()
-					.tests()
+					.testEvents()
 						.assertStatistics({s -> s.failed(0).succeeded(1)});
 			def logs = writer.toString();
 		then:
@@ -312,7 +312,7 @@ class SpockLoggingExtensionSpec extends Specification {
 			EngineTestKit.engine("junit-vintage")
 				.selectors(selectClass(FakeSpec.class))
 				.execute()
-					.tests()
+					.testEvents()
 						.assertStatistics({s -> s.failed(1).succeeded(0)});
 			def logs = writer.toString();
 		then:
@@ -327,7 +327,7 @@ class SpockLoggingExtensionSpec extends Specification {
 			EngineTestKit.engine("junit-vintage")
 				.selectors(selectClass(FakeSpec.class))
 				.execute()
-					.tests()
+					.testEvents()
 						.assertStatistics({s -> s.failed(0).succeeded(1)});
 			def logs = writer.toString();
 		then:
@@ -342,7 +342,7 @@ class SpockLoggingExtensionSpec extends Specification {
 			EngineTestKit.engine("junit-vintage")
 				.selectors(selectClass(FakeSpec.class))
 				.execute()
-					.tests()
+					.testEvents()
 						.assertStatistics({s -> s.failed(0).succeeded(4)});
 			def logs = writer.toString();
 		then:
@@ -361,7 +361,7 @@ class SpockLoggingExtensionSpec extends Specification {
 			EngineTestKit.engine("junit-vintage")
 				.selectors(selectClass(FakeSpec.class))
 				.execute()
-					.tests()
+					.testEvents()
 						.assertStatistics({s -> s.failed(2).succeeded(2)});
 			def logs = writer.toString();
 		then:

pom.xml

@@ -22,57 +22,57 @@
 
 		<!-- Dependencies -->
 		<ogham.version>${project.version}</ogham.version>
-		<commons-io.version>2.7</commons-io.version>
+		<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>
+		<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>
+		<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.10</commons-lang.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>
 		<jsoup.version>1.13.1</jsoup.version>
-		<commons-codec.version>1.14</commons-codec.version>
-		<sendgrid-java-v4.version>4.6.1</sendgrid-java-v4.version>
+		<commons-codec.version>1.15</commons-codec.version>
+		<sendgrid-java-v4.version>4.7.1</sendgrid-java-v4.version>
 		<sendgrid-java-v2.version>2.2.2</sendgrid-java-v2.version>
 		<sendgrid-java.version>${sendgrid-java-v4.version}</sendgrid-java.version>
 		<commons-logging.version>1.2</commons-logging.version>
 		<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>
-		<jackson.version>2.11.1</jackson.version>
-		<reflections.version>0.9.11</reflections.version>
-		<guava.version>29.0-jre</guava.version>
-		<httpcore.version>4.4.13</httpcore.version>
-		<httpclient.version>4.5.12</httpclient.version>
-		<httpmime.version>4.5.12</httpmime.version>
+		<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) -->
+		<guava.version>30.1-jre</guava.version>
+		<httpcore.version>4.4.14</httpcore.version>
+		<httpclient.version>4.5.13</httpclient.version>
+		<httpmime.version>4.5.13</httpmime.version>
 		<spring-boot-v1.version>1.5.22.RELEASE</spring-boot-v1.version>
-		<spring-boot-v2.version>2.3.3.RELEASE</spring-boot-v2.version>
+		<spring-boot-v2.version>2.4.1</spring-boot-v2.version>
 		<spring-boot.version>${spring-boot-v2.version}</spring-boot.version>
-		<joda-time.version>2.10.6</joda-time.version>
+		<joda-time.version>2.10.9</joda-time.version>
 		<!-- Dependencies - tests -->
-		<junit.version>4.13</junit.version>
-		<junit-jupiter.version>5.6.2</junit-jupiter.version>
-		<xmlunit.version>2.7.0</xmlunit.version>
-		<mockito-junit-jupiter.version>3.3.3</mockito-junit-jupiter.version>
+		<junit.version>4.13.1</junit.version>
+		<junit-jupiter.version>5.7.0</junit-jupiter.version>
+		<xmlunit.version>2.8.2</xmlunit.version>
+		<mockito-junit-jupiter.version>3.6.28</mockito-junit-jupiter.version>
 		<mockito.version>${mockito-junit-jupiter.version}</mockito.version>
-		<byte-buddy.version>1.10.13</byte-buddy.version>
+		<byte-buddy.version>1.10.19</byte-buddy.version>
 		<objenesis.version>3.1</objenesis.version>
 		<cloning.version>1.9.12</cloning.version>
-		<greenmail.version>1.6.0</greenmail.version>
-		<jsmpp.version>2.3.10</jsmpp.version>
+		<greenmail.version>1.6.1</greenmail.version>
+		<jsmpp.version>2.3.11</jsmpp.version>
 		<equalsverifier.version>3.5</equalsverifier.version>
-		<wiremock.version>2.27.1</wiremock.version>
+		<wiremock.version>2.27.2</wiremock.version>
 		<hamcrest.version>2.2</hamcrest.version>
 		<spock.version>1.3-groovy-2.5</spock.version>
-		<groovy.version>2.5.12</groovy.version>
+		<groovy.version>2.5.12</groovy.version>	<!-- TODO: Spock is not compatible with 2.5.14... There are compilation failures -->
 		<groovy-eclipse-compiler.version>3.6.0-03</groovy-eclipse-compiler.version>
 		<groovy-eclipse-batch.version>2.5.8-03</groovy-eclipse-batch.version>
 		<awaitility.version>4.0.3</awaitility.version>
@@ -151,7 +151,7 @@
 		<pitest-maven.version>${pit.version}</pitest-maven.version>
 		<pitest-junit5-plugin.version>0.7</pitest-junit5-plugin.version>
 		<pitmp-maven-plugin.version>1.3.7</pitmp-maven-plugin.version>
-		<descartes.version>1.2.6</descartes.version>
+		<descartes.version>1.2.6</descartes.version>	<!-- TODO: 1.3 not compatible with pitmp 1.3.7 -->
 		<!-- Plugins - documentation -->
 		<maven-site-plugin.version>3.9.0</maven-site-plugin.version>
 		<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
@@ -1271,6 +1271,7 @@
 								<dependencyConvergence />
 							</rules>
 						</configuration>
+						<phase>install</phase>
 						<goals>
 							<goal>enforce</goal>
 						</goals>

spring-initializr/src/main/resources/application.yml

@@ -8,14 +8,14 @@ initializr:
     - id: 2.1.18.RELEASE
       name: 2.1.18
       default: true
-    - id: 2.2.11.RELEASE
-      name: 2.2.11
+    - id: 2.2.12.RELEASE
+      name: 2.2.12
       default: false
-    - id: 2.3.5.RELEASE
-      name: 2.3.5
+    - id: 2.3.7.RELEASE
+      name: 2.3.7
       default: false
-    - id: 2.4.0
-      name: 2.4.0
+    - id: 2.4.1
+      name: 2.4.1
       default: false
   javaVersions:
     - id: 15

src/docs/asciidoc/user-manual/installation/springboot-all.adoc

@@ -260,9 +260,9 @@ Ogham is compatible with following Spring Boot versions:
 * 1.4.x (currently automatically tested against 1.4.7.RELEASE, see note below)
 * 1.5.x (currently automatically tested against 1.5.22.RELEASE)
 * 2.1.x (currently automatically tested against 2.1.18.RELEASE)
-* 2.2.x (currently automatically tested against 2.2.11.RELEASE)
-* 2.3.x (currently automatically tested against 2.3.5.RELEASE)
-* 2.4.x (currently automatically tested against 2.4.0.RELEASE)
+* 2.2.x (currently automatically tested against 2.2.12.RELEASE)
+* 2.3.x (currently automatically tested against 2.3.7.RELEASE)
+* 2.4.x (currently automatically tested against 2.4.1.RELEASE)
 
 .Java version compatibility
 [NOTE]