Skip to content

Bump Flyway from 11.15.0 to 11.16.0 #50920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −5
Open

Bump Flyway from 11.15.0 to 11.16.0 #50920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<maven-invoker.version>3.2.0</maven-invoker.version>
<awaitility.version>4.3.0</awaitility.version>
<jboss-logmanager.version>3.1.2.Final</jboss-logmanager.version>
<flyway.version>11.15.0</flyway.version>
<flyway.version>11.16.0</flyway.version>
<yasson.version>3.0.4</yasson.version>
<!-- liquibase-mongodb is not released everytime with liquibase anymore, but the two versions need to be compatible -->
<liquibase.version>4.33.0</liquibase.version>
Expand Down
11 changes: 7 additions & 4 deletions ...ns/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/QuarkusPathLocationScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
import java.util.Collections;
import java.util.Map;

import org.flywaydb.core.api.CoreLocationPrefix;
import org.flywaydb.core.api.Location;
import org.flywaydb.core.api.callback.Callback;
import org.flywaydb.core.api.configuration.Configuration;
import org.flywaydb.core.api.locations.LocationParser;
import org.flywaydb.core.api.migration.JavaMigration;
import org.flywaydb.core.api.resource.LoadableResource;
import org.flywaydb.core.internal.resource.classpath.ClassPathResource;
Expand Down Expand Up @@ -44,12 +46,13 @@ public QuarkusPathLocationScanner(Configuration configuration, Collection<Locati
LOGGER.debugf("Loading %s", migrationFile);

scannedResources.add(new ClassPathResource(null, migrationFile, classLoader, StandardCharsets.UTF_8));
} else if (migrationFile.startsWith(Location.FILESYSTEM_PREFIX)) {
} else if (migrationFile.startsWith(CoreLocationPrefix.FILESYSTEM_PREFIX)) {
if (fileSystemScanner == null) {
fileSystemScanner = new FileSystemScanner(false, configuration);
fileSystemScanner = new FileSystemScanner(configuration);
}
LOGGER.debugf("Checking %s for migration files", migrationFile);
Collection<LoadableResource> resources = fileSystemScanner.scanForResources(new Location(migrationFile));
Collection<LoadableResource> resources = fileSystemScanner
.scanForResources(LocationParser.parseLocation(migrationFile));
LOGGER.debugf("%s contains %d migration files", migrationFile, resources.size());
scannedResources.addAll(resources);
}
Expand Down Expand Up @@ -83,7 +86,7 @@ public Collection<LoadableResource> scanForResources() {

private boolean isClassPathResource(Collection<Location> locations, String migrationFile) {
for (Location location : locations) {
String locationPath = location.getPath();
String locationPath = location.getRootPath();
if (!locationPath.endsWith(LOCATION_SEPARATOR)) {
locationPath += "/";
}
Expand Down
Loading