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
@@ -34,7 +34,6 @@
        <plugins>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <packagingExcludes>pom.xml</packagingExcludes>