Merge branch 'master' into renovate/mockito-monorepo

.github/workflows/central-sync.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: v${{ github.event.inputs.release_version }}
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/wrapper-validation-action@v2
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:

.github/workflows/gradle.yml

@@ -45,14 +45,14 @@ jobs:
           fetch-depth: 0
 
       - name: "🔧 Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1.1.5
+        uses: graalvm/setup-graalvm@v1.1.6
         with:
           distribution: 'graalvm'
           java-version: ${{ matrix.java }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "🔧 Setup Gradle"
-        uses: gradle/gradle-build-action@v2.11.1
+        uses: gradle/gradle-build-action@v3.1.0
 
       - name: "❓ Optional setup step"
         run: |

.github/workflows/publish-snapshot.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_TOKEN }}
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/wrapper-validation-action@v2
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:

README.md

@@ -24,7 +24,7 @@ class MathServiceSpec extends Specification {
     MathService mathService // Dependency injection is used to supply the system under test
 
     @Unroll
-    void "should compute #num times 4"() { // This is the test case. #num will be replaces by the values defined in the where: block
+    void "should compute #num times 4"() { // This is the test case. #num will be replaced by the values defined in the where: block
         when:
         def result = mathService.compute(num)
 

gradle.properties

@@ -1,4 +1,4 @@
-projectVersion=4.2.1-SNAPSHOT
+projectVersion=4.3.0-SNAPSHOT
 projectGroup=io.micronaut.test
 
 title=Micronaut Test

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-micronaut = "4.2.3"
-micronaut-platform = "4.2.3"
+micronaut = "4.3.5"
+micronaut-platform = "4.3.1"
 micronaut-docs = "2.0.0"
 groovy = "4.0.15"
 
@@ -14,20 +14,20 @@ managed-kotest = "5.8.0"
 managed-spock = "2.3-groovy-4.0"
 
 kotlin = "1.9.22"
-graal-svm = "23.1.1"
-testcontainers = "1.19.3"
+graal-svm = "23.1.2"
 
-micronaut-test = "4.1.1"
+micronaut-test = "4.2.0"
 micronaut-data = "4.4.1"
-micronaut-hibernate-validator = "4.1.0"
+micronaut-hibernate-validator = "4.2.0"
 micronaut-logging = "1.1.2"
 micronaut-r2dbc = "5.2.0"
 micronaut-serde = "2.7.0"
-micronaut-spring = "5.4.0"
+micronaut-spring = "5.4.1"
 micronaut-sql = "5.4.0"
 micronaut-reactor = "3.2.1"
+micronaut-test-resources = "2.3.3"
 
-micronaut-gradle-plugin = "4.2.1"
+micronaut-gradle-plugin = "4.3.2"
 
 [libraries]
 # Core
@@ -42,6 +42,7 @@ micronaut-spring = { module = "io.micronaut.spring:micronaut-spring-bom", versio
 micronaut-sql = { module = "io.micronaut.sql:micronaut-sql-bom", version.ref = "micronaut-sql" }
 micronaut-reactor = { module = 'io.micronaut.reactor:micronaut-reactor-bom', version.ref = "micronaut-reactor" }
 micronaut-test = { module = 'io.micronaut.test:micronaut-test-bom', version.ref = "micronaut-test" }
+micronaut-test-resources = { module = "io.micronaut.testresources:micronaut-test-resources-bom", version.ref = "micronaut-test-resources" }
 
 managed-assertj-core = { module = "org.assertj:assertj-core", version.ref = "managed-assertj" }
 managed-hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "managed-hamcrest" }
@@ -73,7 +74,3 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 groovy = { module = "org.apache.groovy:groovy" }
 
 kotlin-gradle-plugin = { module = 'org.jetbrains.kotlin:kotlin-gradle-plugin', version.ref = 'kotlin' }
-
-testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version.ref = "testcontainers" }
-testcontainers = { module = "org.testcontainers:testcontainers" }
-testcontainers-postgresql = { module = "org.testcontainers:postgresql"}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id("io.micronaut.build.shared.settings") version "6.6.1"
+    id("io.micronaut.build.shared.settings") version "6.6.2"
 }
 
 enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS'
@@ -18,9 +18,10 @@ micronautBuild {
     importMicronautCatalog("micronaut-serde")
     importMicronautCatalog("micronaut-spring")
     importMicronautCatalog("micronaut-sql")
+    importMicronautCatalog("micronaut-r2dbc")
     importMicronautCatalog("micronaut-reactor")
     importMicronautCatalog("micronaut-test")
-    importMicronautCatalog("micronaut-r2dbc")
+    importMicronautCatalog("micronaut-test-resources")
 }
 
 rootProject.name = 'test-parent'

test-suite-at-sql-jpa/build.gradle.kts

@@ -21,9 +21,7 @@ dependencies {
     testImplementation(projects.micronautTestJunit5)
     testRuntimeOnly(libs.junit.jupiter.engine)
 
-    testImplementation(platform(libs.testcontainers.bom))
-    testImplementation(libs.testcontainers)
-    testImplementation(libs.testcontainers.postgresql)
+    testImplementation(mnTestResources.testcontainers.postgres)
 }
 tasks.withType<Test> {
     useJUnitPlatform()

test-suite-sql-r2dbc/build.gradle.kts

@@ -31,6 +31,7 @@ dependencies {
 micronaut {
     importMicronautPlatform.set(false)
     testResources {
+        version.set(libs.versions.micronaut.test.resources)
         additionalModules.add(R2DBC_MYSQL)
     }
 }