Skip to content

Commit 26db2de

Browse files
committed
Bump Flyway from 11.15.0 to 11.16.0
It also avoids using deprecated API
1 parent c14e206 commit 26db2de

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

bom/application/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<maven-invoker.version>3.2.0</maven-invoker.version>
160160
<awaitility.version>4.3.0</awaitility.version>
161161
<jboss-logmanager.version>3.1.2.Final</jboss-logmanager.version>
162-
<flyway.version>11.15.0</flyway.version>
162+
<flyway.version>11.16.0</flyway.version>
163163
<yasson.version>3.0.4</yasson.version>
164164
<!-- liquibase-mongodb is not released everytime with liquibase anymore, but the two versions need to be compatible -->
165165
<liquibase.version>4.33.0</liquibase.version>

extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/QuarkusPathLocationScanner.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
import java.util.Collections;
77
import java.util.Map;
88

9+
import org.flywaydb.core.api.CoreLocationPrefix;
910
import org.flywaydb.core.api.Location;
1011
import org.flywaydb.core.api.callback.Callback;
1112
import org.flywaydb.core.api.configuration.Configuration;
13+
import org.flywaydb.core.api.locations.LocationParser;
1214
import org.flywaydb.core.api.migration.JavaMigration;
1315
import org.flywaydb.core.api.resource.LoadableResource;
1416
import org.flywaydb.core.internal.resource.classpath.ClassPathResource;
@@ -44,12 +46,13 @@ public QuarkusPathLocationScanner(Configuration configuration, Collection<Locati
4446
LOGGER.debugf("Loading %s", migrationFile);
4547

4648
scannedResources.add(new ClassPathResource(null, migrationFile, classLoader, StandardCharsets.UTF_8));
47-
} else if (migrationFile.startsWith(Location.FILESYSTEM_PREFIX)) {
49+
} else if (migrationFile.startsWith(CoreLocationPrefix.FILESYSTEM_PREFIX)) {
4850
if (fileSystemScanner == null) {
49-
fileSystemScanner = new FileSystemScanner(false, configuration);
51+
fileSystemScanner = new FileSystemScanner(configuration);
5052
}
5153
LOGGER.debugf("Checking %s for migration files", migrationFile);
52-
Collection<LoadableResource> resources = fileSystemScanner.scanForResources(new Location(migrationFile));
54+
Collection<LoadableResource> resources = fileSystemScanner
55+
.scanForResources(LocationParser.parseLocation(migrationFile));
5356
LOGGER.debugf("%s contains %d migration files", migrationFile, resources.size());
5457
scannedResources.addAll(resources);
5558
}
@@ -83,7 +86,7 @@ public Collection<LoadableResource> scanForResources() {
8386

8487
private boolean isClassPathResource(Collection<Location> locations, String migrationFile) {
8588
for (Location location : locations) {
86-
String locationPath = location.getPath();
89+
String locationPath = location.getRootPath();
8790
if (!locationPath.endsWith(LOCATION_SEPARATOR)) {
8891
locationPath += "/";
8992
}

0 commit comments

Comments
 (0)