Merge branch 'master' into master

2023-06-02 16:23:25 +03:00
parent 7bfc898d3e 13f8588022
commit 2c0482c409
136 changed files with 2488 additions and 618 deletions
@@ -127,6 +127,11 @@
            <artifactId>spring-test</artifactId>
            <scope>test</scope>
        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-api.version}</version>
+        </dependency>
    </dependencies>

    <build>
@@ -220,6 +225,7 @@
    </profiles>

    <properties>
+        <jaxb-api.version>2.3.1</jaxb-api.version>
        <!-- http -->
        <httpcore.version>4.4.11</httpcore.version>
        <httpclient.version>4.5.8</httpclient.version>