diff --git a/pcom-esb-wsclient-legacy/pom.xml b/pcom-esb-wsclient-legacy/pom.xml
index a2820a0..e89b7bd 100644
--- a/pcom-esb-wsclient-legacy/pom.xml
+++ b/pcom-esb-wsclient-legacy/pom.xml
@@ -23,7 +23,7 @@
                         <configuration>
                             <defaultOptions>
                                 <bindingFiles>
-                                    <bindingFile>src/main/resources/bindings.xjb</bindingFile>
+                                    <bindingFile>src/main/resources/${bindings-file}</bindingFile>
                                 </bindingFiles>
                                 <extraargs>
 <!--                                    <extraarg>-verbose</extraarg>-->
diff --git a/pcom-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb b/pcom-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb
new file mode 100644
index 0000000..5bd3542
--- /dev/null
+++ b/pcom-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jaxb:bindings version="3.0"
+               xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+               xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <!-- "indexed": use Array instead of List -->
+
+    <jaxb:globalBindings collectionType="indexed" generateElementProperty="false">
+        <!-- use Calendar instead of XMLGregorianCalendar -->
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:dateTime"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseDateTime"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printDateTime"/>
+
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:date"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseDate"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printDate"/>
+
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:time"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseTime"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printTime"/>
+
+    </jaxb:globalBindings>
+</jaxb:bindings>
diff --git a/pen-esb-wsclient-legacy/pom.xml b/pen-esb-wsclient-legacy/pom.xml
index a6d7412..7360a46 100644
--- a/pen-esb-wsclient-legacy/pom.xml
+++ b/pen-esb-wsclient-legacy/pom.xml
@@ -31,7 +31,7 @@
                         <configuration>
                             <defaultOptions>
                                 <bindingFiles>
-                                    <bindingFile>src/main/resources/bindings.xjb</bindingFile>
+                                    <bindingFile>src/main/resources/${bindings-file}</bindingFile>
                                 </bindingFiles>
                                 <extraargs>
 <!--                                    <extraarg>-verbose</extraarg>-->
diff --git a/pen-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb b/pen-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb
new file mode 100644
index 0000000..5bd3542
--- /dev/null
+++ b/pen-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jaxb:bindings version="3.0"
+               xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+               xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <!-- "indexed": use Array instead of List -->
+
+    <jaxb:globalBindings collectionType="indexed" generateElementProperty="false">
+        <!-- use Calendar instead of XMLGregorianCalendar -->
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:dateTime"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseDateTime"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printDateTime"/>
+
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:date"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseDate"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printDate"/>
+
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:time"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseTime"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printTime"/>
+
+    </jaxb:globalBindings>
+</jaxb:bindings>
diff --git a/pom.xml b/pom.xml
index 6a2f810..34db301 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,6 +173,7 @@
                 <classifier>javax</classifier>
                 <cxf-codegen-plugin.version>3.5.4</cxf-codegen-plugin.version>
                 <cxf-xjc-boolean.version>3.2.0</cxf-xjc-boolean.version>
+                <bindings-file>bindings.xjb</bindings-file>
                 <jaxb-maven-plugin.version>2.0.12</jaxb-maven-plugin.version>
                 <maven.compiler.target>1.8</maven.compiler.target>
                 <maven.compiler.source>1.8</maven.compiler.source>
@@ -187,7 +188,8 @@
             <properties>
                 <classifier>jakarta</classifier>
                 <cxf-codegen-plugin.version>4.0.3</cxf-codegen-plugin.version>
-                <cxf-xjc-boolean.version>4.0.0</cxf-xjc-boolean.version>
+                <cxf-xjc-boolean.version>4.0.2</cxf-xjc-boolean.version>
+                <bindings-file>bindings-jakarta.xjb</bindings-file>
                 <jaxb-maven-plugin.version>3.0.1</jaxb-maven-plugin.version>
                 <maven.compiler.target>17</maven.compiler.target>
                 <maven.compiler.source>17</maven.compiler.source>
diff --git a/psak-esb-wsclient-legacy/pom.xml b/psak-esb-wsclient-legacy/pom.xml
index 605a242..4e0cb2d 100644
--- a/psak-esb-wsclient-legacy/pom.xml
+++ b/psak-esb-wsclient-legacy/pom.xml
@@ -29,7 +29,7 @@
                         <configuration>
                             <defaultOptions>
                                 <bindingFiles>
-                                    <bindingFile>src/main/resources/bindings.xjb</bindingFile>
+                                    <bindingFile>src/main/resources/${bindings-file}</bindingFile>
                                 </bindingFiles>
                                 <extraargs>
 <!--                                    <extraarg>-verbose</extraarg>-->
diff --git a/psak-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb b/psak-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb
new file mode 100644
index 0000000..5bd3542
--- /dev/null
+++ b/psak-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jaxb:bindings version="3.0"
+               xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+               xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <!-- "indexed": use Array instead of List -->
+
+    <jaxb:globalBindings collectionType="indexed" generateElementProperty="false">
+        <!-- use Calendar instead of XMLGregorianCalendar -->
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:dateTime"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseDateTime"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printDateTime"/>
+
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:date"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseDate"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printDate"/>
+
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:time"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseTime"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printTime"/>
+
+    </jaxb:globalBindings>
+</jaxb:bindings>
diff --git a/pselv-esb-wsclient-legacy/pom.xml b/pselv-esb-wsclient-legacy/pom.xml
index ae8ca0b..f9baa38 100644
--- a/pselv-esb-wsclient-legacy/pom.xml
+++ b/pselv-esb-wsclient-legacy/pom.xml
@@ -29,7 +29,7 @@
                         <configuration>
                             <defaultOptions>
                                 <bindingFiles>
-                                    <bindingFile>src/main/resources/bindings.xjb</bindingFile>
+                                    <bindingFile>src/main/resources/${bindings-file}</bindingFile>
                                 </bindingFiles>
                                 <extraargs>
 <!--                                    <extraarg>-verbose</extraarg>-->
diff --git a/pselv-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb b/pselv-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb
new file mode 100644
index 0000000..5bd3542
--- /dev/null
+++ b/pselv-esb-wsclient-legacy/src/main/resources/bindings-jakarta.xjb
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jaxb:bindings version="3.0"
+               xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+               xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <!-- "indexed": use Array instead of List -->
+
+    <jaxb:globalBindings collectionType="indexed" generateElementProperty="false">
+        <!-- use Calendar instead of XMLGregorianCalendar -->
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:dateTime"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseDateTime"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printDateTime"/>
+
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:date"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseDate"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printDate"/>
+
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:time"
+                       parseMethod="jakarta.xml.bind.DatatypeConverter.parseTime"
+                       printMethod="jakarta.xml.bind.DatatypeConverter.printTime"/>
+
+    </jaxb:globalBindings>
+</jaxb:bindings>