Merge branch '3.6.x' into 3.7.x

# Conflicts: # gradle/libs.versions.toml # settings.gradle
micronaut-projects · Jun 13, 2023 · ec343c6 · ec343c6
2 parents 3417fe7 + 5590cdb
commit ec343c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -114,7 +114,7 @@ managed-micronaut-rxjava2 = "1.3.0"
 managed-micronaut-rxjava3 = "2.3.0"
 managed-micronaut-security = "3.8.3"
 managed-micronaut-serialization = "1.3.3"
-managed-micronaut-servlet = "3.3.7"
+managed-micronaut-servlet = "3.3.8"
 managed-micronaut-spring = "4.3.1"
 managed-micronaut-sql = "4.7.3"
 managed-micronaut-test = "3.6.2"

diff --git a/settings.gradle b/settings.gradle
@@ -14,7 +14,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'io.micronaut.build.shared.settings' version '5.4.5'
+    id 'io.micronaut.build.shared.settings' version '5.4.9'
 }
 
 rootProject.name = 'micronaut'