Merge branch 'develop' into SRU2022

prowide · May 27, 2022 · 33e4956 · 33e4956
2 parents 5b170f9 + 63f7555
commit 33e4956
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -2,10 +2,11 @@
  Prowide ISO 20022 - CHANGELOG
 -----------------------------------------------------------------------------------------------------------------------
 
-9.3.0-SNAPSHOT
+RELEASE 9.3.0 - May 2022
   * SWIFT Standard release update 2022 (live 21 November 2022)
   * Yearly revision of deprecation phase (see http://www.prowidesoftware.com/resources/deprecation-policy)
   * Updated gson dependency to 2.9.0
+  * (GH-45) Fixed Json serialization in Java 17
 
 RELEASE 9.2.6 - March 2022
   * (GH-36) Added customizable datetime, date and time adapter in the MxWriteConfiguration, MxReadConfiguration

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'maven-publish'
 
 def SRU = "2022"
 
-version = "SRU${SRU}-9.3.0-SNAPSHOT"
+version = "SRU${SRU}-9.3.0"
 group 'com.prowidesoftware'
 
 sourceCompatibility = '1.8'

diff --git a/iso20022-core/src/main/java/com/prowidesoftware/swift/model/mx/AbstractMX.java b/iso20022-core/src/main/java/com/prowidesoftware/swift/model/mx/AbstractMX.java
@@ -645,7 +645,7 @@ public Element element() {
     public String toJson() {
         final Gson gson = new GsonBuilder()
                 .registerTypeAdapter(AbstractMX.class, new AbstractMXAdapter())
-                .registerTypeAdapter(XMLGregorianCalendar.class, new XMLGregorianCalendarAdapter())
+                .registerTypeHierarchyAdapter(XMLGregorianCalendar.class, new XMLGregorianCalendarAdapter())
                 .registerTypeAdapter(AppHdr.class, new AppHdrAdapter())
                 .setPrettyPrinting()
                 .create();