Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 9 additions & 14 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ body:
validations:
required: true

- type: textarea
id: description
attributes:
label: Description of the problem
description: |
Describe as exactly as possible what is not working.
validations:
required: true

- type: textarea
id: steps-to-reproduce
attributes:
Expand All @@ -47,20 +56,6 @@ body:
validations:
required: true

- type: textarea
id: expected-behavior
attributes:
label: Expected behavior
description: |
Tell us what you expect to happen.

- type: textarea
id: actual-behavior
attributes:
label: Actual behavior
description: |
Tell us what happens with the steps given above.

- type: textarea
id: additional-information
attributes:
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 1.1.0
_Compatible with Flyway 11.7.2_

* Compatible with Flyway 11.7.2 (shipped with Spring Boot 3.5) #40

# 1.0.2
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
* Updated dependencies
Expand All @@ -6,7 +11,7 @@
Do not include MariaDB JDBC adapter in ``compile`` scope.

# 1.0.0
_Compatible with Flyway 1.20.1_
_Compatible with Flyway 10.20.1_

_Initial release_

Expand Down
8 changes: 4 additions & 4 deletions flyway-core-slim/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev</groupId>
<artifactId>flyway-core-slim</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>flyway-core-slim</name>
Expand Down Expand Up @@ -48,7 +48,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<flyway.version>10.20.1</flyway.version>
<flyway.version>11.7.2</flyway.version>
<testcontainers.version>1.21.0</testcontainers.version>

<!-- by default run no tests as Docker is required -->
Expand Down Expand Up @@ -91,7 +91,7 @@
<dependency>
<groupId>software.xdev</groupId>
<artifactId>testcontainers-junit4-mock</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -296,7 +296,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.23.1</version>
<version>10.24.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ public <T extends Plugin> List<T> getLicensedPlugins(final Class<T> clazz, final
.toList();
}

public <T extends Plugin> T getLicensedPlugin(final Class<T> clazz, final Configuration configuration)
{
return getLicensedPlugins(clazz, configuration).stream().findFirst().orElse(null);
}

@SuppressWarnings("unchecked")
public <T extends Plugin> T getLicensedPlugin(final String className, final Configuration configuration)
{
Expand All @@ -108,6 +113,17 @@ public <T extends Plugin> T getPlugin(final String className)
.orElse(null);
}

@SuppressWarnings("unchecked")
public <T extends Plugin> T getPluginInstanceOf(final Class<T> clazz)
{
return (T)getPlugins()
.stream()
.filter(clazz::isInstance)
.sorted()
.findFirst()
.orElse(null);
}

protected List<Plugin> getPlugins()
{
this.registerPlugins();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@
import org.flywaydb.core.api.migration.baseline.BaselineResourceTypeProvider;
import org.flywaydb.core.experimental.migration.CoreMigrationTypeResolver;
import org.flywaydb.core.extensibility.Plugin;
import org.flywaydb.core.internal.NullFlywayTelemetryManager;
import org.flywaydb.core.internal.configuration.resolvers.EnvironmentProvisionerNone;
import org.flywaydb.core.internal.configuration.resolvers.EnvironmentVariableResolver;
import org.flywaydb.core.internal.configuration.resolvers.PlaceholderPropertyResolver;
import org.flywaydb.core.internal.resource.CoreResourceTypeProvider;
import org.flywaydb.core.internal.schemahistory.BaseAppliedMigration;
import org.flywaydb.database.mysql.MySQLDatabaseType;
Expand All @@ -54,13 +56,15 @@ void onlyExpectedPlugins()
BaseAppliedMigration.class,
CoreResourceTypeProvider.class,
EnvironmentVariableResolver.class,
PlaceholderPropertyResolver.class,
BaselineAppliedMigration.class,
BaselineMigrationConfigurationExtension.class,
BaselineMigrationResolver.class,
BaselineResourceTypeProvider.class,
BaselineMigrationTypeResolver.class,
CoreMigrationTypeResolver.class,
EnvironmentProvisionerNone.class,
NullFlywayTelemetryManager.class,
MySQLDatabaseType.class,
MariaDBDatabaseType.class);

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev</groupId>
<artifactId>flyway-core-slim-root</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<organization>
Expand Down Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.23.1</version>
<version>10.24.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down