Merge branch 'master' into dependabot/maven/org.mariadb.jdbc-mariadb-java-client-3.5.6

Author: zefir-git

pom.xml

@@ -30,7 +30,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>