use milestones dependencies (#836)

* build: Micronaut Framework 4.0.0-M1 * build: Micronaut Cache 4.0.0-M1 * build: Micronaut Hibernate Validator 4.0.0-M1 * build: Micronaut Micrometer 5.0.0-M1 * build: Micronaut Reactor 3.0.0-M1 * build: Micronaut Serde 2.0.0-M1 * build: Micronaut Spring 5.0.0-M1 * build: Micronaut Validation 4.0.0-M2 * remove dep cycle to MN Data Transaction Hibernate * use 4.0.0-SNAPSHOT for tests and examples
micronaut-projects · Mar 27, 2023 · 3cc7ad2 · 3cc7ad2
1 parent 415cf16
commit 3cc7ad2
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 23 deletions.
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.test-application-hibernate6.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.test-application-hibernate6.gradle
@@ -0,0 +1,6 @@
+plugins {
+    id 'io.micronaut.build.internal.test-application'
+}
+dependencies {
+    testImplementation(mnData.micronaut.data.tx.hibernate)
+}
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.test-application.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.test-application.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 micronaut {
-    version project.ext.micronautVersion
+    version '4.0.0-SNAPSHOT'//project.ext.micronautVersion
     runtime "netty"
     testRuntime "junit"
     testResources {

diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.test-library.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.test-library.gradle
@@ -4,5 +4,6 @@ plugins {
 }
 
 micronaut {
-    version project.ext.micronautVersion
+    version '4.0.0-SNAPSHOT'
+    //version project.ext.micronautVersion
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,22 +2,22 @@
 
 # Micronaut
 
-micronaut = "4.0.0-SNAPSHOT"
+micronaut = "4.0.0-M1"
 micronaut-docs = "2.0.0"
 micronaut-gradle-plugin = "4.0.0-SNAPSHOT"
 micronaut-testresources = "2.0.0-SNAPSHOT"
 
 # Platform dependencies
-micronaut-cache = "4.0.0-SNAPSHOT"
+micronaut-cache = "4.0.0-M1"
 micronaut-data = "4.0.0-SNAPSHOT"
-micronaut-hibernate-validator = "4.0.0-SNAPSHOT"
-micronaut-micrometer = "5.0.0-SNAPSHOT"
+micronaut-hibernate-validator = "4.0.0-M1"
+micronaut-micrometer = "5.0.0-M1"
 micronaut-r2dbc = "4.0.0" # TODO update once 5.0.0-SNAPSHOT is out
-micronaut-reactor = "3.0.0-SNAPSHOT"
-micronaut-serde = "2.0.0-SNAPSHOT"
-micronaut-spring = "5.0.0-SNAPSHOT"
+micronaut-reactor = "3.0.0-M1"
+micronaut-serde = "2.0.0-M1"
+micronaut-spring = "5.0.0-M1"
 micronaut-test = "4.0.0-SNAPSHOT"
-micronaut-validation = "4.0.0-SNAPSHOT"
+micronaut-validation = "4.0.0-M2"
 
 # Frameworks
 

diff --git a/hibernate-jpa/build.gradle b/hibernate-jpa/build.gradle
@@ -15,7 +15,8 @@ dependencies {
     api(libs.managed.hibernate.core)
     api(libs.jakarta.transaction.api)
     api(mnValidation.micronaut.validation)
-    api(mnData.micronaut.data.tx.hibernate)
+    compileOnly(mnData.micronaut.data.tx.hibernate)
+    testImplementation(mnData.micronaut.data.tx.hibernate)
     api(mn.micronaut.aop)
     api projects.micronautJdbc
     api(mn.micronaut.runtime)

diff --git a/...ation/hibernate/jpa/conf/settings/internal/CurrentSessionContextClassSettingSupplier.java b/...ation/hibernate/jpa/conf/settings/internal/CurrentSessionContextClassSettingSupplier.java
@@ -20,6 +20,7 @@
 import io.micronaut.configuration.hibernate.jpa.conf.settings.SettingsSupplier;
 import io.micronaut.context.BeanProvider;
 import io.micronaut.context.annotation.Prototype;
+import io.micronaut.context.annotation.Requires;
 import io.micronaut.core.annotation.Internal;
 import io.micronaut.transaction.hibernate6.MicronautSessionContext;
 import org.hibernate.cfg.AvailableSettings;
@@ -33,6 +34,7 @@
  * @author Denis Stepanov
  * @since 4.5.0
  */
+@Requires(classes = MicronautSessionContext.class)
 @Internal
 @Prototype
 final class CurrentSessionContextClassSettingSupplier implements SettingsSupplier {

diff --git a/hibernate-reactive/build.gradle b/hibernate-reactive/build.gradle
@@ -34,4 +34,5 @@ dependencies {
     testImplementation libs.testcontainers.jdbc
     testImplementation libs.testcontainers.postgresql
     testImplementation libs.managed.vertx.pg.client
+    testImplementation(mnData.micronaut.data.tx.hibernate)
 }
diff --git a/src/main/docs/guide/hibernate.adoc b/src/main/docs/guide/hibernate.adoc
@@ -15,6 +15,10 @@ Once you have <<jdbc, configured one or many DataSources>> to use Hibernate, you
 
 dependency:micronaut-hibernate-jpa[groupId="io.micronaut.sql"]
 
+and the Micronaut Data Transaction Hibernate dependency:
+
+dependency:micronaut-data-tx-hibernate="io.micronaut.data"]
+
 And that is it. For each registered SQL `DataSource`, Micronaut will configure the following beans using api:configuration.hibernate.jpa.EntityManagerFactoryBean[]:
 
 * link:{hibernateapi}/org/hibernate/boot/registry/StandardServiceRegistry.html[StandardServiceRegistry] - The Hibernate `StandardServiceRegistry`

diff --git a/src/main/docs/guide/hibernate/hibernate-reactive.adoc b/src/main/docs/guide/hibernate/hibernate-reactive.adoc
@@ -2,6 +2,10 @@ It's possible to use Hibernate Reactive by adding following dependency:
 
 dependency:micronaut-hibernate-reactive[groupId="io.micronaut.sql"]
 
+and the Micronaut Data Transaction Hibernate dependency:
+
+dependency:micronaut-data-tx-hibernate="io.micronaut.data"]
+
 NOTE: Hibernate Reactive requires Java 11
 
 To enable reactive session factory JPA configuration needs to have `reactive` property set to `true`.

diff --git a/tests/hibernate6/hibernate6-h2/build.gradle b/tests/hibernate6/hibernate6-h2/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-application'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {

diff --git a/tests/hibernate6/hibernate6-mariadb/build.gradle b/tests/hibernate6/hibernate6-mariadb/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-application'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {

diff --git a/tests/hibernate6/hibernate6-mssql/build.gradle b/tests/hibernate6/hibernate6-mssql/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-application'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {

diff --git a/tests/hibernate6/hibernate6-mysql/build.gradle b/tests/hibernate6/hibernate6-mysql/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-application'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {

diff --git a/tests/hibernate6/hibernate6-oracle/build.gradle b/tests/hibernate6/hibernate6-oracle/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-application'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {

diff --git a/tests/hibernate6/hibernate6-postgres/build.gradle b/tests/hibernate6/hibernate6-postgres/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-application'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {

diff --git a/tests/hibernate6/hibernate6-reactive-common/build.gradle b/tests/hibernate6/hibernate6-reactive-common/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-library'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {

diff --git a/tests/hibernate6/hibernate6-reactive-mssql/build.gradle b/tests/hibernate6/hibernate6-reactive-mssql/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-application'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {

diff --git a/tests/hibernate6/hibernate6-reactive-mysql/build.gradle b/tests/hibernate6/hibernate6-reactive-mysql/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-application'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {

diff --git a/tests/hibernate6/hibernate6-reactive-oracle/build.gradle b/tests/hibernate6/hibernate6-reactive-oracle/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-application'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {

diff --git a/tests/hibernate6/hibernate6-reactive-postgres/build.gradle b/tests/hibernate6/hibernate6-reactive-postgres/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-application'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {

diff --git a/tests/hibernate6/hibernate6-sync-common/build.gradle b/tests/hibernate6/hibernate6-sync-common/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.test-library'
+    id("io.micronaut.build.internal.test-application-hibernate6")
 }
 
 dependencies {