Skip to content

Commit 3e1656b

Browse files
authored
#896: drop support for mysql 5.7 (#1349)
* drop mysql 5.7 from github build matrix and update flyway (#896) * update readme (#896)
1 parent 45506e0 commit 3e1656b

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
matrix:
99
os: [ ubuntu-20.04, ubuntu-22.04 ]
1010
java: [ '11', '17' ]
11-
db: [ 'mysql:5.7', 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.4.30', 'mariadb:10.5.21', 'mariadb:10.6.14' ]
11+
db: [ 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.4.30', 'mariadb:10.5.21', 'mariadb:10.6.14' ]
1212
runs-on: ${{ matrix.os }}
1313
services:
1414
mysql:

README.md

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,17 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g.
4747

4848
Make sure MySQL is reachable via TCP (e.g., remove `skip-networking` from `my.cnf`).
4949
The following MySQL statements can be used as database initialization (adjust database name and credentials according to your setup).
50-
51-
* For MariaDB (all LTS versions) and MySQL 5.7:
52-
```
53-
CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci;
54-
CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme';
55-
GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost';
56-
GRANT SELECT ON mysql.proc TO 'steve'@'localhost';
57-
```
58-
59-
* For MySQL 8:
60-
```
61-
CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci;
62-
CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme';
63-
GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost';
64-
GRANT SUPER ON *.* TO 'steve'@'localhost';
65-
```
66-
Note: The statement `GRANT SUPER [...]` is only necessary to execute some of the previous migration files and is only needed for the initial database setup. Afterwards, you can remove this privilege by executing
67-
```
68-
REVOKE SUPER ON *.* FROM 'steve'@'localhost';
69-
```
50+
51+
```
52+
CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci;
53+
CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme';
54+
GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost';
55+
GRANT SUPER ON *.* TO 'steve'@'localhost';
56+
```
57+
Note: The statement `GRANT SUPER [...]` is only necessary to execute some of the previous migration files and is only needed for the initial database setup. Afterwards, you can remove this privilege by executing
58+
```
59+
REVOKE SUPER ON *.* FROM 'steve'@'localhost';
60+
```
7061
7162
2. Download and extract tarball:
7263

pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737

3838
<jooq.version>3.16.7</jooq.version>
39+
<flyway.version>9.2.2</flyway.version>
3940
<cxf.version>3.5.5</cxf.version>
4041
<spring.version>5.3.31</spring.version>
4142
<spring.security.version>5.7.10</spring.security.version>
@@ -321,7 +322,7 @@
321322
<plugin>
322323
<groupId>org.flywaydb</groupId>
323324
<artifactId>flyway-maven-plugin</artifactId>
324-
<version>7.15.0</version>
325+
<version>${flyway.version}</version>
325326

326327
<!-- Must be in the same phase as Jooq -->
327328
<executions>
@@ -361,6 +362,13 @@
361362
<location>filesystem:src/main/resources/db/migration</location>
362363
</locations>
363364
</configuration>
365+
<dependencies>
366+
<dependency>
367+
<groupId>org.flywaydb</groupId>
368+
<artifactId>flyway-mysql</artifactId>
369+
<version>${flyway.version}</version>
370+
</dependency>
371+
</dependencies>
364372
</plugin>
365373

366374
<plugin>

0 commit comments

Comments
 (0)