Merge pull request #4421 from gastaldi/patch-2

Bump Flyway to 6.0.4
quarkusio · Oct 8, 2019 · d5f982f · d5f982f
2 parents 3f566a1 + 31e8148
commit d5f982f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -141,7 +141,7 @@
         <jboss-logmanager.version>1.0.3</jboss-logmanager.version>
         <jgit.version>5.5.0.201909110433-r</jgit.version>
         <jetty.version>9.4.19.v20190610</jetty.version>
-        <flyway.version>6.0.1</flyway.version>
+        <flyway.version>6.0.4</flyway.version>
         <yasson.version>1.0.4</yasson.version>
         <neo4j-java-driver.version>2.0.0-alpha03</neo4j-java-driver.version>
         <mongo-client.version>3.10.2</mongo-client.version>

diff --git a/...ns/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ScannerSubstitutions.java b/...ns/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ScannerSubstitutions.java
@@ -29,10 +29,11 @@ public final class ScannerSubstitutions {
      * Replaces the original method that tries to detect migrations using reflection techniques that are not allowed
      * in native mode
      *
-     * @see org.flywaydb.core.internal.scanner.Scanner#Scanner(Collection, ClassLoader, Charset)
+     * @see org.flywaydb.core.internal.scanner.Scanner#Scanner(Class, Collection, ClassLoader, Charset)
      */
     @Substitute
-    public ScannerSubstitutions(Collection<Location> locations, ClassLoader classLoader, Charset encoding) {
+    public ScannerSubstitutions(Class<?> implementedInterface, Collection<Location> locations, ClassLoader classLoader,
+            Charset encoding) {
         ResourceAndClassScanner quarkusScanner = new QuarkusPathLocationScanner();
         resources.addAll(quarkusScanner.scanForResources());
         classes.addAll(quarkusScanner.scanForClasses());