Merge branch '4.4.x' into 4.5.x

micronaut-projects · Apr 6, 2024 · 6a109c2 · 6a109c2
2 parents 84689d3 + 91f2ec7
commit 6a109c2
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
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
@@ -15,6 +15,7 @@ micronaut-groovy = "4.2.0"
 micronaut-logging = "1.2.2"
 micronaut-mongodb = "5.2.0"
 micronaut-reactor = "3.2.1"
+
 micronaut-security = "4.6.9"
 micronaut-serde = "2.8.2"
 micronaut-servlet = "4.6.0"

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/...t/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java b/...t/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java
@@ -14,7 +14,9 @@
         "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/...cronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java b/...cronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java
@@ -14,7 +14,9 @@
         "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/...cronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java b/...cronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java
@@ -14,7 +14,9 @@
         "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 {