Update to core-M4 and latest dependencies (#186)

micronaut-projects · May 23, 2023 · 6e87e24 · 6e87e24
1 parent 0f2697c
commit 6e87e24
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,6 @@ plugins {
 }
 
 repositories {
-    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
     mavenCentral()
 }
 configurations.all {

diff --git a/buildSrc/src/main/groovy/io.micronaut.internal.build.microstream-base.gradle b/buildSrc/src/main/groovy/io.micronaut.internal.build.microstream-base.gradle
@@ -1,5 +1,4 @@
 repositories {
     mavenCentral()
-    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,6 @@ projectUrl=https://micronaut.io
 githubSlug=micronaut-projects/micronaut-microstream
 developers=Sergio del Amo
 
-githubCoreBranch=4.0.x
 
 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-docs = "2.0.0"
-micronaut = "4.0.0-M2"
-groovy = "4.0.11"
+micronaut = "4.0.0-M4"
+groovy = "4.0.12"
 kotlin = "1.8.21"
 spock = "2.3-groovy-4.0"
 
 managed-microstream='08.00.00-MS-GA'
 
-micronaut-cache = "4.0.0-M1"
+micronaut-cache = "4.0.0-M2"
+micronaut-logging = "1.0.0-M2"
 micronaut-micrometer = "5.0.0-M1"
-micronaut-serde = "2.0.0-M1"
-micronaut-test = "4.0.0-M1"
-micronaut-validation = "4.0.0-M4"
+micronaut-serde = "2.0.0-M8"
+micronaut-test = "4.0.0-M4"
+micronaut-validation = "4.0.0-M7"
 
 [libraries]
 micronaut-cache = { module = "io.micronaut.cache:micronaut-cache-bom", version.ref = "micronaut-cache" }
+micronaut-logging = { module = "io.micronaut.logging:micronaut-logging-bom", version.ref = "micronaut-logging" }
 micronaut-micrometer = { module = "io.micronaut.micrometer:micronaut-micrometer-bom", version.ref = "micronaut-micrometer" }
 micronaut-serde = { module = "io.micronaut.serde:micronaut-serde-bom", version.ref = "micronaut-serde" }
 micronaut-validation = { module = "io.micronaut.validation:micronaut-validation-bom", version.ref = "micronaut-validation" }

diff --git a/microstream-rest/build.gradle.kts b/microstream-rest/build.gradle.kts
@@ -10,9 +10,10 @@ dependencies {
     implementation(mnValidation.micronaut.validation)
 
     implementation(projects.micronautMicrostream)
+    implementation(mnSerde.micronaut.serde.api)
     implementation(mnSerde.micronaut.serde.jackson)
 
     testImplementation(mn.micronaut.http.server.netty)
     testImplementation(mn.micronaut.http.client)
-    testImplementation(mn.logback.classic)
+    testImplementation(mnLogging.logback.classic)
 }
diff --git a/microstream/build.gradle.kts b/microstream/build.gradle.kts
@@ -19,4 +19,5 @@ dependencies {
     testImplementation(mn.micronaut.http.server.netty)
     testImplementation(mn.micronaut.http.client)
     testImplementation(projects.micronautMicrostreamAnnotations)
+    testRuntimeOnly(mnLogging.logback.classic)
 }
diff --git a/settings.gradle b/settings.gradle
@@ -26,10 +26,10 @@ micronautBuild.useStandardizedProjectNames=true
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 micronautBuild {
-    addSnapshotRepository()
     useStandardizedProjectNames = true
     importMicronautCatalog()
     importMicronautCatalog("micronaut-cache")
+    importMicronautCatalog("micronaut-logging")
     importMicronautCatalog("micronaut-micrometer")
     importMicronautCatalog("micronaut-serde")
     importMicronautCatalog("micronaut-validation")

diff --git a/test-suite-groovy/build.gradle b/test-suite-groovy/build.gradle
@@ -14,6 +14,6 @@ dependencies {
     testImplementation(mn.micronaut.http.client)
     testImplementation(projects.micronautMicrostream)
     testImplementation(projects.micronautMicrostreamCache)
-    testRuntimeOnly(mn.logback.classic)
+    testRuntimeOnly(mnLogging.logback.classic)
     testRuntimeOnly(mn.snakeyaml)
 }
diff --git a/test-suite-kotlin/build.gradle b/test-suite-kotlin/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testImplementation(libs.jupiter.api)
     testImplementation(mnTest.micronaut.test.junit5)
     testRuntimeOnly(libs.junit.jupiter.engine)
-    testRuntimeOnly(mn.logback.classic)
+    testRuntimeOnly(mnLogging.logback.classic)
     testRuntimeOnly(mn.snakeyaml)
     testImplementation libs.kotlin.stdlib
     kaptTest(mn.micronaut.inject.java)

diff --git a/test-suite/build.gradle b/test-suite/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     testImplementation(mnTest.micronaut.test.junit5)
     testRuntimeOnly(libs.junit.jupiter.engine)
 
-    testRuntimeOnly(mn.logback.classic)
+    testRuntimeOnly(mnLogging.logback.classic)
     testRuntimeOnly(mn.snakeyaml)
 
     testImplementation(mn.micronaut.http.server.netty)