Micronaut Framework 4.0.0-M4 (#114)

* use micronaut logging * build: Micronaut Framework 4.0.0-M4 * Cache 4.0.0-M2 * test M4
micronaut-projects · May 22, 2023 · 99e2844 · 99e2844
1 parent 4cd389e
commit 99e2844
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-library-test-suite.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-library-test-suite.gradle
@@ -19,7 +19,7 @@ configurations.all {
 
 dependencies {
     testImplementation(projects.micronautCrac)
-    testImplementation(mn.logback.classic)
+    testImplementation(mnLogging.logback.classic)
     testImplementation(mn.micronaut.http.server.netty)
     testImplementation(mn.micronaut.inject.groovy)
     testImplementation(mnTest.micronaut.test.spock)

diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-module.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation(mn.micronaut.http.server.netty)
     testImplementation(mn.micronaut.http.client)
     testImplementation(mn.groovy.sql)
-    testImplementation(mn.logback.classic)
+    testImplementation(mnLogging.logback.classic)
     testRuntimeOnly(mnSql.h2)
 }
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-test-suite.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-test-suite.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation(mn.micronaut.http.client)
     testImplementation(mn.micronaut.http.server.netty)
 
-    testRuntimeOnly(mn.logback.classic)
+    testRuntimeOnly(mnLogging.logback.classic)
     testRuntimeOnly(mn.micronaut.jackson.databind)
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -7,12 +7,8 @@ projectUrl=https://micronaut.io
 githubSlug=micronaut-projects/micronaut-crac
 developers=Tim Yates,Sergio del Amo
 
-# Micronaut core branch for BOM pull requests
-githubCoreBranch=4.0.x
 
-# bomProperty=micronautXXXVersion
 # If needed, set additional properties
-# bomProperties=hibernateVersion,tomcatJdbcVersion
 
 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx1g
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,20 +1,22 @@
 [versions]
-micronaut = "4.0.0-M2"
+micronaut = "4.0.0-M4"
 
-micronaut-cache = "4.0.0-M1"
+micronaut-cache = "4.0.0-M2"
 micronaut-data = "4.0.0-M4"
 micronaut-docs = "2.0.0"
 micronaut-redis = "6.0.0-M3"
 micronaut-serialization = "2.0.0-M8"
 micronaut-sql = "5.0.0-M5"
-micronaut-test = "4.0.0-M3"
+micronaut-test = "4.0.0-M4"
 
 groovy = "4.0.12"
 spock = "2.3-groovy-4.0"
 
 managed-crac = "0.1.3"
 
+micronaut-logging = "1.0.0-M2"
 [libraries]
+micronaut-logging = { module = "io.micronaut.logging:micronaut-logging-bom", version.ref = "micronaut-logging" }
 micronaut-cache = { module = "io.micronaut.cache:micronaut-cache-bom", version.ref = "micronaut-cache" }
 micronaut-data = { module = "io.micronaut.data:micronaut-data-bom", version.ref = "micronaut-data" }
 micronaut-redis = { module = "io.micronaut.redis:micronaut-redis-bom", version.ref = "micronaut-redis" }

diff --git a/settings.gradle b/settings.gradle
@@ -24,6 +24,7 @@ include 'test-suite-kotlin'
 include 'test-suite-redis'
 
 micronautBuild {
+    importMicronautCatalog("micronaut-logging")
     useStandardizedProjectNames = true
     importMicronautCatalog()
     importMicronautCatalog("micronaut-cache")