Merge branch '3.18.x'

Author: sdelamo

aws-bom/build.gradle.kts

@@ -6,6 +6,7 @@ micronautBom {
     suppressions {
         acceptedVersionRegressions.add("aws-serverless-core") // removed for 4.0.0
         acceptedLibraryRegressions.add("aws-serverless-core") // removed for 4.0.0
+        acceptedVersionRegressions.add("aws-cdk-lib") // moved to starter for 4.0.0
         acceptedLibraryRegressions.add("micronaut-aws-cdk") // moved to starter for 4.0.0
     }
 }

function-aws-test/src/main/java/io/micronaut/function/aws/test/MicronautLambdaJunit5Extension.java

@@ -57,7 +57,8 @@ private MicronautTestValue buildValueObject(MicronautLambdaTest micronautTest) {
                 micronautTest.rebuildContext(),
                 micronautTest.contextBuilder(),
                 micronautTest.transactionMode(),
-                micronautTest.startApplication());
+                micronautTest.startApplication(),
+            micronautTest.resolveParameters());
     }
 
     @Override

function-aws-test/src/main/java/io/micronaut/function/aws/test/annotation/MicronautLambdaTest.java

@@ -105,4 +105,14 @@
      * @return true if {@link io.micronaut.runtime.EmbeddedApplication} should be started
      */
     boolean startApplication() default true;
+
+    /**
+     * By default, with JUnit 5 the test method parameters will be resolved to beans if possible.
+     * This behaviour can be problematic if in combination with the {@code ParameterizedTest} annotation.
+     * Setting this member to {@code false} will completely disable bean resolution for method parameters.
+     * <p>
+     *
+     * @return Whether to resolve test method parameters as beans.
+     */
+    boolean resolveParameters() default true;
 }

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 micronaut = "4.0.0-M5"
 micronaut-docs = "2.0.0"
-micronaut-test = "4.0.0-M4"
+micronaut-test = "4.0.0-M5"
 groovy = "4.0.12"
 spock = "2.3-groovy-4.0"
 
@@ -18,7 +18,6 @@ micronaut-security = '4.0.0-M3'
 micronaut-serde = '2.0.0-M8'
 micronaut-servlet = '4.0.0-M6'
 micronaut-views = '4.0.0-M3'
-micronaut-logging = "1.0.0-M2"
 micronaut-validation = "4.0.0-M8"
 
 managed-alexa-ask-sdk = "2.71.0"
@@ -27,7 +26,6 @@ managed-aws-java-sdk-v2 = '2.20.74'
 managed-aws-lambda = '1.2.2'
 managed-aws-lambda-events = '3.11.2'
 managed-aws-serverless-core = '1.9.3'
-managed-aws-cdk-lib='2.81.0'
 micronaut-starter = "3.9.2"
 slf4j = "2.0.7"
 servlet-api = "2.5"
@@ -48,7 +46,6 @@ micronaut-core = { module = 'io.micronaut:micronaut-core-bom', version.ref = 'mi
 
 javapoet = { module = "com.squareup:javapoet", version.ref = "javapoet" }
 
-micronaut-logging = { module = "io.micronaut.logging:micronaut-logging-bom", version.ref = "micronaut-logging" }
 micronaut-discovery-client = { module = "io.micronaut.discovery:micronaut-discovery-client-bom", version.ref = "micronaut-discovery" }
 micronaut-groovy = { module = "io.micronaut.groovy:micronaut-groovy-bom", version.ref = "micronaut-groovy" }
 micronaut-mongodb = { module = "io.micronaut.mongodb:micronaut-mongo-bom", version.ref = "micronaut-mongodb" }
@@ -59,8 +56,6 @@ micronaut-security = { module = "io.micronaut.security:micronaut-security-bom",
 micronaut-views = { module = "io.micronaut.views:micronaut-views-bom", version.ref = "micronaut-views" }
 micronaut-validation = { module = "io.micronaut.validation:micronaut-validation-bom", version.ref = "micronaut-validation" }
 
-aws-cdk-lib = { module = 'software.amazon.awscdk:aws-cdk-lib', version.ref = 'managed-aws-cdk-lib' }
-
 alexa-ask-sdk-apache-client = { module = 'com.amazon.alexa:ask-sdk-apache-client', version.ref = 'managed-alexa-ask-sdk' }
 
 aws-ssm = { module = 'software.amazon.awssdk:ssm' }

settings.gradle.kts

@@ -56,5 +56,4 @@ configure<io.micronaut.build.MicronautBuildSettingsExtension> {
     importMicronautCatalog("micronaut-security")
     importMicronautCatalog("micronaut-views")
     importMicronautCatalog("micronaut-validation")
-    importMicronautCatalog("micronaut-logging")
 }