diff --git a/gradle.properties b/gradle.properties index 89215e22..5c47075c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,13 @@ -projectVersion=3.0.3-SNAPSHOT +projectVersion=3.1.0-SNAPSHOT micronautDocsVersion=1.0.25 micronautBuildVersion=1.0.0 -micronautVersion=2.1.2 -micronautTestVersion=2.2.1 +micronautVersion=2.4.1 +micronautTestVersion=2.3.2 -groovyVersion=3.0.4 -spockVersion=2.0-M3-groovy-3.0 +groovyVersion=3.0.7 +spockVersion=2.0-M5-groovy-3.0 -liquibaseVersion=4.2.2 +liquibaseVersion=4.3.2 gormHibernateVersion=7.0.4.RELEASE title=Micronaut Liquibase @@ -17,7 +17,7 @@ githubSlug=micronaut-projects/micronaut-liquibase developers=Ivan Lopez githubBranch=master -githubCoreBranch=2.2.x +githubCoreBranch=2.5.x bomProperty=micronautLiquibaseVersion bomProperties=liquibaseVersion diff --git a/liquibase/src/main/java/io/micronaut/liquibase/LiquibaseMigrationRunner.java b/liquibase/src/main/java/io/micronaut/liquibase/LiquibaseMigrationRunner.java index 4ca20e76..92a5667d 100644 --- a/liquibase/src/main/java/io/micronaut/liquibase/LiquibaseMigrationRunner.java +++ b/liquibase/src/main/java/io/micronaut/liquibase/LiquibaseMigrationRunner.java @@ -18,6 +18,7 @@ import io.micronaut.context.ApplicationContext; import io.micronaut.context.event.BeanCreatedEvent; import io.micronaut.context.event.BeanCreatedEventListener; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.naming.NameResolver; import io.micronaut.core.util.StringUtils; import io.micronaut.inject.qualifiers.Qualifiers; @@ -41,7 +42,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nullable; import javax.inject.Singleton; import javax.sql.DataSource; import java.io.FileOutputStream; diff --git a/liquibase/src/main/java/io/micronaut/liquibase/endpoint/LiquibaseEndpoint.java b/liquibase/src/main/java/io/micronaut/liquibase/endpoint/LiquibaseEndpoint.java index 9b17d859..2e35c4e9 100644 --- a/liquibase/src/main/java/io/micronaut/liquibase/endpoint/LiquibaseEndpoint.java +++ b/liquibase/src/main/java/io/micronaut/liquibase/endpoint/LiquibaseEndpoint.java @@ -15,9 +15,9 @@ */ package io.micronaut.liquibase.endpoint; -import edu.umd.cs.findbugs.annotations.Nullable; import io.micronaut.context.ApplicationContext; import io.micronaut.core.annotation.Creator; +import io.micronaut.core.annotation.Nullable; import io.micronaut.inject.qualifiers.Qualifiers; import io.micronaut.jdbc.DataSourceResolver; import io.micronaut.liquibase.LiquibaseConfigurationProperties;