SRU2024 v10.2

.github/workflows/gradle.yml

@@ -6,7 +6,7 @@ on:
   push:
     branches: [ "main", "SRU2024_v10" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "SRU2024_v10" ]
 
 jobs:
 

.gitignore

@@ -31,3 +31,4 @@ release.sh
 .idea/sonarlint
 *.hprof
 .idea/copilot
+.java-version

CHANGELOG.md

@@ -1,34 +1,35 @@
 # Prowide ISO 20022 - CHANGELOG
 
-#### 9.5.7 - SNAPSHOT
+#### 10.2.7 - SNAPSHOT
   * Enhanced the MX parser log verbosity when parsing malformed content
 
-#### 9.5.6 - January 2025
+#### 10.2.6 - January 2025
   * Changed the `MxParseUtils` findByTags and findByPath methods to return the element values instead of the XML stream object
 
-#### 9.5.5 - January 2025
+#### 10.2.5 - January 2025
   * (PW-2113) `MxParseUtils` added a method to extract the enclosed MT from a multi-format MX message
   * (PW-2113) `MxParseUtils` added methods to extract comments from XML string
   * Added new SettlementInfo class, and added MxParseUtils#getSettlementInfo to extract it from a raw MX message.
-  * Moved and enhanced the MxSwiftMessage#findElement to support multiple element's path 
+  * Moved and enhanced the MxSwiftMessage#findElement to support multiple element's path
   * Update apache-commons-lang3 from 3.14.0 to 3.17.0 fixing derived apache-text dependency vulnerabilities
   * Gradle wrapper update to 8.12
-
-#### 9.5.4 - August 2024
-  * (PW-1958) Fixed the `DefaultMxMetadataStrategy` NPE issue when the amount values are null
 
-#### 9.5.3 - August 2024
-  * (PW-1947) Updated MX model with latest SWIFT SRU2024 schema update, including new messages such as trck.001.001.03
-  * Add support for Business Application Header version head.001.001.04
+#### 10.2.4 - November 2024
+  * (GH-118) Added `toJsonV9` and `fromJsonV9` in the `AbstractMX` to handle retro-compatibility with Java 8 DateTime elements in JSON serialization
 
-#### 9.5.2 - June 2024
+#### 10.2.3 - August 2024
+
+#### 10.2.2 - August 2024
+  * (PW-1947) Updated MX model with latest SWIFT SRU2024 schema update, including new messages such as trck.001.001.03
+  * (PW-1933) Fix backward compatibility issue on DateTime fields when doing JSON to model conversion (thanks @elominp)
   * (PW-1875) Fixed the `ZuluDateTimeAdapter` to convert the datetime to UTC offset if needed
+  * Add support for Business Application Header version head.001.001.04
 
-#### 9.5.1 - June 2024
+#### 10.2.1 - June 2024
   * Enhanced the AppHdrFactory to honor the business service set in the parameter MxId
   * Enhanced the MxParseUtils#identifyMessage to set the business service in the MxId when present
 
-#### 9.5.0 - May 2024
+#### 10.2.0 - May 2024
   * SWIFT Standard release update 2024 (live 16 November 2024)
   * Yearly revision of deprecation phase (see https://dev.prowidesoftware.com/SRU2024/getting-started/deprecation/)
   * Added message categories for File Management (cafm), Fraud Reporting and Disposition (cafm), Network Management (canm), and Settlement Reporting (casr)
@@ -38,26 +39,37 @@
   * Dependency update: commons-lang3 -> 3.14.0
   * Dependency update: gson -> 2.11.0
 
-#### 9.4.5 - May 2024
+#### 10.1.6 - May 2024
   * (PW-1875) Changed the BusinessApplicationHeaderV01 marshaller to always use Zulu timezone with "Z" indicator
-
-#### 9.4.4 - January 2024
+
+#### 10.1.5 - April 2024
+  * Update jaxb dependency from com.sun.xml.bind:jaxb-impl:4.0.2 to 4.0.5 containing several jaxb bugfixes
+
+#### 10.1.4 - January 2024
   * Enhanced the identifier extraction of the MxSwiftMessage to use the AppHdr when the Document namespace is missing
   * Enhanced the generic AbstractMX#parse to detect the message type from the AppHdr when the Document namespace is missing
   * Added default metadata extraction implementation for pacs and camt amounts and value dates
   * Added default methods for sender, receiver, and identifier extraction to the MxSwiftMessage.
   * Replaced the DistinguishedName parse logic with proprietary util class from the Prowide Core library
 
-#### 9.4.3 - August 2023
+#### 10.1.3 - August 2023
+  * (PW-1566) Fixed manipulation of nanoseconds in the OffsetTime and OffsetDateTime adapters
   * Enhanced metadata extraction for xsys messages getting sender/receiver BICs from the RequestHeader element
   * Make the message metadata extraction lenient, by fixing the XML instruction of the payload when it contains invalid case
 
-#### 9.4.2 - July 2023
+#### 10.1.2 - August 2023
   * Added new utility class SupplementaryDataUtils to facilitate "SplmtryData" extraction from MX messages
 
-#### 9.4.1 - June 2023
+#### 10.1.1 - July 2023
   * (PW-1392) Fixed the default escape handler when serializing model objects into XML, that was duplicated quote characters in the output
 
+#### 10.1.0 - June 2023
+  * Migration to Java 11
+  * Migration to Jakarta EE 10
+  * XmlGregorianCalendar was replaced model-wide by the new java.time classes
+  * Fixed AppHdrFactory creation to use UTC in the header default creation date time
+  * Fixed the business application header V01 serialization to use Zulu time indicator instead of +00:00 offset
+
 #### 9.4.0 - May 2023
   * SWIFT Standard release update 2023 (live 19 November 2023)
   * Yearly revision of deprecation phase (see https://dev.prowidesoftware.com/SRU2022/getting-started/deprecation/)

build.gradle

@@ -5,9 +5,9 @@ buildscript {
 	}
 	dependencies {
 		classpath 'ru.vyarus:gradle-quality-plugin:5.0.0'
-		classpath 'pl.allegro.tech.build:axion-release-plugin:1.13.6'
+		classpath 'pl.allegro.tech.build:axion-release-plugin:1.15.1'
 		classpath 'io.github.gradle-nexus:publish-plugin:2.0.0'
-		classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.13.0' // above this version requires Java 11
+		classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.23.3'
 	}
 }
 apply plugin: 'pl.allegro.tech.build.axion-release'
@@ -40,7 +40,7 @@ allprojects {
 		options.encoding = 'UTF-8'
 		java {
 			toolchain {
-				languageVersion.set(JavaLanguageVersion.of(8))
+				languageVersion.set(JavaLanguageVersion.of(11))
 			}
 		}
 		doLast {
@@ -71,7 +71,11 @@ allprojects {
 		}
 	}
 
-	sourceSets.main.java.srcDirs = ['src/main/java', 'src/generated/java']
+	sourceSets.named('main') {
+		java {
+			setSrcDirs(['src/main/java', 'src/generated/java'])
+		}
+	}
 
 	tasks.withType(Jar) {
 		manifest.attributes(
@@ -82,8 +86,8 @@ allprojects {
 			'Implementation-Version': project.version,
 			'Implementation-Vendor': 'www.prowidesoftware.com',
 			'Built-OS': System.getProperty('os.name'),
-			'Source-Compatibility': project.sourceCompatibility,
-			'Target-Compatibility': project.targetCompatibility,
+			'Source-Compatibility': JavaVersion.VERSION_11,
+			'Target-Compatibility': JavaVersion.VERSION_11,
 			'Built-Date': new Date().format("yyyy-MM-dd"),
 			'Automatic-Module-Name': 'com.prowidesoftware.iso20022'
 		)
@@ -98,6 +102,9 @@ subprojects {
 	dependencies {
 		implementation 'org.apache.commons:commons-lang3:3.17.0'
 		implementation 'com.google.code.gson:gson:2.11.0'
+		implementation 'com.sun.xml.bind:jaxb-impl:4.0.5'
+		// bind-api is included transitively by jaxb-impl
+		// implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
 	}
 
 	tasks.withType(Jar) {
@@ -118,8 +125,14 @@ configure(subprojects.findAll {it.name.endsWith('-mx')}) {
 	dependencies {
 		api project(':iso20022-core')
 		implementation project(specificTypesProject)
+
 		implementation 'org.apache.commons:commons-lang3:3.17.0'
 		implementation 'com.google.code.gson:gson:2.11.0'
+
+		implementation 'com.sun.xml.bind:jaxb-impl:4.0.5'
+		// bind-api is included transitively by jaxb-impl
+		// implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
+
 		compileOnly 'javax.persistence:javax.persistence-api:2.2'
 	}
 }
@@ -134,21 +147,15 @@ configure(subprojects.findAll {it.name.endsWith('-mx')}) {
 project(':iso20022-core') {
 	dependencies {
 		// included build
-		api 'com.prowidesoftware:pw-swift-core:SRU2024-9.5.5'
+		api 'com.prowidesoftware:pw-swift-core:SRU2024-10.2.5'
 
 		implementation 'org.apache.commons:commons-lang3:3.17.0'
 		implementation 'com.google.code.gson:gson:2.11.0'
 
-		compileOnly 'javax.persistence:javax.persistence-api:2.2'
-		compileOnly 'javax.validation:validation-api:2.0.1.Final'
+		compileOnly 'jakarta.persistence:jakarta.persistence-api:3.1.0'
+		compileOnly 'jakarta.validation:jakarta.validation-api:3.0.2'
 
-		// to avoid potential differences in JAXB implementations when testing in different environments
-		testImplementation 'javax.xml.bind:jaxb-api:2.3.1'
-		testImplementation 'com.sun.xml.bind:jaxb-impl:2.3.3'
-		testImplementation 'com.sun.xml.bind:jaxb-core:2.3.0.1'
-		testImplementation 'javax.activation:activation:1.1.1'
-
-		testImplementation 'javax.persistence:javax.persistence-api:2.2'
+		testImplementation 'jakarta.persistence:jakarta.persistence-api:3.1.0'
 		testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
 		testImplementation 'com.google.guava:guava:33.4.0-jre'
 		testImplementation 'org.assertj:assertj-core:3.27.1'
@@ -200,7 +207,11 @@ jar {
 	archivesBaseName = 'pw-iso20022'
 	subprojects.each { subproject ->
 		from subproject.configurations.archives.allArtifacts.files.collect {
-			zipTree(it)
+			// filter out any artifacts that are not jars
+			if (it.name.endsWith('.jar')) {
+				println "Adding ${it.name} to fat jar"
+				zipTree(it)
+			}
 		}
 	}
 	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -319,9 +330,11 @@ artifacts {
 // declared dependencies for pom generation
 dependencies {
 	// included build (keep in sync with the latest Prowide Core version)
-	api 'com.prowidesoftware:pw-swift-core:SRU2024-9.5.5'
-	implementation 'org.apache.commons:commons-lang3:3.17.0'
-	implementation 'com.google.code.gson:gson:2.11.0'
+	api 'com.prowidesoftware:pw-swift-core:SRU2024-10.2.5'
+
+	// jaxb is required because it is no longer included in the JDK
+	// bind-api is included transitively by jaxb-impl
+	implementation 'com.sun.xml.bind:jaxb-impl:4.0.5'
 }
 
 // repo for publishing
@@ -467,12 +480,6 @@ tasks.withType(Test) {
 	}
 }
 
-task('testOn11', type: Test) {
-	javaLauncher = javaToolchains.launcherFor {
-		languageVersion = JavaLanguageVersion.of(11)
-	}
-}
-
 task('testOn17', type: Test) {
 	javaLauncher = javaToolchains.launcherFor {
 		languageVersion = JavaLanguageVersion.of(17)

iso20022-core/src/main/java/com/prowidesoftware/swift/model/MxSwiftMessage.java

@@ -18,12 +18,12 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.prowidesoftware.swift.model.mx.*;
+import jakarta.persistence.*;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Objects;
 import java.util.Optional;
-import javax.persistence.*;
 import org.apache.commons.lang3.StringUtils;
 
 /**