Version 0.8.1.

* Support for MariaDB 12.0 and MySQL 8.0.43.
* Update dependent libraries.

Author: shigenobu

README.ja.md

@@ -9,8 +9,8 @@ MariaDBまたはMySQLの同一ホスト内の2つのデータベースの差分
 ### システム要件
 
 * JDK 17 以上
-* MariaDB 10.6, 10.11, 11.4, 11.5, 11.6, 11.7, 11.8
-* MySQL 8.0.31 - 8.0.42
+* MariaDB 10.6, 10.11, 11.4, 11.8, 12.0
+* MySQL 8.0.31 - 8.0.43
 
 ### コマンド
 

README.md

@@ -9,8 +9,8 @@ Get diff and sync between two databases in the same host created by MariaDB or M
 ### System Required
 
 * over JDK 17
-* MariaDB 10.6, 10.11, 11.4, 11.5, 11.6, 11.7, 11.8
-* MySQL 8.0.31 - 8.0.42
+* MariaDB 10.6, 10.11, 11.4, 11.8, 12.0
+* MySQL 8.0.31 - 8.0.43
 
 ### Usage by cli
 

cli/pom.xml

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

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

@@ -49,7 +49,7 @@ public static void main(String[] args) throws Exception {
     // check args
     String mode = null;
     String logPath = null;
-    long addSeconds = 60 * 60 * 9;
+    int addSeconds = 60 * 60 * 9;
     for (String arg : args) {
       if (arg.startsWith(ARG_MODE)) {
         mode = arg.substring(ARG_MODE.length());
@@ -58,7 +58,7 @@ public static void main(String[] args) throws Exception {
         logPath = arg.substring(ARG_LOG_PATH.length());
       }
       if (arg.startsWith(ARG_ADD_SECONDS)) {
-        addSeconds = Long.parseLong(arg.substring(ARG_ADD_SECONDS.length()));
+        addSeconds = Integer.parseInt(arg.substring(ARG_ADD_SECONDS.length()));
       }
     }
     if (mode == null) {

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

@@ -1,10 +1,10 @@
 package com.walksocket.md;
 
-import java.text.SimpleDateFormat;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.Locale;
-import java.util.TimeZone;
 
 /**
  * date.
@@ -19,14 +19,14 @@ public class MdDate {
   /**
    * add seconds for now.
    */
-  private static long addSeconds;
+  private static int addSeconds;
 
   /**
    * init.
    *
    * @param addSeconds add seconds
    */
-  public static void init(long addSeconds) {
+  public static void init(int addSeconds) {
     MdDate.addSeconds = addSeconds;
   }
 
@@ -36,11 +36,8 @@ public static void init(long addSeconds) {
    * @return now
    */
   public static String now() {
-    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
-    sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
-    Date date = new Date();
-    date.setTime(date.getTime() + addSeconds * 1000);
-    return sdf.format(date);
+    var dt = OffsetDateTime.now(ZoneOffset.ofTotalSeconds(addSeconds));
+    return dt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"));
   }
 
   /**

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

@@ -1,7 +1,7 @@
 package com.walksocket.md;
 
 import java.util.Arrays;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 /**
  * db utils.
@@ -24,7 +24,7 @@ public enum MdDbCharset {
    * @return quoted string
    */
   public static String quote(String src) {
-    return StringUtils.replace(src, "'", "''");
+    return Strings.CS.replace(src, "'", "''");
   }
 
   /**

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

@@ -51,9 +51,10 @@ public static MdOutputAbstract execute(MdInputAbstract input) throws Exception {
             || version.contains("8.0.39")
             || version.contains("8.0.40")
             || version.contains("8.0.41")
-            || version.contains("8.0.42"))) {
+            || version.contains("8.0.42")
+            || version.contains("8.0.43"))) {
           throw new MdExceptionInvalidVersion(
-              "MySQL 8.0.31 - 8.0.42 is required.");
+              "MySQL 8.0.31 - 8.0.43 is required.");
         }
       } else {
         // check version
@@ -69,12 +70,10 @@ public static MdOutputAbstract execute(MdInputAbstract input) throws Exception {
             || !(version.contains("10.6.")
             || version.contains("10.11.")
             || version.contains("11.4.")
-            || version.contains("11.5.")
-            || version.contains("11.6.")
-            || version.contains("11.7.")
-            || version.contains("11.8."))) {
+            || version.contains("11.8.")
+            || version.contains("12.0."))) {
           throw new MdExceptionInvalidVersion(
-              "MariaDB 10.6, 10.11, 11.4, 11.5, 11.6, 11.7, 11.8 is required.");
+              "MariaDB 10.6, 10.11, 11.4, 11.8, 12.0 is required.");
         }
       }
 

docker-compose.yml

@@ -22,7 +22,7 @@ services:
   mysql:
     build: ./docker/mysql
     container_name: magentadesk-mysql
-    image: magentadesk-mysql:0.1.2
+    image: magentadesk-mysql:0.1.3
     ports:
       - 23306:3306
     environment:

docker/mariadb/Dockerfile

@@ -1,4 +1,4 @@
-FROM mariadb:11.8
+FROM mariadb:12.0
 
 # 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.42
+FROM mysql:8.0.43
 
 # copy configuration
 COPY ./conf.d/my.cnf /etc/mysql/conf.d/my.cnf