drop mysql 5.7 from github build matrix and update flyway (#896)

steve-community · Sep 6, 2022 · e3d5c83 · e3d5c83
1 parent 9698c4e
commit e3d5c83
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
       matrix:
         os: [ ubuntu-18.04, ubuntu-20.04 ]
         java: [ '11', '15' ]
-        db: [ 'mysql:5.7.35', 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.5' ]
+        db: [ 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.5' ]
     runs-on: ${{ matrix.os }}
     services:
       mysql:

diff --git a/pom.xml b/pom.xml
@@ -33,6 +33,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <jooq.version>3.16.7</jooq.version>
+        <flyway.version>9.2.2</flyway.version>
         <cxf.version>3.5.3</cxf.version>
         <spring.version>5.3.22</spring.version>
         <spring.security.version>5.7.3</spring.security.version>
@@ -306,7 +307,7 @@
             <plugin>
                 <groupId>org.flywaydb</groupId>
                 <artifactId>flyway-maven-plugin</artifactId>
-                <version>7.15.0</version>
+                <version>${flyway.version}</version>
 
                 <!-- Must be in the same phase as Jooq -->
                 <executions>
@@ -346,6 +347,13 @@
                         <location>filesystem:src/main/resources/db/migration</location>
                     </locations>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.flywaydb</groupId>
+                        <artifactId>flyway-mysql</artifactId>
+                        <version>${flyway.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
 
             <plugin>