Skip to content

Commit 27537d4

Browse files
committed
Version 0.7.1.
* Support for MySQL 8.0.33 - 8.0.40.
1 parent 392d085 commit 27537d4

File tree

8 files changed

+18
-10
lines changed

8 files changed

+18
-10
lines changed

README.ja.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MariaDBまたはMySQLの同一ホスト内の2つのデータベースの差分
1010

1111
* JDK 1.8 以上
1212
* 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
13-
* MySQL 8.0.31, 8.0.32
13+
* 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
1414

1515
### コマンド
1616

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Get diff and sync between two databases in same host created by MariaDB or MySQL
1010

1111
* over JDK 1.8
1212
* 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
13-
* MySQL 8.0.31, 8.0.32
13+
* 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
1414

1515
### Usage by cli
1616

cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.walksocket</groupId>
77
<artifactId>magentadesk</artifactId>
8-
<version>0.7.0</version>
8+
<version>0.7.1</version>
99
</parent>
1010
<artifactId>cli</artifactId>
1111
<packaging>jar</packaging>

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,16 @@ public static MdOutputAbstract execute(MdInputAbstract input) throws Exception {
4141
}
4242
if (MdUtils.isNullOrEmpty(version)
4343
|| !(version.contains("8.0.31")
44-
|| version.contains("8.0.32"))) {
45-
throw new MdExceptionInvalidVersion("MySQL 8.0.31, 8.0.32 is required.");
44+
|| version.contains("8.0.32")
45+
|| version.contains("8.0.33")
46+
|| version.contains("8.0.34")
47+
|| version.contains("8.0.35")
48+
|| version.contains("8.0.36")
49+
|| version.contains("8.0.37")
50+
|| version.contains("8.0.38")
51+
|| version.contains("8.0.39")
52+
|| version.contains("8.0.40"))) {
53+
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.");
4654
}
4755
} else {
4856
// check version

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
mysql:
2323
build: ./docker/mysql
2424
container_name: magentadesk-mysql
25-
image: magentadesk-mysql:0.0.2
25+
image: magentadesk-mysql:0.1.0
2626
ports:
2727
- 23306:3306
2828
environment:

docker/mysql/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mysql:8.0.32
1+
FROM mysql:8.0.40
22

33
# copy configuration
44
COPY ./conf.d/my.cnf /etc/mysql/conf.d/my.cnf

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.walksocket</groupId>
77
<artifactId>magentadesk</artifactId>
8-
<version>0.7.0</version>
8+
<version>0.7.1</version>
99
<modules>
1010
<module>cli</module>
1111
<module>web</module>

web/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walksocket</groupId>
88
<artifactId>magentadesk</artifactId>
9-
<version>0.7.0</version>
9+
<version>0.7.1</version>
1010
</parent>
1111
<artifactId>web</artifactId>
1212
<packaging>jar</packaging>
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>com.walksocket</groupId>
1919
<artifactId>cli</artifactId>
20-
<version>0.7.0</version>
20+
<version>0.7.1</version>
2121
</dependency>
2222
<!-- sqlite -->
2323
<dependency>

0 commit comments

Comments
 (0)