Merge remote-tracking branch 'origin/master' into renovate/managed.r2…

…dbc.mssql
micronaut-projects · Jun 23, 2023 · 0631cd9 · 0631cd9
2 parents 2304f9e + 2b12869
commit 0631cd9
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 26 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -161,7 +161,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
       - name: Download artifacts
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
         with:

diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.r2dbc-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.r2dbc-module.gradle
@@ -6,7 +6,7 @@ plugins {
 
 micronautBuild {
     binaryCompatibility {
-        // Enable before Micronaut 4 release
-        enabled.set(false)
+        baselineVersion = "5.0.0-M10"
+        enabled = true
     }
 }
diff --git a/config/accepted-api-changes.json b/config/accepted-api-changes.json
@@ -0,0 +1,3 @@
+[
+
+]
diff --git a/doc-examples/example-kotlin/src/main/kotlin/example/SomeEntityRepository.kt b/doc-examples/example-kotlin/src/main/kotlin/example/SomeEntityRepository.kt
@@ -2,7 +2,7 @@ package example
 
 import io.micronaut.data.model.query.builder.sql.Dialect
 import io.micronaut.data.r2dbc.annotation.R2dbcRepository
-import io.micronaut.data.r2dbc.repository.ReactorCrudRepository
+import io.micronaut.data.repository.reactive.ReactorCrudRepository
 
 @R2dbcRepository(dialect = Dialect.MYSQL)
-interface SomeEntityRepository : ReactorCrudRepository<SomeEntity, Long>
+interface SomeEntityRepository : ReactorCrudRepository<SomeEntity, Long>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,18 +1,18 @@
 [versions]
-micronaut = "4.0.0-M7"
-micronaut-platform = "4.0.0-M2"
+micronaut = "4.0.0-RC3"
+micronaut-platform = "4.0.0-M4"
 micronaut-docs = "2.0.0"
 
-micronaut-reactor = "3.0.0-M6"
-micronaut-rxjava2 = "2.0.0-M5"
-micronaut-serde = "2.0.0-M10"
+micronaut-reactor = "3.0.0-M9"
+micronaut-rxjava2 = "2.0.0-M6"
+micronaut-serde = "2.0.0-M12"
 micronaut-test = "4.0.0-M6"
-micronaut-kotlin = "4.0.0-M5"
-micronaut-data = "4.0.0-M8"
-micronaut-sql = "5.0.0-M9"
-micronaut-flyway = "6.0.0-M7"
-micronaut-validation = "4.0.0-M10"
-micronaut-logging = "1.0.0-M4"
+micronaut-kotlin = "4.0.0-M6"
+micronaut-data = "4.0.0-M11"
+micronaut-sql = "5.0.0-M12"
+micronaut-flyway = "6.0.0-M8"
+micronaut-validation = "4.0.0-M11"
+micronaut-logging = "1.0.0-M5"
 
 groovy = "4.0.10"
 managed-testcontainers = "1.18.3"
@@ -33,7 +33,7 @@ managed-r2dbc-mssql = "1.0.1.RELEASE"
 # Gradle plugins
 
 micronaut-gradle-plugin = "4.0.0-M4"
-micronaut-testresources = "2.0.0-M9"
+micronaut-testresources = "2.0.0-M12"
 kotlin-gradle-plugin = "1.8.22"
 
 [libraries]

diff --git a/r2dbc-core/build.gradle b/r2dbc-core/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 configurations.all {
     resolutionStrategy {
-        force 'org.graalvm.sdk:graal-sdk:22.3.2'
+        force 'org.graalvm.sdk:graal-sdk:23.0.0'
     }
 }
 

diff --git a/test-graalvm/common/src/main/java/testgraalvm/repositories/OwnerRepository.java b/test-graalvm/common/src/main/java/testgraalvm/repositories/OwnerRepository.java
@@ -6,10 +6,10 @@
 import testgraalvm.controllers.dto.OwnerDto;
 import testgraalvm.domain.Owner;
 import io.micronaut.transaction.TransactionDefinition;
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 import io.r2dbc.spi.Connection;
 
-@TransactionalAdvice(isolation = TransactionDefinition.Isolation.SERIALIZABLE)
+@Transactional(isolation = TransactionDefinition.Isolation.SERIALIZABLE)
 public interface OwnerRepository extends ReactorCrudRepository<Owner, Long> {
     Flux<OwnerDto> list();
 

diff --git a/test-graalvm/common/src/main/java/testgraalvm/repositories/PetRepository.java b/test-graalvm/common/src/main/java/testgraalvm/repositories/PetRepository.java
@@ -6,10 +6,10 @@
 import testgraalvm.controllers.dto.PetDto;
 import testgraalvm.domain.Pet;
 import io.micronaut.transaction.TransactionDefinition;
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 import io.r2dbc.spi.Connection;
 
-@TransactionalAdvice(isolation = TransactionDefinition.Isolation.SERIALIZABLE)
+@Transactional(isolation = TransactionDefinition.Isolation.SERIALIZABLE)
 public interface PetRepository extends ReactorCrudRepository<Pet, Long> {
     Flux<PetDto> list();
 

diff --git a/test-graalvm/oracle/src/main/java/example/repositories/OracleOwnerRepository.java b/test-graalvm/oracle/src/main/java/example/repositories/OracleOwnerRepository.java
@@ -3,10 +3,10 @@
 import io.micronaut.data.model.query.builder.sql.Dialect;
 import io.micronaut.data.r2dbc.annotation.R2dbcRepository;
 import io.micronaut.transaction.TransactionDefinition;
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 import testgraalvm.repositories.OwnerRepository;
 
 @R2dbcRepository(dialect = Dialect.ORACLE)
-@TransactionalAdvice(isolation = TransactionDefinition.Isolation.DEFAULT)
+@Transactional(isolation = TransactionDefinition.Isolation.DEFAULT)
 public interface OracleOwnerRepository extends OwnerRepository {
 }
diff --git a/test-graalvm/oracle/src/main/java/example/repositories/OraclePetRepository.java b/test-graalvm/oracle/src/main/java/example/repositories/OraclePetRepository.java
@@ -3,10 +3,10 @@
 import io.micronaut.data.model.query.builder.sql.Dialect;
 import io.micronaut.data.r2dbc.annotation.R2dbcRepository;
 import io.micronaut.transaction.TransactionDefinition;
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 import testgraalvm.repositories.PetRepository;
 
 @R2dbcRepository(dialect = Dialect.ORACLE)
-@TransactionalAdvice(isolation = TransactionDefinition.Isolation.DEFAULT)
+@Transactional(isolation = TransactionDefinition.Isolation.DEFAULT)
 public interface OraclePetRepository extends PetRepository {
 }