Merge branch '4.0.x'

Closes gh-48700
This commit is contained in:
Andy Wilkinson
2026-01-08 12:01:09 +00:00
45 changed files with 95 additions and 123 deletions
@@ -14,14 +14,13 @@
* limitations under the License.
*/
package org.springframework.boot.flyway.endpoint;
package org.springframework.boot.flyway.actuate.endpoint;
import java.util.Map;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint;
import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint.ContextFlywayBeansDescriptor;
import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint.FlywayDescriptor;
import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;
@@ -14,14 +14,13 @@
* limitations under the License.
*/
package org.springframework.boot.flyway.autoconfigure.actuate.endpoint;
package org.springframework.boot.flyway.autoconfigure;
import org.flywaydb.core.Flyway;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint;
import org.springframework.boot.flyway.autoconfigure.FlywayEndpointAutoConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import static org.assertj.core.api.Assertions.assertThat;