Version 0.7.3.

* Support for MariaDB 11.7.
* Support from MySQL 8.0.41.

Author: shigenobu

README.ja.md

@@ -9,8 +9,8 @@ MariaDBまたはMySQLの同一ホスト内の2つのデータベースの差分
 ### システム要件
 
 * JDK 1.8 以上
-* MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6
-* MySQL 8.0.31, 8.0.32, 8.0.33, 8.0.34, 8.0.35, 8.0.36, 8.0.37, 8.0.38, 8.0.39, 8.0.40
+* MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6, 11.7
+* MySQL 8.0.31, 8.0.32, 8.0.33, 8.0.34, 8.0.35, 8.0.36, 8.0.37, 8.0.38, 8.0.39, 8.0.40, 8.0.41
 
 ### コマンド
 

README.md

@@ -9,8 +9,8 @@ Get diff and sync between two databases in same host created by MariaDB or MySQL
 ### System Required
 
 * over JDK 1.8
-* MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6
-* MySQL 8.0.31, 8.0.32, 8.0.33, 8.0.34, 8.0.35, 8.0.36, 8.0.37, 8.0.38, 8.0.39, 8.0.40
+* MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6, 11.7
+* MySQL 8.0.31, 8.0.32, 8.0.33, 8.0.34, 8.0.35, 8.0.36, 8.0.37, 8.0.38, 8.0.39, 8.0.40, 8.0.41
 
 ### Usage by cli
 

cli/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.walksocket</groupId>
     <artifactId>magentadesk</artifactId>
-    <version>0.7.2</version>
+    <version>0.7.3</version>
   </parent>
   <artifactId>cli</artifactId>
   <packaging>jar</packaging>

cli/src/main/java/com/walksocket/md/MdExecute.java

@@ -49,8 +49,9 @@ public static MdOutputAbstract execute(MdInputAbstract input) throws Exception {
             || version.contains("8.0.37")
             || version.contains("8.0.38")
             || version.contains("8.0.39")
-            || version.contains("8.0.40"))) {
-          throw new MdExceptionInvalidVersion("MySQL 8.0.31, 8.0.32, 8.0.33, 8.0.34, 8.0.35, 8.0.36, 8.0.37, 8.0.38, 8.0.39, 8.0.40 is required.");
+            || version.contains("8.0.40")
+            || version.contains("8.0.41"))) {
+          throw new MdExceptionInvalidVersion("MySQL 8.0.31, 8.0.32, 8.0.33, 8.0.34, 8.0.35, 8.0.36, 8.0.37, 8.0.38, 8.0.39, 8.0.40, 8.0.41 is required.");
         }
       } else {
         // check version
@@ -78,8 +79,9 @@ public static MdOutputAbstract execute(MdInputAbstract input) throws Exception {
             || version.contains("11.3.")
             || version.contains("11.4.")
             || version.contains("11.5.")
-            || version.contains("11.6."))) {
-          throw new MdExceptionInvalidVersion("MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6 is required.");
+            || version.contains("11.6.")
+            || version.contains("11.7."))) {
+          throw new MdExceptionInvalidVersion("MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6, 11.7 is required.");
         }
       }
 

docker-compose.yml

@@ -14,15 +14,15 @@ services:
   mariadb:
     build: ./docker/mariadb
     container_name: magentadesk-mariadb
-    image: magentadesk-mariadb:0.2.0
+    image: magentadesk-mariadb:0.2.1
     ports:
       - 13306:3306
     environment:
       - MYSQL_ROOT_PASSWORD=pass
   mysql:
     build: ./docker/mysql
     container_name: magentadesk-mysql
-    image: magentadesk-mysql:0.1.0
+    image: magentadesk-mysql:0.1.1
     ports:
       - 23306:3306
     environment:

docker/mariadb/Dockerfile

@@ -1,4 +1,4 @@
-FROM mariadb:11.6
+FROM mariadb:11.7
 
 # copy configuration
 COPY ./mariadb.conf.d/server.cnf /etc/mysql/mariadb.conf.d/server.cnf

docker/mysql/Dockerfile

@@ -1,4 +1,4 @@
-FROM mysql:8.0.40
+FROM mysql:8.0.41
 
 # copy configuration
 COPY ./conf.d/my.cnf /etc/mysql/conf.d/my.cnf

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.walksocket</groupId>
   <artifactId>magentadesk</artifactId>
-  <version>0.7.2</version>
+  <version>0.7.3</version>
   <modules>
     <module>cli</module>
     <module>web</module>

web/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.walksocket</groupId>
     <artifactId>magentadesk</artifactId>
-    <version>0.7.2</version>
+    <version>0.7.3</version>
   </parent>
   <artifactId>web</artifactId>
   <packaging>jar</packaging>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>com.walksocket</groupId>
       <artifactId>cli</artifactId>
-      <version>0.7.2</version>
+      <version>0.7.3</version>
     </dependency>
     <!-- sqlite -->
     <dependency>