Merge pull request #20760 from gsmet/flyway-8

Upgrade Flyway to 8.0.1
quarkusio · Oct 15, 2021 · 1f3d58f · 1f3d58f
2 parents d22ad27 + 1d40f05
commit 1f3d58f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -155,7 +155,7 @@
         <awaitility.version>4.1.0</awaitility.version>
         <jboss-logmanager.version>1.0.9</jboss-logmanager.version>
         <jgit.version>5.13.0.202109080827-r</jgit.version>
-        <flyway.version>7.15.0</flyway.version>
+        <flyway.version>8.0.1</flyway.version>
         <yasson.version>1.0.9</yasson.version>
         <liquibase.version>4.5.0</liquibase.version>
         <liquibase-mongodb.version>4.4.3</liquibase-mongodb.version>

diff --git a/...va/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartWithJavaMigrationTest.java b/...va/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartWithJavaMigrationTest.java
@@ -98,7 +98,7 @@ public void migrate(Context context) throws Exception {
         }
 
         @Override
-        public boolean isStateScript() {
+        public boolean isBaselineMigration() {
             return false;
         }
     }

diff --git a/...eployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java b/...eployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java
@@ -104,7 +104,7 @@ public void migrate(Context context) throws Exception {
         }
 
         @Override
-        public boolean isStateScript() {
+        public boolean isBaselineMigration() {
             return false;
         }
     }

diff --git a/...y/runtime/src/main/java/io/quarkus/flyway/runtime/graal/FeatureDetectorSubstitutions.java b/...y/runtime/src/main/java/io/quarkus/flyway/runtime/graal/FeatureDetectorSubstitutions.java
@@ -37,11 +37,6 @@ public boolean isOsgiFrameworkAvailable() {
         return false;
     }
 
-    @Substitute
-    public boolean isAndroidAvailable() {
-        return false;
-    }
-
     @Substitute
     public boolean isLog4J2Available() {
         return false;

diff --git a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java
@@ -59,7 +59,7 @@ public Map<String, String> returnPlaceholders() {
     @GET
     @Path("create-schemas")
     public boolean returnCreateSchema() {
-        return flyway.getConfiguration().getCreateSchemas();
+        return flyway.getConfiguration().isCreateSchemas();
     }
 
     @GET