Commit a2489b01 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.3.x'

parents c0682855 2e540780
...@@ -34,6 +34,7 @@ import org.springframework.util.Assert; ...@@ -34,6 +34,7 @@ import org.springframework.util.Assert;
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson
* @since 1.3.0 * @since 1.3.0
*/ */
@ConfigurationProperties(prefix = "endpoints.flyway") @ConfigurationProperties(prefix = "endpoints.flyway")
...@@ -80,7 +81,8 @@ public class FlywayEndpoint extends AbstractEndpoint<List<FlywayMigration>> { ...@@ -80,7 +81,8 @@ public class FlywayEndpoint extends AbstractEndpoint<List<FlywayMigration>> {
public FlywayMigration(MigrationInfo info) { public FlywayMigration(MigrationInfo info) {
this.type = info.getType(); this.type = info.getType();
this.checksum = info.getChecksum(); this.checksum = info.getChecksum();
this.version = info.getVersion().toString(); this.version = info.getVersion() != null ? info.getVersion().toString()
: null;
this.description = info.getDescription(); this.description = info.getDescription();
this.script = info.getScript(); this.script = info.getScript();
this.state = info.getState(); this.state = info.getState();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment