From ba91e6f9d6143031205d3b6db3d7c953abe19959 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Mon, 26 Sep 2022 17:40:28 +0200 Subject: [PATCH 1/3] fix: JooqConfigurationFactory visibility back to public (#731) Close: https://github.com/micronaut-projects/micronaut-sql/issues/730 We accidentally change JooqConfigurationFactory visibility from public to private in a minor version in this PR: https://github.com/micronaut-projects/micronaut-sql/pull/678 This makes this class public again. --- .../configuration/jooq/AbstractJooqConfigurationFactory.java | 4 +--- .../configuration/jooq/JooqConfigurationFactory.java | 4 +--- .../configuration/jooq/R2dbcJooqConfigurationFactory.java | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/jooq/src/main/java/io/micronaut/configuration/jooq/AbstractJooqConfigurationFactory.java b/jooq/src/main/java/io/micronaut/configuration/jooq/AbstractJooqConfigurationFactory.java index 5e277605b..874e5960a 100644 --- a/jooq/src/main/java/io/micronaut/configuration/jooq/AbstractJooqConfigurationFactory.java +++ b/jooq/src/main/java/io/micronaut/configuration/jooq/AbstractJooqConfigurationFactory.java @@ -17,7 +17,6 @@ import io.micronaut.context.ApplicationContext; import io.micronaut.context.annotation.Parameter; -import io.micronaut.core.annotation.Internal; import io.micronaut.core.annotation.Nullable; import io.micronaut.inject.qualifiers.Qualifiers; import org.jooq.ConverterProvider; @@ -40,8 +39,7 @@ * @author Vladimir Kulev * @since 1.2.0 */ -@Internal -abstract class AbstractJooqConfigurationFactory { +public class AbstractJooqConfigurationFactory { /** * Creates jOOQ {@link org.jooq.Configuration}. diff --git a/jooq/src/main/java/io/micronaut/configuration/jooq/JooqConfigurationFactory.java b/jooq/src/main/java/io/micronaut/configuration/jooq/JooqConfigurationFactory.java index 087b26cba..277fdd5d4 100644 --- a/jooq/src/main/java/io/micronaut/configuration/jooq/JooqConfigurationFactory.java +++ b/jooq/src/main/java/io/micronaut/configuration/jooq/JooqConfigurationFactory.java @@ -19,7 +19,6 @@ import io.micronaut.context.annotation.EachBean; import io.micronaut.context.annotation.Factory; import io.micronaut.context.annotation.Parameter; -import io.micronaut.core.annotation.Internal; import io.micronaut.core.annotation.Nullable; import io.micronaut.jdbc.DataSourceResolver; import org.jooq.Configuration; @@ -42,8 +41,7 @@ * @since 1.2.0 */ @Factory -@Internal -final class JooqConfigurationFactory extends AbstractJooqConfigurationFactory { +public class JooqConfigurationFactory extends AbstractJooqConfigurationFactory { /** * Creates jOOQ {@link Configuration}. diff --git a/jooq/src/main/java/io/micronaut/configuration/jooq/R2dbcJooqConfigurationFactory.java b/jooq/src/main/java/io/micronaut/configuration/jooq/R2dbcJooqConfigurationFactory.java index 983854fff..e2b82ccfa 100644 --- a/jooq/src/main/java/io/micronaut/configuration/jooq/R2dbcJooqConfigurationFactory.java +++ b/jooq/src/main/java/io/micronaut/configuration/jooq/R2dbcJooqConfigurationFactory.java @@ -20,7 +20,6 @@ import io.micronaut.context.annotation.Factory; import io.micronaut.context.annotation.Parameter; import io.micronaut.context.annotation.Requires; -import io.micronaut.core.annotation.Internal; import io.micronaut.core.annotation.Nullable; import io.r2dbc.spi.ConnectionFactory; import org.jooq.Configuration; @@ -41,9 +40,8 @@ * @since 4.5.0 */ @Requires(classes = ConnectionFactory.class) -@Internal @Factory -final class R2dbcJooqConfigurationFactory extends AbstractJooqConfigurationFactory { +public class R2dbcJooqConfigurationFactory extends AbstractJooqConfigurationFactory { /** * Creates jOOQ {@link Configuration}. It will configure it with available jOOQ provider beans with the same From cf6268f704941955ca41a071c8151d81df8fe6f8 Mon Sep 17 00:00:00 2001 From: micronaut-build Date: Mon, 26 Sep 2022 15:52:32 +0000 Subject: [PATCH 2/3] [skip ci] Release v4.5.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4d1a33aea..4456dd3c1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.5.1-SNAPSHOT +projectVersion=4.5.1 projectGroup=io.micronaut.sql micronautSharedSettingVersion=5.3.9 From fed81b99cae623025fc00e2c415e5654c84fba95 Mon Sep 17 00:00:00 2001 From: micronaut-build Date: Mon, 26 Sep 2022 15:56:33 +0000 Subject: [PATCH 3/3] Back to 4.5.2-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4456dd3c1..519ba8a79 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.5.1 +projectVersion=4.5.2-SNAPSHOT projectGroup=io.micronaut.sql micronautSharedSettingVersion=5.3.9