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

Jump to bottom

fix(deps): update dependency io.micronaut.data:micronaut-data-bom to v4.0.0-m9 #134

Merged
merged 2 commits into from
Jun 19, 2023
Merged

fix(deps): update dependency io.micronaut.data:micronaut-data-bom to v4.0.0-m9 #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
169f16a
fix(deps): update dependency io.micronaut.data:micronaut-data-bom to …
renovate[bot] Jun 19, 2023
c4322d3
Fix for Data M9. Classes were moved in https://github.com/micronaut-p…
timyates Jun 19, 2023
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
3 changes: 2 additions & 1 deletion buildSrc/src/main/groovy/io.micronaut.build.internal.crac-module.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ dependencies {
api(libs.managed.crac)
compileOnly(mn.micronaut.http.server.netty)
compileOnly(mnSql.micronaut.jdbc.hikari)
compileOnly(mnData.micronaut.data.tx)
compileOnly(mnData.micronaut.data.connection.jdbc)
compileOnly(mnRedis.micronaut.redis.lettuce)

testImplementation(mnData.micronaut.data.connection.jdbc)
testImplementation(mnData.micronaut.data.tx)
testImplementation(mnSql.micronaut.jdbc.hikari)
testImplementation(mnSerde.micronaut.serde.jackson)
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/io/micronaut/crac/resources/datasources/resolver/HikariDataSourceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import io.micronaut.core.annotation.NonNull;
import io.micronaut.crac.CracConfiguration;
import io.micronaut.crac.resources.datasources.HikariDataSourceResource;
import io.micronaut.transaction.jdbc.DelegatingDataSource;
import io.micronaut.data.connection.jdbc.advice.DelegatingDataSource;
import jakarta.inject.Singleton;
import org.crac.Resource;
import org.slf4j.Logger;
Expand Down
4 changes: 2 additions & 2 deletions .../io/micronaut/crac/resources/datasources/resolver/HikariDelegatingDataSourceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import io.micronaut.core.annotation.Experimental;
import io.micronaut.core.annotation.NonNull;
import io.micronaut.crac.CracConfiguration;
import io.micronaut.transaction.jdbc.DelegatingDataSource;
import io.micronaut.data.connection.jdbc.advice.DelegatingDataSource;
import jakarta.inject.Singleton;
import org.crac.Resource;
import org.slf4j.Logger;
Expand All @@ -30,7 +30,7 @@
import java.util.Optional;

/**
* If the data Source is of type {@link io.micronaut.transaction.jdbc.DelegatingDataSource}, extract the underlying data source.
* If the data Source is of type {@link io.micronaut.data.connection.jdbc.advice.DelegatingDataSource}, extract the underlying data source.
*
* @author Sergio del Amo
* @since 1.2.0
Expand Down
4 changes: 2 additions & 2 deletions crac/src/test/groovy/io/micronaut/crac/HikariSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import groovy.sql.Sql
import io.micronaut.context.BeanContext
import io.micronaut.context.annotation.Property
import io.micronaut.crac.test.CheckpointSimulator
import io.micronaut.data.connection.jdbc.advice.DelegatingDataSource
import io.micronaut.test.extensions.spock.annotation.MicronautTest
import io.micronaut.transaction.jdbc.DelegatingDataSource
import jakarta.inject.Inject
import org.slf4j.LoggerFactory
import spock.lang.AutoCleanup
Expand Down Expand Up @@ -50,7 +50,7 @@ class HikariSpec extends Specification {
hikariDataSource.running

when: "we make sure we've got a connection warmed up"
def rows = new Sql(dataSource).rows("select 1")
def rows = new Sql(hikariDataSource).rows("select 1")
Copy link
Contributor

Choose a reason for hiding this comment

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

Without this change we got:

  io.micronaut.data.connection.exceptions.NoConnectionException: No current connection present. Consider declaring @Connectable or @Transactional on the surrounding method

I think it's right... @dstepanov does this look right? Not sure why it started failing with M9


then:
rows.size() == 1
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
micronaut = "4.0.0-RC1"

micronaut-cache = "4.0.0-M5"
micronaut-data = "4.0.0-M7"
micronaut-data = "4.0.0-M9"
micronaut-docs = "2.0.0"
micronaut-redis = "6.0.0-M4"
micronaut-serialization = "2.0.0-M12"
Expand Down