Merge branch 'master' into enable-test-native

.gitattributes

@@ -1,18 +1,19 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 
-*.java text
-*.html text
-*.kt text
-*.kts text
-*.md text diff=markdown
+*.java text eol=lf
+*.groovy text eol=lf
+*.html text eol=lf
+*.kt text eol=lf
+*.kts text eol=lf
+*.md text diff=markdown eol=lf
 *.py text diff=python executable
 *.pl text diff=perl executable
 *.pm text diff=perl
-*.css text diff=css
-*.js text
-*.sql text
-*.q text
+*.css text diff=css eol=lf
+*.js text eol=lf
+*.sql text eol=lf
+*.q text eol=lf
 
 *.sh text eol=lf
 gradlew text eol=lf

gradle/libs.versions.toml

@@ -1,29 +1,28 @@
 [versions]
 micronaut-docs = "2.0.0"
-micronaut = "4.0.0-M1"
-micronaut-test = "4.0.0-SNAPSHOT"
+micronaut = "4.0.0-M2"
 
-groovy = "4.0.10"
+groovy = "4.0.11"
 
 managed-assertj = "3.24.2"
 managed-hamcrest = "2.2"
-managed-mockito = "5.1.1"
-managed-mockk = "1.12.8"
+managed-mockito = "5.3.0"
+managed-mockk = "1.13.5"
 managed-junit = "5.9.2"
 managed-rest-assured = "5.3.0"
-managed-kotest = "5.5.5"
+managed-kotest = "5.6.1"
 managed-spock = "2.3-groovy-4.0"
 
-kotlin = "1.8.10"
+kotlin = "1.8.20"
 graal-svm = "22.3.1"
 
-micronaut-data = "3.9.6"
+micronaut-data = "4.0.0-M2"
 micronaut-hibernate-validator = "4.0.0-M2"
-micronaut-serde = "2.0.0-M1"
+micronaut-serde = "2.0.0-M3"
 micronaut-spring = "5.0.0-M1"
-micronaut-sql = "5.0.0-M1"
+micronaut-sql = "5.0.0-M3"
 
-micronaut-gradle-plugin = "4.0.0-SNAPSHOT"
+micronaut-gradle-plugin = "4.0.0-M1"
 
 [libraries]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
  case $MAX_FD in #(
  max*)
  # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045 
+ # shellcheck disable=SC3045
  MAX_FD=$( ulimit -H -n ) ||
  warn "Could not query maximum file descriptor limit"
  esac
  case $MAX_FD in #(
  '' | soft) :;; #(
  *)
  # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045 
+ # shellcheck disable=SC3045
  ulimit -n "$MAX_FD" ||
  warn "Could not set maximum file descriptor limit to $MAX_FD"
  esac

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
- id("io.micronaut.build.shared.settings") version "6.3.5"
+ id("io.micronaut.build.shared.settings") version "6.4.1"
 }
 
 enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS'

test-junit5/src/test/java/io/micronaut/test/junit5/Book.java

@@ -1,9 +1,8 @@
-
 package io.micronaut.test.junit5;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 @Entity
 public class Book {

test-junit5/src/test/java/io/micronaut/test/junit5/JpaNoRollbackTest.java

@@ -1,28 +1,24 @@
-
 package io.micronaut.test.junit5;
 
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.micronaut.transaction.SynchronousTransactionManager;
 import io.micronaut.transaction.TransactionStatus;
 import io.micronaut.transaction.support.DefaultTransactionDefinition;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaDelete;
+import jakarta.persistence.criteria.CriteriaQuery;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
-import jakarta.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.CriteriaQuery;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @MicronautTest(rollback = false)
 @DbProperties
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Disabled("Disabled until we get a working micronaut-data for 4.0.0")
 public class JpaNoRollbackTest {
 
  @Inject

test-junit5/src/test/java/io/micronaut/test/junit5/JpaRollbackTest.java

@@ -1,21 +1,17 @@
-
 package io.micronaut.test.junit5;
 
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
 import jakarta.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.criteria.CriteriaQuery;
+import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @MicronautTest
 @DbProperties
-@Disabled("Disabled until we get a working micronaut-data for 4.0.0")
 public class JpaRollbackTest {
 
  @Inject

test-junit5/src/test/java/io/micronaut/test/junit5/JpaSingleTransactionMultipleSetupsTest.java

@@ -1,22 +1,18 @@
-
 package io.micronaut.test.junit5;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.micronaut.test.annotation.TransactionMode;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaQuery;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import jakarta.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaQuery;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @MicronautTest(transactionMode = TransactionMode.SINGLE_TRANSACTION)
 @DbProperties
-@Disabled("Disabled until we get a working micronaut-data for 4.0.0")
 public class JpaSingleTransactionMultipleSetupsTest {
 
  @Inject

test-junit5/src/test/java/io/micronaut/test/junit5/JpaSingleTransactionNoSetupTest.java

@@ -1,21 +1,17 @@
-
 package io.micronaut.test.junit5;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.micronaut.test.annotation.TransactionMode;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaQuery;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import jakarta.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaQuery;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @MicronautTest(transactionMode = TransactionMode.SINGLE_TRANSACTION)
 @DbProperties
-@Disabled("Disabled until we get a working micronaut-data for 4.0.0")
 public class JpaSingleTransactionNoSetupTest {
 
  @Inject

test-junit5/src/test/java/io/micronaut/test/junit5/JpaSingleTransactionTest.java

@@ -1,22 +1,18 @@
-
 package io.micronaut.test.junit5;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.micronaut.test.annotation.TransactionMode;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaQuery;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import jakarta.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaQuery;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @MicronautTest(transactionMode = TransactionMode.SINGLE_TRANSACTION)
 @DbProperties
-@Disabled("Disabled until we get a working micronaut-data for 4.0.0")
 public class JpaSingleTransactionTest {
 
  @Inject

test-junit5/src/test/java/io/micronaut/test/junit5/NonTransactionalTest.java

@@ -1,17 +1,14 @@
-
 package io.micronaut.test.junit5;
 
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.micronaut.transaction.test.DefaultTestTransactionExecutionListener;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 @MicronautTest(transactional = false)
 @DbProperties
-@Disabled("Disabled until we get a working micronaut-data for 4.0.0")
 class NonTransactionalTest {
 
  @Inject

test-junit5/src/test/java/io/micronaut/test/junit5/TransactionalTest.java

@@ -1,21 +1,17 @@
-
 package io.micronaut.test.junit5;
 
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.micronaut.transaction.support.TransactionSynchronizationManager;
 import io.micronaut.transaction.test.DefaultTestTransactionExecutionListener;
 import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 @MicronautTest(transactional = true)
 @DbProperties
-@Disabled("Disabled until we get a working micronaut-data for 4.0.0")
 class TransactionalTest {
 
  @Inject

test-kotest5/src/test/kotlin/io/micronaut/test/kotest5/Book.kt

@@ -1,9 +1,8 @@
-
 package io.micronaut.test.kotest5
 
-import javax.persistence.Entity
-import javax.persistence.GeneratedValue
-import javax.persistence.Id
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.Id
 
 @Entity
 class Book {

test-kotest5/src/test/kotlin/io/micronaut/test/kotest5/JpaNoRollbackTest.kt

@@ -1,18 +1,16 @@
 package io.micronaut.test.kotest5
 
-import io.kotest.core.annotation.Ignored
 import io.kotest.core.spec.Spec
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
 import io.micronaut.test.extensions.kotest5.annotation.MicronautTest
 import io.micronaut.transaction.SynchronousTransactionManager
 import io.micronaut.transaction.support.DefaultTransactionDefinition
-import javax.persistence.EntityManager
+import jakarta.persistence.EntityManager
 
 @MicronautTest(rollback = false)
 @DbProperties
-@Ignored("Disabled until we get a working micronaut-data for 4.0.0")
 class JpaNoRollbackTest(
  private val entityManager: EntityManager,
  private val transactionManager: SynchronousTransactionManager<Any>

test-kotest5/src/test/kotlin/io/micronaut/test/kotest5/JpaRollbackTest.kt

@@ -1,17 +1,13 @@
-
 package io.micronaut.test.kotest5
 
-import io.kotest.core.annotation.Ignored
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
 import io.micronaut.test.extensions.kotest5.annotation.MicronautTest
-
-import javax.persistence.EntityManager
+import jakarta.persistence.EntityManager
 
 @MicronautTest
 @DbProperties
-@Ignored("Disabled until we get a working micronaut-data for 4.0.0")
 class JpaRollbackTest(private val entityManager: EntityManager): BehaviorSpec({
 
  given("rollback between tests") {

test-kotest5/src/test/kotlin/io/micronaut/test/kotest5/NonTransactionalTest.kt

@@ -1,7 +1,5 @@
-
 package io.micronaut.test.kotest5
 
-import io.kotest.core.annotation.Ignored
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.shouldBe
 import io.micronaut.context.ApplicationContext
@@ -10,7 +8,6 @@ import io.micronaut.transaction.test.DefaultTestTransactionExecutionListener
 
 @MicronautTest(transactional = false)
 @DbProperties
-@Ignored("Disabled until we get a working micronaut-data for 4.0.0")
 class NonTransactionalTest(
  private val applicationContext: ApplicationContext) : BehaviorSpec({
 

test-kotest5/src/test/kotlin/io/micronaut/test/kotest5/TransactionalTest.kt

@@ -1,7 +1,5 @@
-
 package io.micronaut.test.kotest5
 
-import io.kotest.core.annotation.Ignored
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.shouldBe
 import io.micronaut.context.ApplicationContext
@@ -10,7 +8,6 @@ import io.micronaut.transaction.test.DefaultTestTransactionExecutionListener
 
 @MicronautTest(transactional = true)
 @DbProperties
-@Ignored("Disabled until we get a working micronaut-data for 4.0.0")
 class TransactionalTest(
  private val applicationContext: ApplicationContext) : BehaviorSpec({