Merge branch '4.0.x'

.github/workflows/central-sync.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Publish to Sonatype OSSRH
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

.github/workflows/graalvm.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['11', '17']
+        java: ['17']
         graalvm: ['latest', 'dev']
     steps:
        # https://github.com/actions/virtual-environments/issues/709

.github/workflows/gradle.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8', '11', '17']
+        java: ['17']
     steps:
        # https://github.com/actions/virtual-environments/issues/709
       - name: Free disk space
@@ -72,7 +72,7 @@ jobs:
           name: binary-compatibility-reports
           path: "**/build/reports/binary-compatibility-*.html"
       - name: Publish to Sonatype Snapshots
-        if: success() && github.event_name == 'push' && matrix.java == '11'
+        if: success() && github.event_name == 'push' && matrix.java == '17'
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
@@ -88,7 +88,7 @@ jobs:
           if_true: "micronaut-projects/micronaut-docs"
           if_false: ${{ github.repository }}
       - name: Publish to Github Pages
-        if: success() && github.event_name == 'push' && matrix.java == '11'
+        if: success() && github.event_name == 'push' && matrix.java == '17'
         uses: micronaut-projects/github-pages-deploy-action@master
         env:
           TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}

.github/workflows/nativeTest.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['11', '17']
+        java: ['17']
         graalvm: ['latest', 'dev']
     steps:
       # https://github.com/actions/virtual-environments/issues/709

.github/workflows/publish-snapshot.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Publish to Sonatype Snapshots
         if: success()
         env:

.github/workflows/release.yml

@@ -20,10 +20,10 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Set the current release version
         id: release_version
-        run: echo ::set-output name=release_version::${GITHUB_REF:11}
+        run: echo ::set-output name=release_version::${GITHUB_REF:17}
       - name: Run pre-release
         uses: micronaut-projects/github-actions/pre-release@master
         env:

.github/workflows/sonarqube.yml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
       - name: Optional setup step
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

gradle.properties

@@ -1,20 +1,20 @@
-projectVersion=3.6.3-SNAPSHOT
+projectVersion=4.0.0-SNAPSHOT
 projectGroup=io.micronaut.test
 micronautDocsVersion=2.0.0
-micronautVersion=3.5.1
+micronautVersion=4.0.0-SNAPSHOT
 micronautTestVersion=3.1.1
-groovyVersion=3.0.10
-kotlinVersion=1.7.10
 
+groovyVersion=4.0.5
+kotlinVersion=1.7.20
 
 title=Micronaut Test
 projectDesc=Testing Framework Extensions for Micronaut
-projectUrl=http://micronaut.io
+projectUrl=https://micronaut.io
 githubSlug=micronaut-projects/micronaut-test
 developers=Graeme Rocher
 
 # Micronaut core branch for BOM pull requests
-githubCoreBranch=3.7.x
+githubCoreBranch=4.0.x
 bomProperty=micronautTestVersion
 bomProperties=junitVersion,kotestVersion
 

gradle/libs.versions.toml

@@ -3,18 +3,15 @@ managed-assertj = "3.23.1"
 managed-hamcrest = "2.2"
 managed-mockito = "4.8.0"
 managed-mockk = "1.12.8"
-managed-kotest = "4.6.4"
 managed-junit = "5.9.0"
-managed-spock = "2.1-groovy-3.0"
 managed-rest-assured = "5.2.0"
+managed-kotest = "5.5.1"
+managed-spock = "2.2-groovy-4.0"
 
-kotest5 = "5.4.2" # can not be managed until we deprecate kotest 4
+kotlin = "1.7.20"
+micronaut = "4.0.0-SNAPSHOT"
 
-kotlin = "1.7.10"
-
-# Micronaut
-micronaut = "3.6.3"
-micronaut-gradle-plugin = "3.5.3"
+micronaut-gradle-plugin = "3.6.2"
 
 [libraries]
 managed-assertj-core = { module = "org.assertj:assertj-core", version.ref = "managed-assertj" }
@@ -24,32 +21,12 @@ managed-mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter",
 managed-mockk = { module = "io.mockk:mockk", version.ref = "managed-mockk" }
 managed-kotest-assertions-core-jvm = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "managed-kotest" }
 managed-kotest-runner-junit5-jvm = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "managed-kotest" }
-kotest5-assertions-core-jvm = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest5" }
-kotest5-runner-junit5-jvm = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "kotest5" }
 
 # BOMs
 boms-junit = { module = "org.junit:junit-bom", version.ref = "managed-junit" }
 boms-spock = { module = "org.spockframework:spock-bom", version.ref = "managed-spock" }
 boms-rest-assured = { module = "io.rest-assured:rest-assured-bom", version.ref = "managed-rest-assured" }
 
-# Micronaut
-micronaut-bom = { module = "io.micronaut:micronaut-bom", version.ref = "micronaut" }
-micronaut-data-hibernate-jpa = { module = "io.micronaut.data:micronaut-data-hibernate-jpa" }
-micronaut-data-tx = { module = "io.micronaut.data:micronaut-data-tx" }
-micronaut-graal = { module = "io.micronaut:micronaut-graal" }
-micronaut-hibernate-gorm = { module = "io.micronaut.groovy:micronaut-hibernate-gorm" }
-micronaut-hibernate-validator = { module = "io.micronaut.beanvalidation:micronaut-hibernate-validator" }
-micronaut-http-client = { module = "io.micronaut:micronaut-http-client" }
-micronaut-http-server = { module = "io.micronaut:micronaut-http-server" }
-micronaut-http-server-netty = { module = "io.micronaut:micronaut-http-server-netty" }
-micronaut-inject = { module = "io.micronaut:micronaut-inject" }
-micronaut-inject-groovy = { module = "io.micronaut:micronaut-inject-groovy" }
-micronaut-inject-java = { module = "io.micronaut:micronaut-inject-java" }
-micronaut-jdbc-hikari = { module = "io.micronaut.sql:micronaut-jdbc-hikari" }
-micronaut-jdbc-tomcat = { module = "io.micronaut.sql:micronaut-jdbc-tomcat" }
-micronaut-runtime = { module = "io.micronaut:micronaut-runtime" }
-micronaut-spring = { module = "io.micronaut.spring:micronaut-spring" }
-
 micronaut-library-plugin = { module = "io.micronaut.library:io.micronaut.library.gradle.plugin", version.ref = "micronaut-gradle-plugin" }
 
 spock-core = { module = "org.spockframework:spock-core" }
@@ -62,4 +39,4 @@ rest-assured = { module = "io.rest-assured:rest-assured" }
 kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 graal = { module = "org.graalvm.nativeimage:svm" }
-groovy = { module = "org.codehaus.groovy:groovy" }
+groovy = { module = "org.apache.groovy:groovy" }

settings.gradle

@@ -6,7 +6,17 @@ pluginManagement {
 }
 
 plugins {
-    id("io.micronaut.build.shared.settings") version "5.3.14"
+    id("io.micronaut.build.shared.settings") version "6.0.0"
+}
+
+dependencyResolutionManagement {
+    repositories {
+        maven { url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
+    }
+}
+
+micronautBuild {
+    importMicronautCatalog()
 }
 
 rootProject.name = 'test-parent'

test-core/build.gradle

@@ -2,13 +2,18 @@ plugins {
     id "io.micronaut.build.internal.module"
 }
 
+repositories {
+    mavenCentral()
+    maven { url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
+}
+
 dependencies {
-    compileOnly(libs.micronaut.http.server)
+    compileOnly(mn.micronaut.http.server)
     compileOnly(libs.junit.jupiter.api)
 
-    api(libs.micronaut.inject)
+    api(mn.micronaut.inject)
 
-    implementation(libs.micronaut.runtime)
+    implementation(mn.micronaut.runtime)
 }
 
 jar {

test-junit5/build.gradle

@@ -5,11 +5,7 @@ plugins {
 
 repositories {
     mavenCentral()
-}
-
-java {
-    sourceCompatibility = "1.8"
-    targetCompatibility = "1.8"
+    maven { url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
 }
 
 tasks.withType(Test).configureEach {
@@ -43,25 +39,26 @@ tasks.withType(Jar).configureEach {
 
 dependencies {
     api project(":test-core")
-    api(libs.micronaut.inject)
+    api(mn.micronaut.inject)
     api(libs.junit.jupiter.api)
-    implementation(libs.micronaut.runtime)
+    implementation(mn.micronaut.runtime)
     compileOnly(libs.graal)
 
-    testCompileOnly(libs.micronaut.inject)
+    testCompileOnly(mn.micronaut.inject)
 
-    testAnnotationProcessor(libs.micronaut.inject.java)
-    testAnnotationProcessor(libs.micronaut.graal)
+    testAnnotationProcessor(mn.micronaut.inject.java)
+    testAnnotationProcessor(mn.micronaut.graal)
 
     testImplementation(libs.junit.jupiter.params)
-    testImplementation(libs.micronaut.http.server.netty)
-    testImplementation(libs.micronaut.http.client)
+    testImplementation(mn.micronaut.http.server.netty)
+    testImplementation(mn.micronaut.http.client)
     testImplementation(libs.managed.mockito.junit.jupiter)
     testImplementation(libs.managed.hamcrest)
-    testImplementation(libs.micronaut.data.tx)
-    testImplementation(libs.micronaut.data.hibernate.jpa)
+    testImplementation(mn.micronaut.data.tx)
+    testImplementation(mn.micronaut.data.hibernate.jpa)
+    testImplementation(mn.snakeyaml)
 
-    testRuntimeOnly(libs.micronaut.jdbc.tomcat)
+    testRuntimeOnly(mn.micronaut.jdbc.tomcat)
     testRuntimeOnly(libs.h2)
     testRuntimeOnly(libs.junit.jupiter.engine)
 }

test-kotest/build.gradle

@@ -4,12 +4,17 @@ plugins {
     id "io.micronaut.build.internal.module"
 }
 
+repositories {
+    mavenCentral()
+    maven { url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
+}
+
 dependencies {
     api project(":test-core")
-    api(libs.micronaut.runtime)
+    api(mn.micronaut.runtime)
     api(libs.managed.kotest.runner.junit5.jvm)
 
-    implementation(libs.micronaut.inject)
+    implementation(mn.micronaut.inject)
     implementation project(":test-junit5")
     implementation(libs.kotlin.stdlib.jdk8)
     implementation(libs.kotlin.reflect)
@@ -18,18 +23,18 @@ dependencies {
 
     testCompileOnly(libs.jakarta.inject.api)
 
-    kaptTest(platform(libs.micronaut.bom))
-    kaptTest(libs.micronaut.inject.java)
+    kaptTest(platform(mn.micronaut.bom))
+    kaptTest(mn.micronaut.inject.java)
 
     testImplementation(libs.managed.mockk)
 
-    testImplementation(libs.micronaut.http.server.netty)
-    testImplementation(libs.micronaut.http.client)
+    testImplementation(mn.micronaut.http.server.netty)
+    testImplementation(mn.micronaut.http.client)
 
-    testImplementation(libs.micronaut.data.tx)
-    testImplementation(libs.micronaut.data.hibernate.jpa)
+    testImplementation(mn.micronaut.data.tx)
+    testImplementation(mn.micronaut.data.hibernate.jpa)
 
-    testRuntimeOnly(libs.micronaut.jdbc.tomcat)
+    testRuntimeOnly(mn.micronaut.jdbc.tomcat)
     testRuntimeOnly(libs.h2)
 
     testImplementation(libs.managed.kotest.assertions.core.jvm)

test-kotest5/build.gradle

@@ -4,12 +4,17 @@ plugins {
     id "io.micronaut.build.internal.module"
 }
 
+repositories {
+    mavenCentral()
+    maven { url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
+}
+
 dependencies {
     api project(":test-core")
-    api(libs.micronaut.runtime)
-    api(libs.kotest5.runner.junit5.jvm)
+    api(mn.micronaut.runtime)
+    api(libs.managed.kotest.runner.junit5.jvm)
 
-    implementation(libs.micronaut.inject)
+    implementation(mn.micronaut.inject)
     implementation project(":test-junit5")
     implementation(libs.kotlin.stdlib.jdk8)
     implementation(libs.kotlin.reflect)
@@ -18,21 +23,21 @@ dependencies {
 
     testCompileOnly(libs.jakarta.inject.api)
 
-    kaptTest(platform(libs.micronaut.bom))
-    kaptTest(libs.micronaut.inject.java)
+    kaptTest(platform(mn.micronaut.bom))
+    kaptTest(mn.micronaut.inject.java)
 
     testImplementation(libs.managed.mockk)
 
-    testImplementation(libs.micronaut.http.server.netty)
-    testImplementation(libs.micronaut.http.client)
+    testImplementation(mn.micronaut.http.server.netty)
+    testImplementation(mn.micronaut.http.client)
 
-    testImplementation(libs.micronaut.data.tx)
-    testImplementation(libs.micronaut.data.hibernate.jpa)
+    testImplementation(mn.micronaut.data.tx)
+    testImplementation(mn.micronaut.data.hibernate.jpa)
 
-    testRuntimeOnly(libs.micronaut.jdbc.tomcat)
+    testRuntimeOnly(mn.micronaut.jdbc.tomcat)
     testRuntimeOnly(libs.h2)
 
-    testImplementation(libs.kotest5.assertions.core.jvm)
+    testImplementation(libs.managed.kotest.assertions.core.jvm)
 }
 
 test {