Merge branch '4.5.x' into 5.0.x

sdelamo · sdelamo · commit f04c3f902cb8 · 2024-04-06T19:57:05.000+02:00
# Conflicts:
#	gradle.properties
#	gradle/libs.versions.toml
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.aws.http-server-tck-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.aws.http-server-tck-module.gradle
@@ -12,6 +12,7 @@ dependencies {
     testImplementation(mn.micronaut.http.client)
     testImplementation(mn.micronaut.http.server.tck)
     testImplementation(libs.junit.platform.engine)
+    testImplementation(mn.micronaut.jackson.databind)
     testImplementation(libs.junit.jupiter.engine)
     testRuntimeOnly(mnLogging.logback.classic)
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-micronaut = "4.3.9"
+micronaut = "4.4.0"
 micronaut-docs = "2.0.0"
 micronaut-test = "4.2.0"
 groovy = "4.0.15"
diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/build.gradle.kts b/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/build.gradle.kts
@@ -6,4 +6,5 @@ dependencies {
     testImplementation(projects.micronautFunctionAwsApiProxy)
     testImplementation(projects.micronautFunctionAwsApiProxyTest)
     testImplementation(mnReactor.micronaut.reactor)
+    testImplementation(mn.micronaut.jackson.databind)
 }
diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java
@@ -11,8 +11,12 @@
     "io.micronaut.http.server.tck.lambda.tests"
 })
 @ExcludeClassNamePatterns({
+        "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
+        "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest",
     "io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
-    "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest"
+    "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest",
+    "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
+    "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest"
 })
 @SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy Application Load Balancer Event")
 public class ApplicationLoadBalancerTckTestSuite {
diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/build.gradle.kts b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/build.gradle.kts
@@ -6,4 +6,5 @@ dependencies {
     testImplementation(projects.micronautFunctionAwsApiProxy)
     testImplementation(projects.micronautFunctionAwsApiProxyTest)
     testImplementation(mnReactor.micronaut.reactor)
+    testImplementation(mn.micronaut.jackson.databind)
 }
diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java
@@ -11,8 +11,12 @@
     "io.micronaut.http.server.tck.lambda.tests"
 })
 @ExcludeClassNamePatterns({
+        "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
+        "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest",
         "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest",
-        "io.micronaut.http.server.tck.tests.FilterProxyTest" // Immmutable request
+        "io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
+        "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
+        "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest"
 })
 @SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy v1 Event model")
 public class FunctionAwsApiGatewayProxyV1HttpServerTestSuite {
diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/build.gradle.kts b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/build.gradle.kts
@@ -5,4 +5,5 @@ dependencies {
     testImplementation(projects.micronautFunctionAwsApiProxy)
     testImplementation(projects.micronautFunctionAwsApiProxyTest)
     testImplementation(mnReactor.micronaut.reactor)
+    testImplementation(mn.micronaut.jackson.databind)
 }
diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java
@@ -11,8 +11,12 @@
     "io.micronaut.http.server.tck.lambda.tests"
 })
 @ExcludeClassNamePatterns({
+        "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
+        "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest",
         "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest",
-        "io.micronaut.http.server.tck.tests.FilterProxyTest" // Immmutable request
+        "io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
+        "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
+        "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest"
 })
 @SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy v2 Event model")
 public class FunctionAwsApiGatewayProxyV2HttpServerTestSuite {
diff --git a/test-suite-http-server-tck-function-aws-api-proxy-test/build.gradle.kts b/test-suite-http-server-tck-function-aws-api-proxy-test/build.gradle.kts
@@ -6,5 +6,6 @@ dependencies {
     testImplementation(projects.micronautFunctionAwsApiProxyTest)
     testImplementation(projects.micronautFunctionAwsApiProxy)
     testImplementation(mnValidation.micronaut.validation)
+    testImplementation(mn.micronaut.jackson.databind)
     testRuntimeOnly(mn.snakeyaml)
 }

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,5 @@ dependencies {`
`6`	`6`	`testImplementation(projects.micronautFunctionAwsApiProxy)`
`7`	`7`	`testImplementation(projects.micronautFunctionAwsApiProxyTest)`
`8`	`8`	`testImplementation(mnReactor.micronaut.reactor)`
	`9`	`+ testImplementation(mn.micronaut.jackson.databind)`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@ dependencies {`
`5`	`5`	`testImplementation(projects.micronautFunctionAwsApiProxy)`
`6`	`6`	`testImplementation(projects.micronautFunctionAwsApiProxyTest)`
`7`	`7`	`testImplementation(mnReactor.micronaut.reactor)`
	`8`	`+ testImplementation(mn.micronaut.jackson.databind)`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@ dependencies {`
`6`	`6`	`testImplementation(projects.micronautFunctionAwsApiProxyTest)`
`7`	`7`	`testImplementation(projects.micronautFunctionAwsApiProxy)`
`8`	`8`	`testImplementation(mnValidation.micronaut.validation)`
	`9`	`+ testImplementation(mn.micronaut.jackson.databind)`
`9`	`10`	`testRuntimeOnly(mn.snakeyaml)`
`10`	`11`	`}`