Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update dependency io.micronaut.flyway:micronaut-flyway-bom to v7 #569

Merged
merged 6 commits into from
Jan 22, 2024
+22 −11
Merged

fix(deps): update dependency io.micronaut.flyway:micronaut-flyway-bom to v7 #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e2d3cbe
fix(deps): update dependency io.micronaut.flyway:micronaut-flyway-bom…
renovate[bot] Jan 20, 2024
65f3a31
Merge branch 'master' into renovate/major-micronaut.flyway
sdelamo Jan 20, 2024
10f74ad
use flyway mysql from flyway bom
sdelamo Jan 22, 2024
ccb8eb9
platform to 4.2.3
sdelamo Jan 22, 2024
00f2aae
test to 4.2.0
sdelamo Jan 22, 2024
744ed65
Fix r2dbc build
radovanradic Jan 22, 2024
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
4 changes: 2 additions & 2 deletions buildSrc/src/main/groovy/io.micronaut.build.internal.r2dbc-example.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ dependencies {

runtimeOnly(libs.managed.r2dbc.mysql)
runtimeOnly(mnSql.mysql.connector.java)
runtimeOnly(libs.flyway.mysql)
runtimeOnly(mnFlyway.flyway.mysql)

testImplementation(mn.micronaut.http.client)
testImplementation(platform(libs.testcontainers))
testImplementation(libs.testcontainers.mysql)
testImplementation(mnTest.micronaut.test.core)

runtimeOnly mn.snakeyaml
}
}
8 changes: 8 additions & 0 deletions doc-examples/example-groovy/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,11 @@ plugins {
micronaut {
testRuntime("spock")
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sdelamo I looked at this issue before, I think it started with gradle plugin 4.2.1, not sure why this was not needed before but now it looks like we need it and it fixes the build.

dependencies {
annotationProcessor(mnSerde.micronaut.serde.processor)
compileOnly(mnSerde.micronaut.serde.processor)

testAnnotationProcessor(mnSerde.micronaut.serde.processor)
testImplementation(mnSerde.micronaut.serde.processor)
}
2 changes: 1 addition & 1 deletion doc-examples/example-groovy/src/test/groovy/example/BookControllerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class BookControllerTest extends Specification implements TestPropertyProvider {

@Override
Map<String, String> getProperties() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is some issue with latest 8.x mysql docker image with test containers testcontainers/testcontainers-java#8131 so I think changing to 8.2 was needed as tests were failing with "8" tag

container = new MySQLContainer<>(DockerImageName.parse("mysql").withTag("8"))
container = new MySQLContainer<>(DockerImageName.parse("mysql").withTag("8.2"))
container.start()
return CollectionUtils.mapOf(
"datasources.default.url", container.getJdbcUrl(),
Expand Down
5 changes: 5 additions & 0 deletions doc-examples/example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ plugins {
id "java"
id "io.micronaut.build.internal.r2dbc-example"
}

dependencies {
annotationProcessor(mnSerde.micronaut.serde.processor)
testAnnotationProcessor(mnSerde.micronaut.serde.processor)
}
2 changes: 1 addition & 1 deletion doc-examples/example-java/src/test/java/example/BookControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void testListBooksMicronautData() {

@Override
public Map<String, String> getProperties() {
container = new MySQLContainer<>(DockerImageName.parse("mysql").withTag("8"));
container = new MySQLContainer<>(DockerImageName.parse("mysql").withTag("8.2"));
container.start();
return CollectionUtils.mapOf(
"datasources.default.url", container.getJdbcUrl(),
Expand Down
2 changes: 1 addition & 1 deletion doc-examples/example-kotlin/src/test/kotlin/example/BookControllerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class BookControllerTest : TestPropertyProvider {
}

override fun getProperties(): Map<String, String> {
container = MySQLContainer(DockerImageName.parse("mysql").withTag("8"))
container = MySQLContainer(DockerImageName.parse("mysql").withTag("8.2"))
container!!.start()
return mapOf(
"datasources.default.url" to container!!.jdbcUrl,
Expand Down
2 changes: 1 addition & 1 deletion doc-examples/example-kotlin/src/test/kotlin/example/SomeEntityRepositoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class SomeEntityRepositoryTest : TestPropertyProvider {
}

override fun getProperties(): Map<String, String> {
container = MySQLContainer(DockerImageName.parse("mysql").withTag("8"))
container = MySQLContainer(DockerImageName.parse("mysql").withTag("8.2"))
container!!.start()
return mapOf(
"datasources.default.url" to container!!.jdbcUrl,
Expand Down
8 changes: 3 additions & 5 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[versions]
micronaut = "4.2.3"
micronaut-platform = "4.1.6"
micronaut-platform = "4.2.3"
micronaut-docs = "2.0.0"

micronaut-reactor = "3.2.1"
micronaut-rxjava2 = "2.2.1"
micronaut-serde = "2.7.0"
micronaut-test = "4.0.1"
micronaut-test = "4.2.0"
micronaut-kotlin = "4.1.0"
micronaut-data = "4.4.1"
micronaut-sql = "5.4.0"
micronaut-flyway = "6.2.1"
micronaut-flyway = "7.0.0"
micronaut-validation = "4.2.0"
micronaut-logging = "1.2.1"

Expand Down Expand Up @@ -67,8 +67,6 @@ managed-r2dbc-io-asyncer-mysql = { module = "io.asyncer:r2dbc-mysql", version.re
managed-r2dbc-mssql = { module = "io.r2dbc:r2dbc-mssql", version.ref = "managed-r2dbc-mssql" }
managed-r2dbc-postgresql = { module = "org.postgresql:r2dbc-postgresql", version.ref = "managed-r2dbc-postgresql" }

flyway-mysql = { module = "org.flywaydb:flyway-mysql" }

testcontainers-jdbc = { module = "org.testcontainers:jdbc" }
testcontainers-junit-jupiter = { module = "org.testcontainers:junit-jupiter" }
testcontainers-mariadb = { module = "org.testcontainers:mariadb" }
Expand Down